project/luci.git
5 years agoluci-mod-admin-full: status: survive broken DSL status output
Jo-Philipp Wich [Sat, 3 Oct 2015 14:11:11 +0000 (16:11 +0200)]
luci-mod-admin-full: status: survive broken DSL status output

Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoluci-app-statistics: improve diagram generation, add missing title
Jo-Philipp Wich [Sat, 3 Oct 2015 13:30:59 +0000 (15:30 +0200)]
luci-app-statistics: improve diagram generation, add missing title

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoluci-app-statistics: rework graph label handling
Jo-Philipp Wich [Sat, 3 Oct 2015 13:29:25 +0000 (15:29 +0200)]
luci-app-statistics: rework graph label handling

Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoluci-app-statistics: only render index view for more than one instance
Jo-Philipp Wich [Sat, 3 Oct 2015 09:40:09 +0000 (11:40 +0200)]
luci-app-statistics: only render index view for more than one instance

If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoproto_map: fix ealen range
Steven Barth [Fri, 2 Oct 2015 09:34:12 +0000 (11:34 +0200)]
proto_map: fix ealen range

Signed-off-by: Steven Barth <steven@midlink.org>
5 years agoMerge pull request #496 from neheb/master
Hannu Nyman [Tue, 29 Sep 2015 18:10:43 +0000 (21:10 +0300)]
Merge pull request #496 from neheb/master

Use ZopfliPNG to save 5.4 KB

5 years agoresources/icons: Use ZopfliPNG to save 5.4 KB 496/head
Mangix [Tue, 29 Sep 2015 01:12:07 +0000 (18:12 -0700)]
resources/icons: Use ZopfliPNG to save 5.4 KB

Signed-off by: Rosen Penev <rosenp@gmail.com>

5 years agoMerge pull request #497 from cshore/asterisk-update
Hannu Nyman [Tue, 29 Sep 2015 08:31:42 +0000 (11:31 +0300)]
Merge pull request #497 from cshore/asterisk-update

applications/asterisk: Remove incorrect dependency

5 years agoCONTRIBUTING.md: Add advice on pull requests
Hannu Nyman [Tue, 29 Sep 2015 07:38:58 +0000 (10:38 +0300)]
CONTRIBUTING.md: Add advice on pull requests

Add advice on pull requests and best practices in working with Github.
Minor corrections & updates.
Adjust to Github 'markdown' syntax.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoapplications/asterisk: Remove incorrect dependency 497/head
Daniel Dickinson [Tue, 29 Sep 2015 07:47:31 +0000 (03:47 -0400)]
applications/asterisk: Remove incorrect dependency

ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

5 years agoMerge pull request #495 from openwrt-es/dump1090-next
Hannu Nyman [Tue, 29 Sep 2015 06:53:04 +0000 (09:53 +0300)]
Merge pull request #495 from openwrt-es/dump1090-next

applications/luci-dump1090: update config to latest version

5 years agoapplications/luci-dump1090: update config to latest version 495/head
Álvaro Fernández Rojas [Mon, 28 Sep 2015 22:07:22 +0000 (00:07 +0200)]
applications/luci-dump1090: update config to latest version

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
5 years agoMerge pull request #491 from hnyman/reorganise-stats-menu
Hannu Nyman [Mon, 28 Sep 2015 15:29:58 +0000 (18:29 +0300)]
Merge pull request #491 from hnyman/reorganise-stats-menu

luci-app-statistics: reorganise menu items

5 years agoMerge pull request #492 from ollie27/nohosts
Hannu Nyman [Mon, 28 Sep 2015 09:01:56 +0000 (12:01 +0300)]
Merge pull request #492 from ollie27/nohosts

luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

5 years agoluci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options 492/head
Oliver Middleton [Sun, 27 Sep 2015 23:49:47 +0000 (00:49 +0100)]
luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

no-hosts does not disable addn-hosts.

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
5 years agoluci-app-statistics: reorganise menu items 491/head
Hannu Nyman [Sun, 27 Sep 2015 13:41:53 +0000 (16:41 +0300)]
luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #487 from jorgifumi/patch-1
Hannu Nyman [Sat, 26 Sep 2015 16:37:30 +0000 (19:37 +0300)]
Merge pull request #487 from jorgifumi/patch-1

