summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-09-02statistics: fix typoHannu Nyman
sed -i "s/collected date/collected data/" Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-09-02contrib: remove obsolete luasrcdiet packaging, its built as part of ↵Jo-Philipp Wich
luci-base now Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02contrib: remove obsolete uhttpd packagingJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02contrib: remove obsolete host uci configurationsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02Remove obsolete toplevel MakefileJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02build/makedocs.sh: handle relative output directoriesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-02Merge pull request #463 from hnyman/max-len-versionHannu Nyman
Luci opkg/packages: Limit version string display to 26 chars
2015-09-01Luci opkg/packages: Limit version string display to 26 charsHannu Nyman
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>
2015-09-01luci-lib-ip: fix documentation issueJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01Regenerate api documentationJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01Move doc/ to documentation/api/Jo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01Fix module lines in several luadoc filesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01luci.utils.contains: update documentation to match realityKarl Palsson
Signed-off-by: Karl Palsson <karlp@remake.is>
2015-09-01Add generated documentation to repositoryJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-09-01Merge pull request #460 from jplitza/masterJo-Philipp Wich
luci-lib-jsonc: Fix memory leak in stringify()
2015-09-01Merge pull request #416 from fabio70mi/patch-1Hannu Nyman
Update base.po
2015-08-31luci-lib-jsonc: Fix memory leak in stringify()Jan-Philipp Litza
2015-08-31Merge pull request #393 from nmav/no-group-matchHannu Nyman
luci-app-ocserv: list users with no group
2015-08-30Merge pull request #457 from jplitza/masterJo-Philipp Wich
luci-lib-jsonc: fix handling of strange keys, allow encoding []
2015-08-30luci-lib-jsonc: allow encoding empty listsJan-Philipp Litza
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>
2015-08-30luci-lib-jsonc: Ignore non-string-or-number keys in tablesJan-Philipp Litza
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>
2015-08-30statistics: remove references to Lucid from scriptsHannu Nyman
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>
2015-08-30Merge pull request #456 from hnyman/stat-confighnyman
statistics: cleanup default configuration
2015-08-29luci-app-multiwan: mark broken as it depends on multiwan from oldpackagesHannu Nyman
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>
2015-08-29statistics: adjust default settings to match default pluginsHannu Nyman
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>
2015-08-29statistics: cleanup config fileHannu Nyman
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>
2015-08-28statistics: clarify CPU/processor graph by removing "idle" from itHannu Nyman
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>
2015-08-28statistics: clarify stats introductionHannu Nyman
* 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>
2015-08-28Remove ancient INSTALL file and update README.meHannu Nyman
Remove the outdated INSTALL file from Kamikaze period, as README.md contains the updated information. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-28Merge pull request #454 from hnyman/fix-entropyJo-Philipp Wich
statistics: entropy plugin - fix placement of entropy.lua
2015-08-28statistics: entropy plugin - fix placement of entropy.luaHannu Nyman
Move the file entropy.lua to the correct directory. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-28Merge pull request #451 from hnyman/fw-zone-lenChristian Schoenebeck
luci-app-firewall: validate zone name to enforce fw3 max. length
2015-08-28Merge pull request #452 from hnyman/entropyChristian Schoenebeck
statistics: Add support for entropy stats
2015-08-27statistics: Add support for entropy statsHannu Nyman
Add statistics on the available entropy. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-26firewall: validate max length of zone nameHannu Nyman
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>
2015-08-24Merge pull request #448 from hnyman/cpulabelChristian Schoenebeck
statistics: cpu graph - add label definitions, add softirq and interrupt stats
2015-08-24Merge pull request #450 from hnyman/stat-memoryChristian Schoenebeck
statistics: support better autoscaling in rrdtool, improve memory graph's y-axis
2015-08-23statistics: memory plugin - improve graph by better scaling of y-axisHannu Nyman
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>
2015-08-23statistics: support rrdtool's alt_autoscale and alt_autoscale_max optionsHannu Nyman
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>
2015-08-23statistics: cpu graph - add label definitions, add softirq and interrupt statsHannu Nyman
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>
2015-08-23Merge pull request #447 from srdjanrosic/patch-1Manuel Munz
Enable setting --script-security in client mode.
2015-08-22Enable setting --script-security in client mode.Srdjan Rosic
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.
2015-08-19Merge pull request #444 from hnyman/fixconntrackJo-Philipp Wich
statistics: fix conntrack and ping regression caused by collectd changes
2015-08-19statistics: fix ping graph label regressionHannu Nyman
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>
2015-08-18statistics: fix conntrack regression caused by collectd 5.5.0Hannu Nyman
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>
2015-08-18http.protocol: Support filehandlers for unhandled encodingsKarl Palsson
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>
2015-08-18Merge pull request #441 from hnyman/tz2015fChristian Schoenebeck
Timezone information: update to 2015f
2015-08-17Timezone information: update to 2015fHannu Nyman
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>
2015-08-04Merge pull request #433 from chris5560/masterChristian Schoenebeck
ipkg.lua: compare_versions() Replace Lua Math Library call
2015-08-04ipkg.lua: compare_versions() Replace Lua Math Library callChristian Schoenebeck
function compare_versions(): replace Lua Math Library call with if clause Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>