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>
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>
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>
Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
91b97bc9f6
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>
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>
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>
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>
* 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>
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>
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>
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>
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>
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>
Fix log spam that uhttpd logging change has brought to surface.
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: /usr/lib/lua/luci/dispatcher.lua:433: Failed to execute call dispatcher target for entry '/admin/statistics/graph/conntrack'.
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: The called action terminated with an exception:
Sun Mar 1 11:10:42 2015 daemon.err uhttpd[2293]: .../luci/controller/luci_statistics/luci_statistics.lua:153: attempt to use a closed file
Closing the png file explicitly on line 153 is unnecessary, as
ltn12's source.file method already closes the file after use.
https://github.com/openwrt/luci/blob/master/modules/luci-base/luasrc/ltn12.lua#L119
More info at https://dev.openwrt.org/ticket/19083#comment:2
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Rename subdirectories to their repective OpenWrt package names
* Make each LuCI module its own standalone package
* Deploy a shared luci.mk which is used by each module Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