Update multiwan.po

5 years agoUpdate multiwan.po 487/head
Jorge Lucena [Fri, 25 Sep 2015 08:36:05 +0000 (10:36 +0200)]
Update multiwan.po

Little fix in translation msgid "WAN Uplink"

Signed-off-by: Jorge Lucena <jorgifumi@gmail.com>
5 years agoMerge pull request #484 from LuttyYang/master
Hannu Nyman [Sat, 26 Sep 2015 15:29:12 +0000 (18:29 +0300)]
Merge pull request #484 from LuttyYang/master

luci-theme-material: add button select and input theme

5 years agoMerge pull request #485 from dwmw2/master
Jo-Philipp Wich [Tue, 22 Sep 2015 20:18:16 +0000 (22:18 +0200)]
Merge pull request #485 from dwmw2/master

luci/statistics: Fix nut UPS graphs

5 years agoluci/statistics: Fix nut UPS graphs 485/head
David Woodhouse [Thu, 17 Sep 2015 10:35:38 +0000 (11:35 +0100)]
luci/statistics: Fix nut UPS graphs

At some point since I last checked, the nut plugin for collectd changed the
names of the timeleft and percent datasets. Update the luci module to match
so that those graphs are generated correctly again.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
5 years agoluci-theme-material: add button select input theme 484/head
Lutty Yang [Sun, 20 Sep 2015 04:08:44 +0000 (12:08 +0800)]
luci-theme-material: add button select input theme

add button select input theme

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoMerge pull request #482 from LuttyYang/master
Christian Schoenebeck [Sat, 19 Sep 2015 11:17:24 +0000 (13:17 +0200)]
Merge pull request #482 from LuttyYang/master

luci-theme-material: add some new features and fix some bugs

5 years agoluci-theme-material: add some new features and fix some bugs 482/head
Lutty Yang [Sat, 19 Sep 2015 09:22:54 +0000 (17:22 +0800)]
luci-theme-material: add some new features and fix some bugs

add footer and loading animation and auto focus switches
compact Fonts

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoluci-base: set default mediaurlbase to bootstrap (current default theme)
Hannu Nyman [Fri, 18 Sep 2015 13:00:06 +0000 (16:00 +0300)]
luci-base: set default mediaurlbase to bootstrap (current default theme)

The mediaurlbase option in the default /etc/config/luci still points
to the old openwrt.org theme that is not installed by default.
The discrepancy was noted in the commit message for 55ab4e4ce22

After 55ab4e4ce22 the installed theme's uci-defaults script will correct
the setting at first boot, but we should not have a deprecated theme as
the default value. Set the default value to the default theme 'bootstrap'.

Related old discussion at #302

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #481 from LuttyYang/master
Hannu Nyman [Fri, 18 Sep 2015 08:52:32 +0000 (11:52 +0300)]
Merge pull request #481 from LuttyYang/master

luci-theme-material: fix some bug

5 years agoluci-theme-material: fix font size bug 481/head
Lutty Yang [Fri, 18 Sep 2015 08:22:39 +0000 (16:22 +0800)]
luci-theme-material: fix font size bug

fix "textarea font-size too big in firefox"

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoluci-mod-admin-full: opkg config / prevent word-wrap
Hannu Nyman [Fri, 18 Sep 2015 07:24:58 +0000 (10:24 +0300)]
luci-mod-admin-full: opkg config / prevent word-wrap

Prevent word-wrap on the config input areas. Especially the feed
definition lines can be long, and automatic word-wrap can decrease
clarity.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoluci-theme-material: fix Polish text longer bug
Lutty Yang [Fri, 18 Sep 2015 05:51:15 +0000 (13:51 +0800)]
luci-theme-material: fix Polish text longer bug

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoluci-theme-material: fix some bug
Lutty Yang [Fri, 18 Sep 2015 03:32:44 +0000 (11:32 +0800)]
luci-theme-material: fix some bug

