Commit graph

56 commits

Author SHA1 Message Date
Hannu Nyman
b7b6ed740b 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>
2015-08-19 10:56:30 +03:00
Hannu Nyman
ff9da6cb76 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>
2015-08-18 23:05:00 +03:00
Hannu Nyman
83973f28c3 luci-statistics: fix uhttpd log spam from extra png close
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>
2015-03-02 19:04:16 +02:00
Jo-Philipp Wich
41d2b33087 Update my email addresses in the license headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:49:44 +01:00
Jo-Philipp Wich
7a3493b1f7 Globally reduce copyright headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:38:38 +01:00
Jo-Philipp Wich
1bb4822dca Rework LuCI build system
* 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>
2015-01-08 16:26:20 +01:00