Fix d064cbcf9 by actually enabling ValuesAbsolute in the
config file and also prevent removing that option by LuCI.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Frequency usage percentage stats are by kHz instead of Hz.
Correct the labels. (Linux natively uses kHz for CPU frequency stats,
but collectd scales the current frequency stats item to Hz.)
* Show frequency usage percentage graph before the transition counts,
as it is more descriptive.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
In original collectd, values of this metric are in range 0-1. OpenWrt
previously have a custom patch scaling them up to range 0-100. That
patch has been removed to align with possibly other deployments.
Ref: https://github.com/openwrt/packages/pull/9677
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* Use the new data series sorting and coloring options to
display the frequencies in order and with matching coloring in
different cores.
* Fix the y-axis text and legend in the frequency usage graph
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Add two data series-level options "negweight" and "posweight" that
will use the numerical value of the data instance name
as the sorting factor. This enables e.g. sorting by CPU frequency
in the cpufreq module.
Add new graph-level option "ordercolor" to use colorsfrom a
pre-defined color table for the data series. This enables keeping
similar colors for similar data series in different plugin instances.
E.g. CPU frequencies in several cores that are handled and displayed
separately.
(note: the table has 8 items and if there are more series, it uses
the same colors again. The table can be easily extended/modified)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Collectd 5.9.0 changed the data structure of the cpufreq plugin:
CPU cores are now handled as separate plugin instances.
There are also new data items per core:
* time spent at each frequency
* amount of frequency transitions
Enable these new data items, but initially hide them behind
a new config option "ExtraItems" (default: disabled), as
the amount of graphs in multi-core systems could be rather large.
Note that the frequencies are not (yet) sorted, so the
information value of the time-spent graph is semi-random.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
It allows to force ipv4 or ipv6 when the DNS returns both addresses, but
only one works (for example if there is no ipv6 connectivity).
Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com>
This change splits the graph into two graphs like in apcups and makes it so
possible to see variations in AC Input/Output voltages. Battery charge and
load are indepentent variables. This change also overlays them and display
them as simply two lines. Battery temperature is also displayed as a line now,
as an area under a temperature line makes no sense. Also removed some empty
lines.
Closes: #2417
Signed-off-by: Fabian Schmid-Michels <mail@wohnheimnetz-bielefeld.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Fixes situations where RRD file name contains ":" (eg. _ping/ipv6_) in `rrdtool` it's unescaped - thus not able to render image. Adding simple escaping of `:` to `\\:` fixes the situation.
Might be a solution for #958.
This change defines the menu entry for the LuCI and the rrd definition in
one place. This also has advantage when plugins are written with
exec/python/perl or lua. The controller does not have to be touched for
the menu entry change.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The Diskfree (df) plugin could also collect the values in percent if the
option "ValuesPercentage" is set in the collectd configuration.
This commit will check if "df_complex" / "percent_bytes" or both are
collected by collectd and so will show the corrsponding graph.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Added configuration parameters to also configure the height of the rrd images.
config statistics 'rrdtool'
option image_height '200'
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
[ Fixed too wide line lengths with i18n-sync.pl ]
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
: is used to delimit fields in DEF: rrd instructions, so when it appears
in a filename it must be escaped using \.[1] This commit adds the
escaping.
I discovered the issue after configuring collectd-mod-ping to monitor an
IPv6 host (2001:19f0:5:727:5b56:205d:ff55:2208). Accessing
https://192.168.0.1/cgi-bin/luci/admin/statistics/graph/ping would cause
the following messages to be logged:
Wed Nov 14 23:04:33 2018 daemon.err uhttpd[30261]: ERROR: can't parse DEF '2ping_avg_raw=/tmp/rrd/openwrthost/ping/ping-2001:19f0:5:727:5b56:205d:ff55:2208.rrd:value:AVERAGE' -2
Wed Nov 14 23:04:33 2018 daemon.err uhttpd[30261]: ERROR: can't parse DEF '2ping_droprate_avg_raw=/tmp/rrd/openwrthost/ping/ping_droprate-2001:19f0:5:727:5b56:205d:ff55:2208.rrd:value:AVERAGE' -2
and the graphs would not display. After applying this commit, the
graphs display correctly and no messages are logged.
1. https://oss.oetiker.ch/rrdtool/doc/rrdgraph_data.en.html#IDEF
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
Remove old rrdtool.po* files that have been deprecated already
in 2011-2015.
Also remove reference to them from i18n-sync.pl
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Thanks to a recent commit, the translation files will now
have info about locations where the string is used. That
can help is deciding the correct translation, as all contexts
are more easily found.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Add collectd-mod-curl plugin support. Which can do some complex track,
such as grab stock, but by now, only response time are supported.
Signed-off-by: Chizhong Jin <pjincz@gmail.com>
Since commit f6bfac211 ("luci-mod-status: rework iptables status page"),
nothing in luci-base depends on the iptparser class anymore, so fold it
out into a separate package and let the few apps that require it depend
on the new library package.
Saves about 10K uncompressed in luci-base while the iptables status
rework enlarged the markup by roughly 5KB, saving roughly 5KB of size
overall.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Some graph definitions rely on data not supported across all APC UPSes.
Due to recent upstream changes in collectd, the daemon no longer creates
a NaN-filled .rrd file corresponding to any missing UPS data. Depending
on the connected UPS, this may result in some "broken" graphs on the Luci
Statistics page since rrdtool cannot find the expected .rrd file.
Include the add_supported() function to determine the UPS data available
at runtime and update any definitions of graphs to include only supported
data. For example, the whole chart stack of AC input and output voltages
will normally be "broken" if the UPS only measures AC input voltage. With
these changes, the output voltage graph definition is stripped out,
allowing the chart to render.
Make consistent use of data types and instances in graph definitions. All
definitions now use the same format with the 'instances' key. Unnecessary
'types' and 'sources' keys are removed.
Fix the definition of 'line frequency' graph, based on upstream collectd
apcups plugin code: type is 'frequency' but instance should be 'input'.
This also includes some code and whitespace cleanup.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Signed-off-by: Vladimir <picfun@ya.ru>
[renamed swedish advanced-reboot.po as well, fixed a syntax error,
filtered updated files through ./build/i18n-sync.sh]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
The Voltage graph combines Battery, Input Voltage and Output Voltage.
The Y-Axis scale masks changes in Input/Output voltages over time.
This patch splits the graphs into 2 graphs.
This makes it possible to see variations in AC Input/Output voltages.
Signed-off-by: Bob Meizlik <bobmseagithub@squakmt.com>
OpenWRT/LEDE support for APC UPSes is only partial: although the collectd
apcups plugin is included, related lua/luci code is missing. These changes
add the lua side and have been used for ~2 years, both on OpenWRT and LEDE.
Reworked from patches submitted by James Klaas to the luci development list
in 2015.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Force logfile plugin to be evaluated first so that it gets placed
first in the collectd.conf file.
Reference to https://collectd.org/wiki/index.php/Plugin:LogFileFixes#1219
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Properly render menu items for plugin instances that do not have a
corresponding label defined.
This allows for registering new graph pages solely by dropping files
into /usr/lib/lua/luci/statistics/rrdtool/definitions/
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
A missing or faulty luci_statistics config file may prevent
LuCI access completely already at the login phase as
the statistics config is parsed already then.
The error is like:
.../statistics/datatree.lua:16: attempt to index upvalue 'sections' (a nil value)
User may be completely locked out of LuCI until he figures out
the need to have a proper luci_statistics config file.
Prevent the error by checking for the existence of
the uci config sections before trying to use values from them.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Fix graph visibility on processes page based on plugin
instance. The overview instance is empty, while monitored
processes have their own instances.
Original version of the patch created by @koblack and
discussed in #1021
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
The statistics graphs on the pages with multiple data sources
have contained links to the data sources, but those links
have not worked. Remove the links as they are unnecessary.
This commit fixes#1006
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Add advice about the permissions needed for the data directory:
Pages are rendered as user 'nobody', so the *.rrd files,
data directory and all its parent directories need to be
world readable.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Commit 39ff053890 accidentally removed the conffiles definitions
from luci-base, statistics, splash and diag-devinfo apps.
That has caused existing config files to get overwritten if the
package has been reinstalled via opkg. Additionally, the splash
text files have not been saved in sysupgrade or backup as they
are located outside /etc/config
This commit adds back the conffiles definitions to the respective
packages.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
The df plugin wasn't displaying useful lables for the space
used vs free vs reserved due to title override. This patch
fixes that issues by removing the per-instance setting.
Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
The original data model definition assumed data from a quad-core CPU,
which caused errors with single- and dual-core processors.
Adjust the data model to work with also them.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Add support for 'cpufreq' plugin in collectd, which monitors
the CPU cores' frequencies. Some platforms enable dynamic
frequency scaling according to CPU load.
'cpufreq' plugin can currently be built for x86 and mvebu.
(and it should likely be enabled also for ipq806x)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Add cpu and memory statistics plugins to the default set included
in Luci statistics and enable them in the default config. They are
useful small collectd plugins for resource usage monitoring.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Different UPSes report differents stats; here we add graphing
of some additional statistics supports by some models.
Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
Introduce option that enables the user to select max values
instead of averages for graphs if the user has disabled RRAsingle.
The option defaults to average values, which have been the default
in Luci statistics.
Remove 'optional' from RRASingle, as it is a key option for statistics.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
With rrdsingle the average values are used for graphing. As the
timescale increases (say over a day or month) the average values
progressively reduce. Using the maximum value over the longer periods
is arguably no less deceptive but it does produce more informative
graphs.
V2 - Invert the default path logic related to rra.single
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Remove the usually empty standard deviation graph from the ping page.
The graph is empty for most users as collectd measures standard deviation
of individual pings inside the general interval of statistics collection.
Default setting for both ping interval and general collection interval
is 30s in Luci statistics, meaning just 1 ping per interval, which
leads to empty graph.
(To provide relveant data, the ping interval should be 1/4-1/5 of the
general collection interval. Even then the graph does not look very
informative due to different scaling than the latency graph.)
Note that this commit does not change collectd itself, which continues
to collect and calculate also the std.dev. data, which can be fetched
with 'rrdtool' if needed.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Some applications only support ipv4 so add ipv4only option
to host and hostport datatypes so that for thos applications
that when an IP address is specified only and ipv4 ip address
gets accepted.
Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).
Clarify the plugin definition with some additional line spacing.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Sync translations to the current strings.
Changes in luci-app-ddns, luci-app-mjpg-streamer, luci-app-qos,
luci-app-shadowsocks-libev, luci-app-statistics and luci-base
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Due to a lack of a test environment this support only covers thermal graphs
so far. Please send the output of "rrdtool info /tmp/rrd/*/sensors-*/*.rrd"
if your system happens to support voltage, power or fanspeed sensors.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
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>