fixed "logout" text theme error and "unsaved changes" page dislocation.

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoMerge pull request #480 from obsy/master
Hannu Nyman [Thu, 17 Sep 2015 16:31:00 +0000 (19:31 +0300)]
Merge pull request #480 from obsy/master

Cosmetic changes for the Polish language

5 years agoi18n/polish/base: changing form of the word 480/head
Cezary Jackiewicz [Thu, 17 Sep 2015 16:23:26 +0000 (18:23 +0200)]
i18n/polish/base: changing form of the word

5 years agoi18n/polish/base: truncate strings to better fit in view
Cezary Jackiewicz [Thu, 17 Sep 2015 16:20:25 +0000 (18:20 +0200)]
i18n/polish/base: truncate strings to better fit in view

5 years agoi18n/polish/firewall: typo
Cezary Jackiewicz [Thu, 17 Sep 2015 16:18:38 +0000 (18:18 +0200)]
i18n/polish/firewall: typo

5 years agoMerge pull request #479 from LuttyYang/master
Hannu Nyman [Thu, 17 Sep 2015 13:07:13 +0000 (16:07 +0300)]
Merge pull request #479 from LuttyYang/master

fix luci-theme-material bug

5 years agoluci-theme-material: fix no password set, Luci displays information is illegible. 479/head
Lutty Yang [Thu, 17 Sep 2015 12:41:11 +0000 (20:41 +0800)]
luci-theme-material: fix no password set, Luci displays information is illegible.

Fixed the visibility of "no password set" warning.

Signed-off-by: Lutty Yang<lutty@wcan.in>
5 years agoMerge pull request #470 from thesabbir/patch-01
Hannu Nyman [Thu, 17 Sep 2015 08:47:54 +0000 (11:47 +0300)]
Merge pull request #470 from thesabbir/patch-01

merged
modules/luci-mod-rpc: fix #466 #427 attempt to index global 'luci' (a nil value)

5 years agoMerge pull request #473 from ekaitz-zarraga/fix-luci-failsafe
Hannu Nyman [Thu, 17 Sep 2015 08:43:05 +0000 (11:43 +0300)]
Merge pull request #473 from ekaitz-zarraga/fix-luci-failsafe

modules/luci-mod-failsafe: Fix nil file descriptor error

5 years agoMerge pull request #478 from LuttyYang/master
Hannu Nyman [Thu, 17 Sep 2015 08:36:43 +0000 (11:36 +0300)]
Merge pull request #478 from LuttyYang/master

Merge new theme 'material' / luci-theme-material

Material is a clean HTML5 theme for LuCI.
It is based on luci-theme-bootstrap and MUI.

5 years agoMaterial is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI 478/head
Lutty Yang [Thu, 17 Sep 2015 08:19:48 +0000 (16:19 +0800)]
Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI

Signed-off-by: Lutty Yang <lutty@wcan.in>
5 years agoluci-app-firewall: use maxlength datatype instead of validate function
Hannu Nyman [Thu, 17 Sep 2015 07:45:53 +0000 (10:45 +0300)]
luci-app-firewall: use maxlength datatype instead of validate function

Switch the zonename validation to use
a compound datatype "and(uciname,maxlength(14))"
instead of a separate 'validate' function.

Remove the unnecessary function that was introduced by 34e875b

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agodocumentation: delete obsoleted file that has a troublesome name
Hannu Nyman [Wed, 16 Sep 2015 14:51:19 +0000 (17:51 +0300)]
documentation: delete obsoleted file that has a troublesome name

Remove SubmitPatchesHowTo:.md that contains obsolete advise about svn and
submitting patches via trac. The filename also contains ":", which causes
trouble for some git clients (e.g. TortoiseGit).

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agofix path error
Lutty Yang [Wed, 16 Sep 2015 14:02:21 +0000 (22:02 +0800)]
fix path error

5 years agofix path error
Lutty Yang [Wed, 16 Sep 2015 13:30:50 +0000 (21:30 +0800)]
fix path error

