Move power supply python module to proc plugin (#4960)
* Add power supply module * Use linked list * Add charts for all properties * Organize charts menu * Fix line endings * Keep files open * Add options for chart disabling * Final cleanup * Add documentation, disable python module * Fix file attributes * Mark python module as obsolete * Allow symbolic links to power source directories
Vladimir Kobal committed
Dec 13, 2018 at 18:48 UTC
2e6d26bafd5ce00b47d098a045a1d9c4f2d84936
13 files changed
+493
-13
CMakeLists.txt
+1
@@ -288,6 +288,7 @@ set(PROC_PLUGIN_FILES
288
collectors/proc.plugin/sys_devices_system_edac_mc.c
289
collectors/proc.plugin/sys_devices_system_node.c
290
collectors/proc.plugin/sys_fs_btrfs.c
291
+ collectors/proc.plugin/sys_class_power_supply.c
292
)
293
294
set(TC_PLUGIN_FILES
Makefile.am
+1
@@ -270,6 +270,7 @@ PROC_PLUGIN_FILES = \
270
collectors/proc.plugin/sys_devices_system_edac_mc.c \
271
collectors/proc.plugin/sys_devices_system_node.c \
272
collectors/proc.plugin/sys_fs_btrfs.c \
273
+ collectors/proc.plugin/sys_class_power_supply.c \
274
$(NULL)
275
276
TC_PLUGIN_FILES = \
collectors/all.h
+6
@@ -307,6 +307,12 @@
307
#define NETDATA_CHART_PRIO_MDSTAT_FINISH 9004
308
#define NETDATA_CHART_PRIO_MDSTAT_SPEED 9005
309
310
+// Linux Power Supply
311
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY 9500 // 4 charts per power supply
312
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_CHARGE 9501
313
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_ENERGY 9502
314
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_VOLTAGE 9503
315
+
316
// CGROUPS
317
318
#define NETDATA_CHART_PRIO_CGROUPS_SYSTEMD 19000 // many charts
collectors/proc.plugin/README.md
+62
@@ -19,6 +19,7 @@
19
- `/proc/softirqs` (total and per core software interrupts)
20
- `/proc/loadavg` (system load and total processes running)
21
- `/proc/sys/kernel/random/entropy_avail` (random numbers pool availability - used in cryptography)
22
+ - `/sys/class/power_supply` (power supply properties)
23
- `ksm` Kernel Same-Page Merging performance (several files under `/sys/kernel/mm/ksm`).
24
- `netdata` (internal netdata resources utilization)
25
@@ -273,4 +274,65 @@ Example image:
274
275
See Linux Anti-DDoS in action at: **[netdata demo site (with SYNPROXY enabled)](https://registry.my-netdata.io/#menu_netfilter_submenu_synproxy)**
276
277
+## Linux power supply
278
+
279
+This module monitors various metrics reported by power supply drivers
280
+on Linux. This allows tracking and alerting on things like remaining
281
+battery capacity.
282
+
283
+Depending on the underlying driver, it may provide the following charts
284
+and metrics:
285
+
286
+1. Capacity: The power supply capacity expressed as a percentage.
287
+ * capacity\_now
288
+
289
+2. Charge: The charge for the power supply, expressed as amphours.
290
+ * charge\_full\_design
291
+ * charge\_full
292
+ * charge\_now
293
+ * charge\_empty
294
+ * charge\_empty\_design
295
+
296
+3. Energy: The energy for the power supply, expressed as watthours.
297
+ * energy\_full\_design
298
+ * energy\_full
299
+ * energy\_now
300
+ * energy\_empty
301
+ * energy\_empty\_design
302
+
303
+2. Voltage: The voltage for the power supply, expressed as volts.
304
+ * voltage\_max\_design
305
+ * voltage\_max
306
+ * voltage\_now
307
+ * voltage\_min
308
+ * voltage\_min\_design
309
+
310
+#### configuration
311
+
312
+```
313
+[plugin:proc:/sys/class/power_supply]
314
+ # battery capacity = yes
315
+ # battery charge = no
316
+ # battery energy = no
317
+ # power supply voltage = no
318
+ # keep files open = auto
319
+ # directory to monitor = /sys/class/power_supply
320
+```
321
+
322
+#### notes
323
+
324
+* Most drivers provide at least the first chart. Battery powered ACPI
325
+compliant systems (like most laptops) provide all but the third, but do
326
+not provide all of the metrics for each chart.
327
+
328
+* Current, energy, and voltages are reported with a _very_ high precision
329
+by the power\_supply framework. Usually, this is far higher than the
330
+actual hardware supports reporting, so expect to see changes in these
331
+charts jump instead of scaling smoothly.
332
+
333
+* If `max` or `full` attribute is defined by the driver, but not a
334
+corresponding `min` or `empty` attribute, then Netdata will still provide
335
+the corresponding `min` or `empty`, which will then always read as zero.
336
+This way, alerts which match on these will still work.
337
+
338
[]()
collectors/proc.plugin/plugin_proc.c
+3
@@ -64,6 +64,9 @@ static struct proc_module {
64
// IPC metrics
65
{ .name = "ipc", .dim = "ipc", .func = do_ipc },
66
67
+ // linux power supply metrics
68
+ { .name = "/sys/class/power_supply", .dim = "power_supply", .func = do_sys_class_power_supply },
69
+
70
// the terminator of this array
71
{ .name = NULL, .dim = NULL, .func = NULL }
72
};
collectors/proc.plugin/plugin_proc.h
+1
@@ -53,6 +53,7 @@ extern int do_proc_net_sockstat(int update_every, usec_t dt);
53
extern int do_proc_net_sockstat6(int update_every, usec_t dt);
54
extern int do_proc_net_sctp_snmp(int update_every, usec_t dt);
55
extern int do_ipc(int update_every, usec_t dt);
56
+extern int do_sys_class_power_supply(int update_every, usec_t dt);
57
extern int get_numa_node_count(void);
58
59
// metrics that need to be shared among data collectors
collectors/proc.plugin/sys_class_power_supply.c
new
+381
@@ -0,0 +1,381 @@
1
+// SPDX-License-Identifier: GPL-3.0-or-later
2
+
3
+#include "plugin_proc.h"
4
+
5
+#define PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME "/sys/class/power_supply"
6
+
7
+const char *ps_property_names[] = { "charge", "energy", "voltage"};
8
+const char *ps_property_titles[] = {"Battery charge", "Battery energy", "Power supply voltage"};
9
+const char *ps_property_units[] = { "Ah", "Wh", "V"};
10
+
11
+const char *ps_property_dim_names[] = {"empty_design", "empty", "now", "full", "full_design",
12
+ "empty_design", "empty", "now", "full", "full_design",
13
+ "min_design", "min", "now", "max", "max_design"};
14
+
15
+struct ps_property_dim {
16
+ char *name;
17
+ char *filename;
18
+ int fd;
19
+
20
+ RRDDIM *rd;
21
+ unsigned long long value;
22
+
23
+ struct ps_property_dim *next;
24
+};
25
+
26
+struct ps_property {
27
+ char *name;
28
+ char *title;
29
+ char *units;
30
+
31
+ RRDSET *st;
32
+
33
+ struct ps_property_dim *property_dim_root;
34
+
35
+ struct ps_property *next;
36
+};
37
+
38
+struct capacity {
39
+ char *filename;
40
+ int fd;
41
+
42
+ RRDSET *st;
43
+ RRDDIM *rd;
44
+ unsigned long long value;
45
+};
46
+
47
+struct power_supply {
48
+ char *name;
49
+ uint32_t hash;
50
+ int found;
51
+
52
+ struct capacity *capacity;
53
+
54
+ struct ps_property *property_root;
55
+
56
+ struct power_supply *next;
57
+};
58
+
59
+static struct power_supply *power_supply_root = NULL;
60
+static int files_num = 0;
61
+
62
+void power_supply_free(struct power_supply *ps) {
63
+ if(likely(ps)) {
64
+
65
+ // free capacity structure
66
+ if(likely(ps->capacity)) {
67
+ if(likely(ps->capacity->st)) rrdset_is_obsolete(ps->capacity->st);
68
+ freez(ps->capacity->filename);
69
+ if(likely(ps->capacity->fd != -1)) close(ps->capacity->fd);
70
+ files_num--;
71
+ freez(ps->capacity);
72
+ }
73
+ freez(ps->name);
74
+
75
+ struct ps_property *pr = ps->property_root;
76
+ while(likely(pr)) {
77
+
78
+ // free dimensions
79
+ struct ps_property_dim *pd = pr->property_dim_root;
80
+ while(likely(pd)) {
81
+ freez(pd->name);
82
+ freez(pd->filename);
83
+ if(likely(pd->fd != -1)) close(pd->fd);
84
+ files_num--;
85
+ struct ps_property_dim *d = pd;
86
+ pd = pd->next;
87
+ freez(d);
88
+ }
89
+
90
+ // free properties
91
+ if(likely(pr->st)) rrdset_is_obsolete(pr->st);
92
+ freez(pr->name);
93
+ freez(pr->title);
94
+ freez(pr->units);
95
+ struct ps_property *p = pr;
96
+ pr = pr->next;
97
+ freez(p);
98
+ }
99
+
100
+ // remove power supply from linked list
101
+ if(likely(ps == power_supply_root)) {
102
+ power_supply_root = ps->next;
103
+ }
104
+ else {
105
+ struct power_supply *last;
106
+ for(last = power_supply_root; last && last->next != ps; last = last->next);
107
+ last->next = ps->next;
108
+ }
109
+
110
+ freez(ps);
111
+ }
112
+}
113
+
114
+int do_sys_class_power_supply(int update_every, usec_t dt) {
115
+ (void)dt;
116
+ static int do_capacity = -1, do_property[3] = {-1};
117
+ static int keep_fds_open = CONFIG_BOOLEAN_NO, keep_fds_open_config = -1;
118
+ static char *dirname = NULL;
119
+
120
+ if(unlikely(do_capacity == -1)) {
121
+ do_capacity = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery capacity", CONFIG_BOOLEAN_YES);
122
+ do_property[0] = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery charge", CONFIG_BOOLEAN_NO);
123
+ do_property[1] = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery energy", CONFIG_BOOLEAN_NO);
124
+ do_property[2] = config_get_boolean("plugin:proc:/sys/class/power_supply", "power supply voltage", CONFIG_BOOLEAN_NO);
125
+
126
+ keep_fds_open_config = config_get_boolean_ondemand("plugin:proc:/sys/class/power_supply", "keep files open", CONFIG_BOOLEAN_AUTO);
127
+
128
+ char filename[FILENAME_MAX + 1];
129
+ snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/class/power_supply");
130
+ dirname = config_get("plugin:proc:/sys/class/power_supply", "directory to monitor", filename);
131
+ }
132
+
133
+ DIR *dir = opendir(dirname);
134
+ if(unlikely(!dir)) {
135
+ error("Cannot read directory '%s'", dirname);
136
+ return 1;
137
+ }
138
+
139
+ struct dirent *de = NULL;
140
+ while(likely(de = readdir(dir))) {
141
+ if(likely(de->d_type == DT_DIR
142
+ && (
143
+ (de->d_name[0] == '.' && de->d_name[1] == '\0')
144
+ || (de->d_name[0] == '.' && de->d_name[1] == '.' && de->d_name[2] == '\0')
145
+ )))
146
+ continue;
147
+
148
+ if(likely(de->d_type == DT_LNK || de->d_type == DT_DIR)) {
149
+ uint32_t hash = simple_hash(de->d_name);
150
+
151
+ struct power_supply *ps;
152
+ for(ps = power_supply_root; ps; ps = ps->next) {
153
+ if(unlikely(ps->hash == hash && !strcmp(ps->name, de->d_name))) {
154
+ ps->found = 1;
155
+ break;
156
+ }
157
+ }
158
+
159
+ // allocate memory for power supply and initialize it
160
+ if(unlikely(!ps)) {
161
+ ps = callocz(sizeof(struct power_supply), 1);
162
+ ps->name = strdupz(de->d_name);
163
+ ps->hash = simple_hash(de->d_name);
164
+ ps->found = 1;
165
+ ps->next = power_supply_root;
166
+ power_supply_root = ps;
167
+
168
+ struct stat stbuf;
169
+ if(likely(do_capacity != CONFIG_BOOLEAN_NO)) {
170
+ char filename[FILENAME_MAX + 1];
171
+ snprintfz(filename, FILENAME_MAX, "%s/%s/%s", dirname, de->d_name, "capacity");
172
+ if (stat(filename, &stbuf) == 0) {
173
+ ps->capacity = callocz(sizeof(struct capacity), 1);
174
+ ps->capacity->filename = strdupz(filename);
175
+ ps->capacity->fd = -1;
176
+ files_num++;
177
+ }
178
+ }
179
+
180
+ // allocate memory and initialize structures for every property and file found
181
+ size_t pr_idx, pd_idx;
182
+ size_t prev_idx = 3; // there is no property with this index
183
+
184
+ for(pr_idx = 0; pr_idx < 3; pr_idx++) {
185
+ if(unlikely(do_property[pr_idx] != CONFIG_BOOLEAN_NO)) {
186
+ struct ps_property *pr = NULL;
187
+
188
+ for(pd_idx = pr_idx * 5; pd_idx < pr_idx * 5 + 5; pd_idx++) {
189
+
190
+ // check if file exists
191
+ char filename[FILENAME_MAX + 1];
192
+ snprintfz(filename, FILENAME_MAX, "%s/%s/%s_%s", dirname, de->d_name,
193
+ ps_property_names[pr_idx], ps_property_dim_names[pd_idx]);
194
+ if (stat(filename, &stbuf) == 0) {
195
+
196
+ // add chart
197
+ if(unlikely(prev_idx != pr_idx)) {
198
+ pr = callocz(sizeof(struct ps_property), 1);
199
+ pr->name = strdupz(ps_property_names[pr_idx]);
200
+ pr->title = strdupz(ps_property_titles[pr_idx]);
201
+ pr->units = strdupz(ps_property_units[pr_idx]);
202
+ prev_idx = pr_idx;
203
+ pr->next = ps->property_root;
204
+ ps->property_root = pr;
205
+ }
206
+
207
+ // add dimension
208
+ struct ps_property_dim *pd;
209
+ pd= callocz(sizeof(struct ps_property_dim), 1);
210
+ pd->name = strdupz(ps_property_dim_names[pd_idx]);
211
+ pd->filename = strdupz(filename);
212
+ pd->fd = -1;
213
+ files_num++;
214
+ pd->next = pr->property_dim_root;
215
+ pr->property_dim_root = pd;
216
+ }
217
+ }
218
+ }
219
+ }
220
+ }
221
+
222
+ // read capacity file
223
+ if(likely(ps->capacity)) {
224
+ char buffer[30 + 1];
225
+
226
+ if(unlikely(ps->capacity->fd == -1)) {
227
+ ps->capacity->fd = open(ps->capacity->filename, O_RDONLY, 0666);
228
+ if(unlikely(ps->capacity->fd == -1)) {
229
+ error("Cannot open file '%s'", ps->capacity->filename);
230
+ power_supply_free(ps);
231
+ }
232
+ }
233
+
234
+ ssize_t r = read(ps->capacity->fd, buffer, 30);
235
+ if(unlikely(r < 1)) {
236
+ error("Cannot read file '%s'", ps->capacity->filename);
237
+ power_supply_free(ps);
238
+ }
239
+ buffer[r] = '\0';
240
+ ps->capacity->value = str2ull(buffer);
241
+
242
+ if(unlikely(!keep_fds_open)) {
243
+ close(ps->capacity->fd);
244
+ ps->capacity->fd = -1;
245
+ }
246
+ else if(unlikely(lseek(ps->capacity->fd, 0, SEEK_SET) == -1)) {
247
+ error("Cannot seek in file '%s'", ps->capacity->filename);
248
+ close(ps->capacity->fd);
249
+ ps->capacity->fd = -1;
250
+ }
251
+ }
252
+
253
+ // read property files
254
+ int read_error = 0;
255
+ struct ps_property *pr;
256
+ for(pr = ps->property_root; pr && !read_error; pr = pr->next) {
257
+ struct ps_property_dim *pd;
258
+ for(pd = pr->property_dim_root; pd; pd = pd->next) {
259
+ char buffer[30 + 1];
260
+
261
+ if(unlikely(pd->fd == -1)) {
262
+ pd->fd = open(pd->filename, O_RDONLY, 0666);
263
+ if(unlikely(pd->fd == -1)) {
264
+ error("Cannot open file '%s'", pd->filename);
265
+ read_error = 1;
266
+ power_supply_free(ps);
267
+ break;
268
+ }
269
+ }
270
+
271
+ ssize_t r = read(pd->fd, buffer, 30);
272
+ if(unlikely(r < 1)) {
273
+ error("Cannot read file '%s'", pd->filename);
274
+ read_error = 1;
275
+ power_supply_free(ps);
276
+ break;
277
+ }
278
+ buffer[r] = '\0';
279
+ pd->value = str2ull(buffer);
280
+
281
+ if(unlikely(!keep_fds_open)) {
282
+ close(pd->fd);
283
+ pd->fd = -1;
284
+ }
285
+ else if(unlikely(lseek(pd->fd, 0, SEEK_SET) == -1)) {
286
+ error("Cannot seek in file '%s'", pd->filename);
287
+ close(pd->fd);
288
+ pd->fd = -1;
289
+ }
290
+ }
291
+ }
292
+ }
293
+ }
294
+
295
+ closedir(dir);
296
+
297
+ keep_fds_open = keep_fds_open_config;
298
+ if(likely(keep_fds_open_config == CONFIG_BOOLEAN_AUTO)) {
299
+ if(unlikely(files_num > 32))
300
+ keep_fds_open = CONFIG_BOOLEAN_NO;
301
+ else
302
+ keep_fds_open = CONFIG_BOOLEAN_YES;
303
+ }
304
+
305
+ // --------------------------------------------------------------------
306
+
307
+ struct power_supply *ps = power_supply_root;
308
+ while(unlikely(ps)) {
309
+ if(unlikely(!ps->found)) {
310
+ struct power_supply *f = ps;
311
+ ps = ps->next;
312
+ power_supply_free(f);
313
+ continue;
314
+ }
315
+
316
+ if(likely(ps->capacity)) {
317
+ if(unlikely(!ps->capacity->st)) {
318
+ ps->capacity->st = rrdset_create_localhost(
319
+ "powersupply_capacity"
320
+ , ps->name
321
+ , NULL
322
+ , ps->name
323
+ , "powersupply.capacity"
324
+ , "Battery capacity"
325
+ , "percentage"
326
+ , PLUGIN_PROC_NAME
327
+ , PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME
328
+ , NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY
329
+ , update_every
330
+ , RRDSET_TYPE_LINE
331
+ );
332
+ }
333
+ else
334
+ rrdset_next(ps->capacity->st);
335
+
336
+ if(unlikely(!ps->capacity->rd)) ps->capacity->rd = rrddim_add(ps->capacity->st, "capacity", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
337
+ rrddim_set_by_pointer(ps->capacity->st, ps->capacity->rd, ps->capacity->value);
338
+
339
+ rrdset_done(ps->capacity->st);
340
+ }
341
+
342
+ struct ps_property *pr;
343
+ for(pr = ps->property_root; pr; pr = pr->next) {
344
+ if(unlikely(!pr->st)) {
345
+ char id[50 + 1], context[50 + 1];
346
+ snprintfz(id, RRD_ID_LENGTH_MAX, "powersupply_%s", pr->name);
347
+ snprintfz(context, RRD_ID_LENGTH_MAX, "powersupply.%s", pr->name);
348
+
349
+ pr->st = rrdset_create_localhost(
350
+ id
351
+ , ps->name
352
+ , NULL
353
+ , ps->name
354
+ , context
355
+ , pr->title
356
+ , pr->units
357
+ , PLUGIN_PROC_NAME
358
+ , PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME
359
+ , NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY
360
+ , update_every
361
+ , RRDSET_TYPE_LINE
362
+ );
363
+ }
364
+ else
365
+ rrdset_next(pr->st);
366
+
367
+ struct ps_property_dim *pd;
368
+ for(pd = pr->property_dim_root; pd; pd = pd->next) {
369
+ if(unlikely(!pd->rd)) pd->rd = rrddim_add(pr->st, pd->name, NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
370
+ rrddim_set_by_pointer(pr->st, pd->rd, pd->value);
371
+ }
372
+
373
+ rrdset_done(pr->st);
374
+ }
375
+
376
+ ps->found = 0;
377
+ ps = ps->next;
378
+ }
379
+
380
+ return 0;
381
+}
collectors/python.d.plugin/linux_power_supply/README.md
+5
@@ -1,5 +1,10 @@
1
# Linux power supply
2
3
+> THIS MODULE IS OBSOLETE.
4
+> USE THE [PROC PLUGIN](../../proc.plugin) - IT IS MORE EFFICIENT
5
+
6
+---
7
+
8
This module monitors variosu metrics reported by power supply drivers
9
on Linux. This allows tracking and alerting on things like remaining
10
battery capacity.
collectors/python.d.plugin/python.d.plugin.in
+1
-1
@@ -56,7 +56,7 @@ BASE_CONFIG = {'update_every': os.getenv('NETDATA_UPDATE_EVERY', 1),
56
57
58
MODULE_EXTENSION = '.chart.py'
59
-OBSOLETE_MODULES = ['apache_cache', 'gunicorn_log', 'nginx_log', 'cpufreq', 'cpuidle', 'mdstat']
59
+OBSOLETE_MODULES = ['apache_cache', 'gunicorn_log', 'nginx_log', 'cpufreq', 'cpuidle', 'mdstat', 'linux_power_supply']
60
61
62
def module_ok(m):
health/health.d/linux_power_supply.conf
+1
-1
@@ -1,7 +1,7 @@
1
# Alert on low battery capacity.
2
3
template: linux_power_supply_capacity
4
- on: power_supply.capacity
4
+ on: powersupply.capacity
5
calc: $capacity
6
units: %
7
every: 10s
web/gui/dashboard_info.js
+21
-2
@@ -436,10 +436,10 @@ netdataDashboard.menu = {
436
info: undefined
437
},
438
439
- 'linux_power_supply': {
439
+ 'powersupply': {
440
title: 'Power Supply',
441
icon: '<i class="fas fa-battery-half"></i>',
442
- info: 'Statistics for the various system power supplies.'
442
+ info: 'Statistics for the various system power supplies. Data collected from <a href="https://www.kernel.org/doc/Documentation/power/power_supply_class.txt">Linux power supply class</a>.'
443
}
444
};
445
@@ -2315,6 +2315,25 @@ netdataDashboard.context = {
2315
2316
'proxysql.commands_duration': {
2317
info: 'The total time spent executing commands of that type, in ms'
2318
+ },
2319
+
2320
+ // ------------------------------------------------------------------------
2321
+ // Power Supplies
2322
+
2323
+ 'powersupply.capacity': {
2324
+ info: undefined
2325
+ },
2326
+
2327
+ 'powersupply.charge': {
2328
+ info: undefined
2329
+ },
2330
+
2331
+ 'powersupply.energy': {
2332
+ info: undefined
2333
+ },
2334
+
2335
+ 'powersupply.voltage': {
2336
+ info: undefined
2337
}
2338
2339
// ------------------------------------------------------------------------
web/gui/index.html
+3
-3
@@ -14,7 +14,7 @@
14
<meta name="author" content="costa@tsaousis.gr">
15
16
<link rel="stylesheet" type="text/css" href="main.css?v=2">
17
-
17
+
18
<link rel="icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACyklEQVRYhcWXz0sUYRjHP8+wLItImEhnEfEgEVJk+56CbCECQWezOkTQTTp6kejgKUSoEAoK/wAhaaeDBkLoIahZIWIJo0U8hHQJJBYJERGfDrOju7PjuO5u6/c0PM/7zvfzvvP+eEaoVu6wBZIA3cW82wtvY7cD1xEWSTpb1bxWjm2RtbtQxoF7iLSA7gO/UL4A74G3mBIzNz0Peg1hFmUK46zXBuDaCYQJlDFE4ke/QreAZyhPMc42rt2PyEoxt4cyDUxgnO3qAVy7C8gg0hdFHwBZA0ZIOt9w7e+I9B6mdBVhmGTlbFQCuPYFhA8g56o3P3D6CwyiDCIyFshtgqRIZnKlUStg3lW7OYC0AvPATkiuA9U3uOlEOEDWTgCZ2s3LIMbCU9ID3A8HUCZO9s2jGCRxdFIflDUF/EX3I3q1N0iq+8BZf+v6MzDeFHMAEQvoJpuOAwiu3Qr89g6ZJkm5CnoHeBwDbjTV3CPoRRhF+WQBA801B+AJiAUMWMDFptuLtBef+iygs+kAh+q0gDOnCNBmETyOmywLKJyifyEG/ATqPP+LUt0FZoAlIA6MgNyKqDo2YkAO6G+QeQrjfCyJzuHaoyCvjuiVs4q0jdBMwNyTcV6j+jm0h7BkAYuohpZLJ1TUQJYrIqo7KAtW8VaabQBA1GVWmROZwzgFfwtOoRpealevdGg0a8eAoUB0D9VJ8M8A46yDTNdlL9wmaz8MMX9RrIQOpfoS4+S9br7cdAvoCiLn6wLxFtwyQhxlKMQ8j3CJpFeml+9QN90N6iLSURfEkXD8AQwms+aHyo9hk1kHSaG6+Z/MU6XmlQAeRA7EoLraQPM83si/BlPhF5E3E1dQfY5S++5Q/9dMLwdH7uv4n1PX7gEeAXejy+0y4x2QOWASk8lHNT0e4AAk3QZ6E6+E68MrZNqK2QKwgXevLCEskHSqumX/AUXU5QBtOC5FAAAAAElFTkSuQmCC">
19
20
<!-- <link rel="apple-touch-icon" sizes="57x57" href="images/apple-icon-57x57.png">
@@ -168,7 +168,7 @@
168
<i class="fas fa-copyright"></i> Copyright 2016-2018, <a href="mailto:costa@tsaousis.gr">Costa Tsaousis</a>.<br/>
169
</div>
170
<div class="p">
171
- Released under <a href="http://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GPL v3 or later</a>.
171
+ Released under <a href="http://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GPL v3 or later</a>.
172
Netdata uses <a href="https://github.com/netdata/netdata/blob/master/REDISTRIBUTED.md" target="_blank">third party tools</a>.
173
<br /><br />
174
</div>
@@ -1261,6 +1261,6 @@
1261
</div>
1262
</div>
1263
<div id="hiddenDownloadLinks" style="display: none;" hidden></div>
1264
- <script type="text/javascript" src="dashboard.js?v20181114-1"></script>
1264
+ <script type="text/javascript" src="dashboard.js?v20181211-1"></script>
1265
</body>
1266
</html>
web/gui/main.js
+7
-6
@@ -489,8 +489,8 @@ function clipString(str, maxLength) {
489
return `${str.substring(0, spanLength)}...${str.substring(str.length - spanLength)}`;
490
}
491
492
-// When you stream metrics from netdata to netdata, the recieving netdata now
493
-// has multiple host databases. It's own, and multiple mirrored. Mirrored databases
492
+// When you stream metrics from netdata to netdata, the recieving netdata now
493
+// has multiple host databases. It's own, and multiple mirrored. Mirrored databases
494
// can be accessed with <http://localhost:19999/host/NAME/>
495
function renderStreamedHosts(options) {
496
let html = `<div class="info-item">Databases streamed to this agent</div>`;
@@ -528,7 +528,7 @@ function renderStreamedHosts(options) {
528
`<div class="agent-item">
529
<a class="registry_link" href="${url}#" onClick="return gotoHostedModalHandler('${url}');">
530
<i class="fas fa-${icon}" style="color: #999;"></i>
531
- </a>
531
+ </a>
532
<span class="__title" onClick="return gotoHostedModalHandler('${url}');">
533
<a class="registry_link" href="${url}#">${hostname}</a>
534
</span>
@@ -599,13 +599,13 @@ function renderMachines(machinesArray) {
599
if (machines) {
600
html += (
601
`<div class="info-item">
602
- <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Your netdata server list is empty</a>
602
+ <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Your netdata server list is empty</a>
603
</div>`
604
)
605
} else {
606
html += (
607
`<div class="info-item">
608
- <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Failed to contact the registry</a>
608
+ <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Failed to contact the registry</a>
609
</div>`
610
)
611
}
@@ -1167,6 +1167,7 @@ function enrichChartData(chart) {
1167
case 'ap':
1168
case 'net':
1169
case 'disk':
1170
+ case 'powersupply':
1171
case 'statsd':
1172
chart.menu = tmp;
1173
break;
@@ -4108,7 +4109,7 @@ function runOnceOnDashboardWithjQuery() {
4109
}
4110
}
4111
}
4111
-
4112
+
4113
if (inTag && content[i] === '>') {
4114
inTag = false;
4115
}