Commit graph

136 commits

Author SHA1 Message Date
INAGAKI Hiroshi
19c4b71af4 i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2019-07-13 19:23:18 +08:00
Florian Eckert
0633fb23c8 luci-app-statistics: fix collectd config generation
Fix config generation for the following sections:

* curl
* exec
* network
* iptables

Ref: https://github.com/openwrt/packages/issues/9427
Fixes: c1380ab ("make luci-app-statistics more extensible")

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-07-09 13:04:06 +02:00
Matthias Berndt
c1380ab367 make luci-app-statistics more extensible 2019-07-05 02:03:13 +02:00
Loïc Yhuel
af5771426b luci-app-statistics: add address family configuration for ping
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>
2019-06-21 02:03:12 +02:00
Hannu Nyman
0a5579a631 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-06-09 19:24:00 +03:00
Franco Castillo
5c93eb3022 luci-app-statistics: Update Spanish translation
Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
2019-05-28 16:08:31 -03:00
Fabian Schmid-Michels
50bb1185da luci-app-statistics: change nut voltage graph combines view.
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>
2019-05-14 09:13:05 +02:00
Florian Eckert
1e206cd32d
Merge pull request #2514 from sandinak/feature_luci_stats_multiple_ups
luci-app-statistics: adding ability for luci_stats config to have multiple UPS's
2019-05-14 08:17:22 +02:00
INAGAKI Hiroshi
b21a425a2c i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2019-05-13 18:18:52 +09:00
Jo-Philipp Wich
3b379f01b5 luci-app-statistics: escape backslashes as well
Fixes: bab4a3ef ("luci-app-statistics - allow rrd files to contain :")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-04-30 09:08:56 +02:00
Martin Surovcak
7bab4a3ef2
luci-app-statistics - allow rrd files to contain :
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.
2019-04-04 00:36:05 +02:00
Florian Eckert
05f0649716 luci-app-statistics: update i18n
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-03-08 08:39:48 +01:00
Florian Eckert
cd1e8cc6b9 luci-app-statistics: add new item callback for menu entry
Add the item callback function to the rrdtool definitions.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-03-07 15:16:55 +01:00
Florian Eckert
82c2a97314 luci-app-statistics: load graph menu entry name from the definitions
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>
2019-03-07 15:16:38 +01:00
Florian Eckert
42a060a852 luci-app-statistics: Diskfree graph show also percent view
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>
2019-03-07 15:16:17 +01:00
Florian Eckert
b42465f3fc luci-app-statistics: rrdtool add canvas height option
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>
2019-03-07 15:14:11 +01:00
Franco Castillo
40d594e901 luci-app-statistics: Update Spanish translation
Update Spanish translation

Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
2019-03-02 12:57:43 -03:00
Hannu Nyman
9c3132b97e
Merge pull request #2515 from TDT-AG/pr/20190207-luci-app-statistics
luci-app-statistics: minor fixes
2019-02-25 18:31:33 +02:00
Florian Eckert
e380c29960 luci-app-statistics: fix whitespaces
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-02-25 14:45:00 +01:00
Zheng Qian
8e4780a65d luci-app-statistics: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2019-02-12 09:23:55 +08:00
Branson Matheson
30ee65fcab adding ability for luci_stats config to have multiple UPS's 2019-02-05 13:21:31 -05:00
INAGAKI Hiroshi
ccb762997f i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2019-02-04 21:44:52 +09:00
Hannu Nyman
865d0cf9c7 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-01-24 18:43:21 +02:00
Florian Eckert
c593a210b2 luci-app-statisctis: only include lua modules in rrd statistics into local scope
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-01-21 14:44:20 +01:00
Florian Eckert
8302e7995e luci-app-statistics: remove unused luci.sys include
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-01-21 14:44:20 +01:00
Florian Eckert
b8aa3ebced luci-app-statistics: only include lua modules into local scope
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-01-21 14:44:06 +01:00
Florian Eckert
6e8c99714e luic-app-statistics: reduce copyright headers
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-01-21 14:42:10 +01:00
Florian Eckert
d78f79a404 luci-app-statistics: fix whitespaces in rrdtool definitions
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-01-21 14:42:01 +01:00
yangfl
6f8fbb1e62 i18n: update Chinese translation
Signed-off-by: David Yang <mmyangfl@gmail.com>
2019-01-04 00:51:56 +08:00
INAGAKI Hiroshi
37b0211e62 i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-12-20 02:21:14 +09:00
Anton Kikin
562ae5f0e5 luci-app-statistics: update and fix Russian translation
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>
2018-11-21 22:40:47 +02:00
Kevin Locke
1bbc419e7a luci-app-statistics: quote : in filenames for DEF
: 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>
2018-11-14 16:55:24 -07:00
Hannu Nyman
36b1c60efc luci-app-statistics: remove old deprecated rrdtool po files
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>
2018-11-11 18:10:46 +02:00
Hannu Nyman
89e26911f1 i18n: cleanup old strings
also sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-11-10 21:26:41 +02:00
Hannu Nyman
40de466475 i18n: sync translations, add location annotatations
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>
2018-11-07 18:10:59 +02:00
Hannu Nyman
982c023deb i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-11-04 18:05:01 +02:00
Hannu Nyman
703cd24868
Merge pull request #2209 from jinchizhong/luci-app-statistics-add-curl
luci-app-statistics: add support for cUrl
2018-10-13 22:02:42 +03:00
Chizhong Jin
2d1830422b pp-statistics: add support for cUrl
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>
2018-10-14 02:34:49 +08:00
yangfl
89333d2b63 luci-app: Fix typos for po strings
Signed-off-by: David Yang <mmyangfl@gmail.com>
2018-10-12 22:18:51 +08:00
yangfl
ae8b68cfe8 treewide: Fix typos in UI strings
Signed-off-by: David Yang <mmyangfl@gmail.com>
2018-10-12 22:18:51 +08:00
Hannu Nyman
67fd6b6e5e
Merge pull request #2197 from yangfl/master
treewide: Fix typos in comments
2018-10-10 20:25:11 +03:00
Jo-Philipp Wich
94323a61e1 luci-base: move luci.sys.iptparser into separate package
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>
2018-10-10 13:19:48 +02:00
yangfl
401382a459 treewide: Fix typos in comments
Signed-off-by: David Yang <mmyangfl@gmail.com>
2018-10-10 15:00:07 +08:00
Luiz Angelo Daros de Luca
728501dd57 i18n: update pt-br translation
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-09-20 21:58:33 -03:00
yangfl
9711120e06 luci-app: update Chinese translation
Signed-off-by: David Yang <mmyangfl@gmail.com>
2018-08-11 15:46:07 +08:00
Jo-Philipp Wich
fa2975d7c5 luci-app-statistics: convert init script to procd
Convert init script to procd format in order to register reload triggers
on /etc/config/luci_statistics.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-02 07:15:58 +02:00
Jo-Philipp Wich
c0d9c4f3ce treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 09:37:43 +02:00
guidosarducci
fa1f4c42a6 luci-app-statistics: only graph data supported by APC UPS
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>
2018-03-03 13:54:55 -08:00
Vladimir
d74ff878e1 i18n-ru: fixed and updated russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-26 16:57:15 +03:00
Vladimir
bb87aac852 i18n-ru: Edits on the general pattern of Russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-20 14:02:48 +03:00