5 years agoinit Material Design theme
Lutty Yang [Wed, 16 Sep 2015 11:59:17 +0000 (19:59 +0800)]
init Material Design theme

5 years agoLuci opkg/packages: Show package size in list of available packages
Hannu Nyman [Wed, 16 Sep 2015 09:47:48 +0000 (12:47 +0300)]
Luci opkg/packages: Show package size in list of available packages

Add package *.ipk size information to package listing in Luci,
as opkg was today extended to support listing also the size information.
Visible fields are now: name, version, size, description

That will help users considering installation of a certain package
to assess its size impact on flash.

Note: Opkg data includes the size of the .ipk file, not the expanded size.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #475 from hnyman/opkg-feed-config
Hannu Nyman [Tue, 15 Sep 2015 12:05:09 +0000 (15:05 +0300)]
Merge pull request #475 from hnyman/opkg-feed-config

luci-mod-admin-full: restore opkg feed config capability

5 years agoluci-mod-admin-full: restore opkg feed config capability 475/head
Hannu Nyman [Tue, 15 Sep 2015 10:01:03 +0000 (13:01 +0300)]
luci-mod-admin-full: restore opkg feed config capability

opkg config was recently changed by https://dev.openwrt.org/changeset/46491/

Existing /etc/opkg.conf was split to three:
   /etc/opkg.conf -> base opkg configuration
   /etc/opkg/distfeeds.conf -> default Openwrt package feeds
   /etc/opkg/customfeeds.conf -> custom package feeds

Since then, the actual feed definitions have not been visible/configurable,
as only /etc/opkg.conf has been visible in Luci.

This patch restores the capability to see and edit package feed definitions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agomodules/luci-mod-failsafe: Fix nil file descriptor error 473/head
Ekaitz Zárraga [Mon, 14 Sep 2015 11:31:49 +0000 (13:31 +0200)]
modules/luci-mod-failsafe: Fix nil file descriptor error

Signed-off-by: Ekaitz Zárraga <ekaitz.zarraga@fon.com>
5 years agoMerge pull request #471 from freifunk-berlin/remove_bno
Manuel Munz [Sat, 12 Sep 2015 17:00:17 +0000 (19:00 +0200)]
Merge pull request #471 from freifunk-berlin/remove_bno

community-profiles: remove bno profile

5 years agocommunity-profiles: remove bno profile 471/head
Philipp Borgers [Sat, 12 Sep 2015 15:03:20 +0000 (17:03 +0200)]
community-profiles: remove bno profile

The Berlin Nord-Ost community profile is not up-to-date and as far as I know the
community does not exist anymore.

5 years agomodules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value) 470/head
Sabbir Ahmed [Sat, 12 Sep 2015 09:11:18 +0000 (15:11 +0600)]
modules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value)

5 years agostatistics: fix typo
Hannu Nyman [Wed, 2 Sep 2015 12:40:56 +0000 (15:40 +0300)]
statistics: fix typo

sed -i "s/collected date/collected data/"

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agocontrib: remove obsolete luasrcdiet packaging, its built as part of luci-base now
Jo-Philipp Wich [Wed, 2 Sep 2015 07:46:05 +0000 (09:46 +0200)]
contrib: remove obsolete luasrcdiet packaging, its built as part of luci-base now

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agocontrib: remove obsolete uhttpd packaging
Jo-Philipp Wich [Wed, 2 Sep 2015 07:41:35 +0000 (09:41 +0200)]
contrib: remove obsolete uhttpd packaging

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agocontrib: remove obsolete host uci configurations
Jo-Philipp Wich [Wed, 2 Sep 2015 07:41:14 +0000 (09:41 +0200)]
contrib: remove obsolete host uci configurations

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoRemove obsolete toplevel Makefile
Jo-Philipp Wich [Wed, 2 Sep 2015 07:38:54 +0000 (09:38 +0200)]
Remove obsolete toplevel Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agobuild/makedocs.sh: handle relative output directories
Jo-Philipp Wich [Wed, 2 Sep 2015 07:38:28 +0000 (09:38 +0200)]
build/makedocs.sh: handle relative output directories

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoMerge pull request #463 from hnyman/max-len-version
Hannu Nyman [Wed, 2 Sep 2015 05:50:58 +0000 (08:50 +0300)]
Merge pull request #463 from hnyman/max-len-version

