From: Pavel Rochnyak <pavel2000@ngs.ru>
Date: Tue, 3 Mar 2020 19:51:25 +0000 (+0700)
Subject: collection.cgi: Use `value` as ds_names
X-Git-Tag: collectd-5.12.0~60^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3395%2Fhead;p=thirdparty%2Fcollectd.git

collection.cgi: Use `value` as ds_names

Fixes users, entropy, and ntpd (time_offset/frequency_offset) graphs
that were broken by the great data source name normalization of
collectd v4 -> v5.
---

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 5ff259ff0..68b3c2751 100755
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -1369,9 +1369,9 @@ sub load_graph_definitions
     'GPRINT:avg:LAST:%4.0lf Last\l'
     ],
     entropy => ['-v', 'Bits',
-    'DEF:avg={file}:entropy:AVERAGE',
-    'DEF:min={file}:entropy:MIN',
-    'DEF:max={file}:entropy:MAX',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:min={file}:value:MIN',
+    'DEF:max={file}:value:MAX',
     "AREA:max#$HalfBlue",
     "AREA:min#$Canvas",
     "LINE1:avg#$FullBlue:Bits",
@@ -1405,9 +1405,9 @@ sub load_graph_definitions
     'GPRINT:avg:LAST:%4.1lf Last\l'
     ],
     frequency_offset => [ # NTPd
-    'DEF:ppm_avg={file}:ppm:AVERAGE',
-    'DEF:ppm_min={file}:ppm:MIN',
-    'DEF:ppm_max={file}:ppm:MAX',
+    'DEF:ppm_avg={file}:value:AVERAGE',
+    'DEF:ppm_min={file}:value:MIN',
+    'DEF:ppm_max={file}:value:MAX',
     "AREA:ppm_max#$HalfBlue",
     "AREA:ppm_min#$Canvas",
     "LINE1:ppm_avg#$FullBlue:{inst}",
@@ -2480,9 +2480,9 @@ sub load_graph_definitions
     'GPRINT:avg:LAST:%5.1lf%s Last\l'
     ],
     time_offset => [ # NTPd
-    'DEF:s_avg={file}:seconds:AVERAGE',
-    'DEF:s_min={file}:seconds:MIN',
-    'DEF:s_max={file}:seconds:MAX',
+    'DEF:s_avg={file}:value:AVERAGE',
+    'DEF:s_min={file}:value:MIN',
+    'DEF:s_max={file}:value:MAX',
     "AREA:s_max#$HalfBlue",
     "AREA:s_min#$Canvas",
     "LINE1:s_avg#$FullBlue:{inst}",
@@ -2552,9 +2552,9 @@ sub load_graph_definitions
     'GPRINT:multimeter_avg:LAST:%4.1lf Last\l'
     ],
     users => ['-v', 'Users',
-    'DEF:users_avg={file}:users:AVERAGE',
-    'DEF:users_min={file}:users:MIN',
-    'DEF:users_max={file}:users:MAX',
+    'DEF:users_avg={file}:value:AVERAGE',
+    'DEF:users_min={file}:value:MIN',
+    'DEF:users_max={file}:value:MAX',
     "AREA:users_max#$HalfBlue",
     "AREA:users_min#$Canvas",
     "LINE1:users_avg#$FullBlue:Users",