Luci opkg/packages: Limit version string display to 26 chars

5 years agoLuci opkg/packages: Limit version string display to 26 chars 463/head
Hannu Nyman [Tue, 1 Sep 2015 11:33:56 +0000 (14:33 +0300)]
Luci opkg/packages: Limit version string display to 26 chars

Many packages currently include a git commit hash in version string.
That makes versions string very long and the version column takes much space
when listing available/installed packages in Luci.

Longest version string is 58 characters (micropython).
85 packages have at least 50 chars and 150 packages at least 40 chars.

Adjust Luci to display max. 26 characters (= luci's own version string).

Longer version strings are cut to: "first 21c" + ".." + "last 3c"

The last 3 chars are used to preserve the possible PKG_REVISION string.
E.g. 'opkg' has only hash+PKG_REVISION, so using only start of the string
might not be optimal.

Examples:

1.3.10-20150302-f2a889564b3a215902622b040a1247af38cb8203-1
1.3.10-20150302-f2a88..3-1

0.1-20150302-654c7d288603f7dae09eb09b57fb67b38c7ac6c3-1
0.1-20150302-654c7d28..3-1

9c97d5ecd795709c8584e972bfdf3aee3a5b846d-7
9c97d5ecd795709c8584e..d-7

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoluci-lib-ip: fix documentation issue
Jo-Philipp Wich [Tue, 1 Sep 2015 14:49:19 +0000 (16:49 +0200)]
luci-lib-ip: fix documentation issue

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoRegenerate api documentation
Jo-Philipp Wich [Tue, 1 Sep 2015 14:44:59 +0000 (16:44 +0200)]
Regenerate api documentation

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoMove doc/ to documentation/api/
Jo-Philipp Wich [Tue, 1 Sep 2015 14:44:03 +0000 (16:44 +0200)]
Move doc/ to documentation/api/

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoFix module lines in several luadoc files
Jo-Philipp Wich [Tue, 1 Sep 2015 14:43:19 +0000 (16:43 +0200)]
Fix module lines in several luadoc files

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoluci.utils.contains: update documentation to match reality
Karl Palsson [Tue, 1 Sep 2015 13:36:38 +0000 (13:36 +0000)]
luci.utils.contains: update documentation to match reality

Signed-off-by: Karl Palsson <karlp@remake.is>
5 years agoAdd generated documentation to repository
Jo-Philipp Wich [Tue, 1 Sep 2015 10:19:27 +0000 (12:19 +0200)]
Add generated documentation to repository

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
5 years agoMerge pull request #460 from jplitza/master
Jo-Philipp Wich [Tue, 1 Sep 2015 07:34:14 +0000 (09:34 +0200)]
Merge pull request #460 from jplitza/master

luci-lib-jsonc: Fix memory leak in stringify()

5 years agoMerge pull request #416 from fabio70mi/patch-1
Hannu Nyman [Tue, 1 Sep 2015 07:11:21 +0000 (10:11 +0300)]
Merge pull request #416 from fabio70mi/patch-1

Update base.po

5 years agoluci-lib-jsonc: Fix memory leak in stringify() 460/head
Jan-Philipp Litza [Mon, 31 Aug 2015 17:52:36 +0000 (19:52 +0200)]
luci-lib-jsonc: Fix memory leak in stringify()

5 years agoMerge pull request #393 from nmav/no-group-match
Hannu Nyman [Mon, 31 Aug 2015 08:20:29 +0000 (11:20 +0300)]
Merge pull request #393 from nmav/no-group-match

luci-app-ocserv: list users with no group

5 years agoMerge pull request #457 from jplitza/master
Jo-Philipp Wich [Sun, 30 Aug 2015 15:57:00 +0000 (17:57 +0200)]
Merge pull request #457 from jplitza/master

luci-lib-jsonc: fix handling of strange keys, allow encoding []

5 years agoluci-lib-jsonc: allow encoding empty lists 457/head
Jan-Philipp Litza [Sun, 30 Aug 2015 13:45:49 +0000 (15:45 +0200)]
luci-lib-jsonc: allow encoding empty lists

To be consistent with the behavior of luci-lib-json, an empty Lua table
should be encoded to an empty JSON list, not an empty JSON object.

To still allow encoding empty JSON objects, the usage of anything other
than a number or a string as a key (for example an empty table or a
function) can be used to force encoding as an object:

    json.stringify({})                  -- "[]"
    json.stringify({[{}] = true})       -- "{}"

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
5 years agoluci-lib-jsonc: Ignore non-string-or-number keys in tables
Jan-Philipp Litza [Sun, 30 Aug 2015 13:42:52 +0000 (15:42 +0200)]
luci-lib-jsonc: Ignore non-string-or-number keys in tables

Previously, the following caused a segmentation fault:

    json.stringify({[{}] = true})

This was caused by lua_tostring() returning NULL for anything but
strings and numbers, letting json_object_object_add crash.

This patch makes jsonc ignore all keys which have no string
representation altogether.

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
5 years agostatistics: remove references to Lucid from scripts
Hannu Nyman [Sun, 30 Aug 2015 11:00:29 +0000 (14:00 +0300)]
statistics: remove references to Lucid from scripts

Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
https://github.com/openwrt/luci/commit/91b97bc9f625d09431dc1c753209a037d7c42fbc

Changes to scripts:
* init.d: lucid reference removed,
          /var/etc creation moved earlier (before first possible use)
* uci-defaults: lucid parameters & restart removed
  (but busybox httpd stuff was left intact, although it might be unnecessary)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #456 from hnyman/stat-config
hnyman [Sun, 30 Aug 2015 05:57:12 +0000 (08:57 +0300)]
Merge pull request #456 from hnyman/stat-config

statistics: cleanup default configuration

5 years agoluci-app-multiwan: mark broken as it depends on multiwan from oldpackages
Hannu Nyman [Sat, 29 Aug 2015 15:04:55 +0000 (18:04 +0300)]
luci-app-multiwan: mark broken as it depends on multiwan from oldpackages

Mark luci-app-multiwan @BROKEN, as it depends on the old 'multiwan'
package, located in the deprecated 'oldpackages' feed.

'packages' feed contains both 'mwan3' and 'luci-app-mwan3' apps that
have superseded the old packages.

This should fix #395.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: adjust default settings to match default plugins 456/head
Hannu Nyman [Sat, 29 Aug 2015 08:15:39 +0000 (11:15 +0300)]
statistics: adjust default settings to match default plugins

Adjust default settings to match the plugins installed by default
(default plugins: iwinfo, interface, load)

* disable plugins not installed by default to avoid error messages at start
* remove references to Freifunk interfaces, as most users do not have those

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: cleanup config file
Hannu Nyman [Sat, 29 Aug 2015 07:59:01 +0000 (10:59 +0300)]
statistics: cleanup config file

No functional changes, but the file is reorganised:
* group settings: general settings / output plugins / input plugins
* sort settings inside a group
* remove quotes from option names to match the current uci behaviour
* whitespace corrections

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: clarify CPU/processor graph by removing "idle" from it
Hannu Nyman [Fri, 28 Aug 2015 19:58:16 +0000 (22:58 +0300)]
statistics: clarify CPU/processor graph by removing "idle" from it

Clarify the CPU time consumption graph by removing the "idle" data from it.
Especially with light traffic, removing "idle" enables the graph
to scale better and to properly show the CPU load variations.

If "idle" data needs to be seen, it might be added as a second graph below.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: clarify stats introduction
Hannu Nyman [Fri, 28 Aug 2015 19:48:03 +0000 (22:48 +0300)]
statistics: clarify stats introduction

* Clarify the short explanation on the statistics section's front page.
* Mention the possibility of additional collectd plugins to get more stats.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoRemove ancient INSTALL file and update README.me
Hannu Nyman [Fri, 28 Aug 2015 15:38:41 +0000 (18:38 +0300)]
Remove ancient INSTALL file and update README.me

Remove the outdated INSTALL file from Kamikaze period,
as README.md contains the updated information.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #454 from hnyman/fix-entropy 438/head
Jo-Philipp Wich [Fri, 28 Aug 2015 10:06:25 +0000 (12:06 +0200)]
Merge pull request #454 from hnyman/fix-entropy

statistics: entropy plugin - fix placement of entropy.lua

5 years agostatistics: entropy plugin - fix placement of entropy.lua 454/head
Hannu Nyman [Fri, 28 Aug 2015 09:51:43 +0000 (12:51 +0300)]
statistics: entropy plugin - fix placement of entropy.lua

Move the file entropy.lua to the correct directory.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #451 from hnyman/fw-zone-len
Christian Schoenebeck [Fri, 28 Aug 2015 09:19:45 +0000 (11:19 +0200)]
Merge pull request #451 from hnyman/fw-zone-len

luci-app-firewall: validate zone name to enforce fw3 max. length

5 years agoMerge pull request #452 from hnyman/entropy
Christian Schoenebeck [Fri, 28 Aug 2015 09:19:00 +0000 (11:19 +0200)]
Merge pull request #452 from hnyman/entropy

statistics: Add support for entropy stats

5 years agostatistics: Add support for entropy stats 452/head
Hannu Nyman [Thu, 27 Aug 2015 07:19:38 +0000 (10:19 +0300)]
statistics: Add support for entropy stats

Add statistics on the available entropy.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agofirewall: validate max length of zone name 451/head
Hannu Nyman [Wed, 26 Aug 2015 10:51:31 +0000 (13:51 +0300)]
firewall: validate max length of zone name

fw3 sets the maximum length of the zone name to 14 and
ignores zone definitions with too long names.
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.h;hb=HEAD#l25
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.c;hb=HEAD#l195

Add a simple validation to ensure that the new zone name is short enough.
This should fix issue #345

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #448 from hnyman/cpulabel
Christian Schoenebeck [Mon, 24 Aug 2015 07:49:54 +0000 (09:49 +0200)]
Merge pull request #448 from hnyman/cpulabel

statistics: cpu graph - add label definitions, add softirq and interrupt stats

5 years agoMerge pull request #450 from hnyman/stat-memory
Christian Schoenebeck [Mon, 24 Aug 2015 07:49:11 +0000 (09:49 +0200)]
Merge pull request #450 from hnyman/stat-memory

statistics: support better autoscaling in rrdtool, improve memory graph's y-axis

5 years agostatistics: memory plugin - improve graph by better scaling of y-axis 450/head
Hannu Nyman [Sun, 23 Aug 2015 18:12:56 +0000 (21:12 +0300)]
statistics: memory plugin - improve graph by better scaling of y-axis

Utilise alt_autoscale_max to make the memory chart y-axis to scale better
for devices with e.g. 128 MB RAM.

Also fix the axis min value to 0.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: support rrdtool's alt_autoscale and alt_autoscale_max options
Hannu Nyman [Sun, 23 Aug 2015 18:02:14 +0000 (21:02 +0300)]
statistics: support rrdtool's alt_autoscale and alt_autoscale_max options

Implement support for alternative scaling of the y-axis.
By default, rrdtool will autoscale to 1,2,5,10,20,50,100,200,... etc.,
which is not always suitable (e.g. memory charts for device with 128 MB).

Rrdtool 1.0.50 already supports alternative autoscaling that creates
a tighter y-axis. Implement graph-level options in Luci statistics to
support those boolean options as "alt_autoscale" and "alt_autoscale_max".

info at http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: cpu graph - add label definitions, add softirq and interrupt stats 448/head
Hannu Nyman [Sun, 23 Aug 2015 14:14:22 +0000 (17:14 +0300)]
statistics: cpu graph - add label definitions, add softirq and interrupt stats

CPU plugin in the Luci statistics was missing the label definitions,
so the field labels are like "cpu_system" instead of "System".
Add proper label definitions to CPU (like the other plugins already have).

The statistics graph was also missing softirq and interrupt stats, although colors
for them were defined. Softirq consumes massive amount of CPU especially with
any qos in use, so it is important for the user to see also that data. Add both
softirq and interrupt stats to the graph.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #447 from srdjanrosic/patch-1
Manuel Munz [Sun, 23 Aug 2015 08:33:12 +0000 (10:33 +0200)]
Merge pull request #447 from srdjanrosic/patch-1

Enable setting --script-security in client mode.

5 years agoEnable setting --script-security in client mode. 447/head
Srdjan Rosic [Sat, 22 Aug 2015 08:27:25 +0000 (09:27 +0100)]
Enable setting --script-security in client mode.

  This is useful in client mode as well, since it allows one to use --route-noexec and --up <cmd> or --route-up <cmd> to create routes manually instead of relying on whatever routes vpn server pushes down to the client.
  mode=server dependency in luci was introduced together with script_security by mmunz back in 2011.with no explanation in the commit why mode=server was there.

5 years agoMerge pull request #444 from hnyman/fixconntrack
Jo-Philipp Wich [Wed, 19 Aug 2015 08:08:42 +0000 (10:08 +0200)]
Merge pull request #444 from hnyman/fixconntrack

statistics: fix conntrack and ping regression caused by collectd changes

5 years agostatistics: fix ping graph label regression 444/head
Hannu Nyman [Wed, 19 Aug 2015 07:56:30 +0000 (10:56 +0300)]
statistics: fix ping graph label regression

Earlier update to collectd 5.4.1 changed the field from "ping" to "value",
which was changed in the graph definition here, but the label definition
was forgotten. Field's label now reads "ping_IPaddr_value".

Correct the label definition to show only IPaddr like the other two graphs.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agostatistics: fix conntrack regression caused by collectd 5.5.0
Hannu Nyman [Tue, 18 Aug 2015 20:05:00 +0000 (23:05 +0300)]
statistics: fix conntrack regression caused by collectd 5.5.0

Collectd 5.5.0 introduced new data to conntrack plugin:
In addition to the number of tracked connections there is also
the static max conntrack value and the calculated use percentage.

Luci's conntrack plugin intrepretes "conntrack-max" as a new data instance
and includes it in the graph in addition to the real "conntrack" number.

Eliminate "max" from graph by specifying empty "" instance as data source.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agohttp.protocol: Support filehandlers for unhandled encodings
Karl Palsson [Tue, 18 Aug 2015 13:59:32 +0000 (13:59 +0000)]
http.protocol: Support filehandlers for unhandled encodings

The setfilehandler() functions used for mime and url encoded message
bodies all operate with a signature of fh(meta, chunk, eof), but for
unhandled encodings, the callback was directly assigned to the sink
function, which has a signature of snk(chunk).  Insert a wrapper to
properly generate the EOF flag, and include a stub "meta" block
providing a virtual "name" and also the original client provided
Content-Type header, to possibly help with taking alternative actions in
the file handler.

The sink function created for raw content decoding also used the wrong
signature for the sink function.

Signed-off-by: Karl Palsson <karlp@remake.is>
5 years agoMerge pull request #441 from hnyman/tz2015f
Christian Schoenebeck [Tue, 18 Aug 2015 07:50:17 +0000 (09:50 +0200)]
Merge pull request #441 from hnyman/tz2015f

Timezone information: update to 2015f

5 years agoTimezone information: update to 2015f 441/head
Hannu Nyman [Mon, 17 Aug 2015 19:53:11 +0000 (22:53 +0300)]
Timezone information: update to 2015f

Changes in 2015e and 2015f:
http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html
http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html

     Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
     not 06-13 and 07-18 as we had guessed.

     Assume Cayman Islands will observe DST starting next year, using US rules.
     Although it isn't guaranteed, it is the most likely.

     North Korea switches to +0830 on 2015-08-15.
     The abbreviation remains "KST".

     Uruguay no longer observes DST.

     Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>