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

13 files changed, 493 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dec1547dde..1c3d207596 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,6 +288,7 @@ set(PROC_PLUGIN_FILES
         collectors/proc.plugin/sys_devices_system_edac_mc.c
         collectors/proc.plugin/sys_devices_system_node.c
         collectors/proc.plugin/sys_fs_btrfs.c
+        collectors/proc.plugin/sys_class_power_supply.c
         )
 
 set(TC_PLUGIN_FILES
diff --git a/Makefile.am b/Makefile.am
index e1828cf2f0..c7b072667e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,6 +270,7 @@ PROC_PLUGIN_FILES = \
 	collectors/proc.plugin/sys_devices_system_edac_mc.c \
 	collectors/proc.plugin/sys_devices_system_node.c \
 	collectors/proc.plugin/sys_fs_btrfs.c \
+	collectors/proc.plugin/sys_class_power_supply.c \
     $(NULL)
 
 TC_PLUGIN_FILES = \
diff --git a/collectors/all.h b/collectors/all.h
index a469c3efe7..0e55965229 100644
--- a/collectors/all.h
+++ b/collectors/all.h
@@ -307,6 +307,12 @@
 #define NETDATA_CHART_PRIO_MDSTAT_FINISH              9004
 #define NETDATA_CHART_PRIO_MDSTAT_SPEED               9005
 
+// Linux Power Supply
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY      9500 // 4 charts per power supply
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_CHARGE        9501
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_ENERGY        9502
+#define NETDATA_CHART_PRIO_POWER_SUPPLY_VOLTAGE       9503
+
 // CGROUPS
 
 #define NETDATA_CHART_PRIO_CGROUPS_SYSTEMD           19000 // many charts
diff --git a/collectors/proc.plugin/README.md b/collectors/proc.plugin/README.md
index c6fb41eedf..038a22e824 100644
--- a/collectors/proc.plugin/README.md
+++ b/collectors/proc.plugin/README.md
@@ -19,6 +19,7 @@
  - `/proc/softirqs` (total and per core software interrupts)
  - `/proc/loadavg` (system load and total processes running)
  - `/proc/sys/kernel/random/entropy_avail` (random numbers pool availability - used in cryptography)
+ - `/sys/class/power_supply` (power supply properties)
  - `ksm` Kernel Same-Page Merging performance (several files under `/sys/kernel/mm/ksm`).
  - `netdata` (internal netdata resources utilization)
 
@@ -273,4 +274,65 @@ Example image:
 
 See Linux Anti-DDoS in action at: **[netdata demo site (with SYNPROXY enabled)](https://registry.my-netdata.io/#menu_netfilter_submenu_synproxy)**
 
+## Linux power supply
+
+This module monitors various metrics reported by power supply drivers
+on Linux. This allows tracking and alerting on things like remaining
+battery capacity.
+
+Depending on the underlying driver, it may provide the following charts
+and metrics:
+
+1. Capacity: The power supply capacity expressed as a percentage.
+  * capacity\_now
+
+2. Charge: The charge for the power supply, expressed as amphours.
+  * charge\_full\_design
+  * charge\_full
+  * charge\_now
+  * charge\_empty
+  * charge\_empty\_design
+
+3. Energy: The energy for the power supply, expressed as watthours.
+  * energy\_full\_design
+  * energy\_full
+  * energy\_now
+  * energy\_empty
+  * energy\_empty\_design
+
+2. Voltage: The voltage for the power supply, expressed as volts.
+  * voltage\_max\_design
+  * voltage\_max
+  * voltage\_now
+  * voltage\_min
+  * voltage\_min\_design
+
+#### configuration
+
+```
+[plugin:proc:/sys/class/power_supply]
+    # battery capacity = yes
+    # battery charge = no
+    # battery energy = no
+    # power supply voltage = no
+    # keep files open = auto
+    # directory to monitor = /sys/class/power_supply
+```
+
+#### notes
+
+* Most drivers provide at least the first chart. Battery powered ACPI
+compliant systems (like most laptops) provide all but the third, but do
+not provide all of the metrics for each chart.
+
+* Current, energy, and voltages are reported with a _very_ high precision
+by the power\_supply framework.  Usually, this is far higher than the
+actual hardware supports reporting, so expect to see changes in these
+charts jump instead of scaling smoothly.
+
+* If `max` or `full` attribute is defined by the driver, but not a
+corresponding `min` or `empty` attribute, then Netdata will still provide
+the corresponding `min` or `empty`, which will then always read as zero.
+This way, alerts which match on these will still work.
+
 [![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fproc.plugin%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/proc.plugin/plugin_proc.c b/collectors/proc.plugin/plugin_proc.c
index 5301702e7a..343acfa37b 100644
--- a/collectors/proc.plugin/plugin_proc.c
+++ b/collectors/proc.plugin/plugin_proc.c
@@ -64,6 +64,9 @@ static struct proc_module {
         // IPC metrics
         { .name = "ipc", .dim = "ipc", .func = do_ipc },
 
+        // linux power supply metrics
+        { .name = "/sys/class/power_supply", .dim = "power_supply", .func = do_sys_class_power_supply },
+
         // the terminator of this array
         { .name = NULL, .dim = NULL, .func = NULL }
 };
diff --git a/collectors/proc.plugin/plugin_proc.h b/collectors/proc.plugin/plugin_proc.h
index ae50a94d6d..0c2afe7793 100644
--- a/collectors/proc.plugin/plugin_proc.h
+++ b/collectors/proc.plugin/plugin_proc.h
@@ -53,6 +53,7 @@ extern int do_proc_net_sockstat(int update_every, usec_t dt);
 extern int do_proc_net_sockstat6(int update_every, usec_t dt);
 extern int do_proc_net_sctp_snmp(int update_every, usec_t dt);
 extern int do_ipc(int update_every, usec_t dt);
+extern int do_sys_class_power_supply(int update_every, usec_t dt);
 extern int get_numa_node_count(void);
 
 // metrics that need to be shared among data collectors
diff --git a/collectors/proc.plugin/sys_class_power_supply.c b/collectors/proc.plugin/sys_class_power_supply.c
new file mode 100644
index 0000000000..2acbc3da65
--- /dev/null
+++ b/collectors/proc.plugin/sys_class_power_supply.c
@@ -0,0 +1,381 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "plugin_proc.h"
+
+#define PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME "/sys/class/power_supply"
+
+const char *ps_property_names[]  = {        "charge",         "energy",              "voltage"};
+const char *ps_property_titles[] = {"Battery charge", "Battery energy", "Power supply voltage"};
+const char *ps_property_units[]  = {            "Ah",             "Wh",                    "V"};
+
+const char *ps_property_dim_names[] = {"empty_design", "empty", "now", "full", "full_design",
+                                       "empty_design", "empty", "now", "full", "full_design",
+                                         "min_design",   "min", "now",  "max",  "max_design"};
+
+struct ps_property_dim {
+    char *name;
+    char *filename;
+    int fd;
+
+    RRDDIM *rd;
+    unsigned long long value;
+
+    struct ps_property_dim *next;
+};
+
+struct ps_property {
+    char *name;
+    char *title;
+    char *units;
+
+    RRDSET *st;
+
+    struct ps_property_dim *property_dim_root;
+
+    struct ps_property *next;
+};
+
+struct capacity {
+    char *filename;
+    int fd;
+
+    RRDSET *st;
+    RRDDIM *rd;
+    unsigned long long value;
+};
+
+struct power_supply {
+    char *name;
+    uint32_t hash;
+    int found;
+
+    struct capacity *capacity;
+
+    struct ps_property *property_root;
+
+    struct power_supply *next;
+};
+
+static struct power_supply *power_supply_root = NULL;
+static int files_num = 0;
+
+void power_supply_free(struct power_supply *ps) {
+    if(likely(ps)) {
+
+        // free capacity structure
+        if(likely(ps->capacity)) {
+            if(likely(ps->capacity->st)) rrdset_is_obsolete(ps->capacity->st);
+            freez(ps->capacity->filename);
+            if(likely(ps->capacity->fd != -1)) close(ps->capacity->fd);
+            files_num--;
+            freez(ps->capacity);
+        }
+        freez(ps->name);
+
+        struct ps_property *pr = ps->property_root;
+        while(likely(pr)) {
+
+            // free dimensions
+            struct ps_property_dim *pd = pr->property_dim_root;
+            while(likely(pd)) {
+                freez(pd->name);
+                freez(pd->filename);
+                if(likely(pd->fd != -1)) close(pd->fd);
+                files_num--;
+                struct ps_property_dim *d = pd;
+                pd = pd->next;
+                freez(d);
+            }
+
+            // free properties
+            if(likely(pr->st)) rrdset_is_obsolete(pr->st);
+            freez(pr->name);
+            freez(pr->title);
+            freez(pr->units);
+            struct ps_property *p = pr;
+            pr = pr->next;
+            freez(p);
+        }
+
+        // remove power supply from linked list
+        if(likely(ps == power_supply_root)) {
+            power_supply_root = ps->next;
+        }
+        else {
+            struct power_supply *last;
+            for(last = power_supply_root; last && last->next != ps; last = last->next);
+            last->next = ps->next;
+        }
+
+        freez(ps);
+    }
+}
+
+int do_sys_class_power_supply(int update_every, usec_t dt) {
+    (void)dt;
+    static int do_capacity = -1, do_property[3] = {-1};
+    static int keep_fds_open = CONFIG_BOOLEAN_NO, keep_fds_open_config = -1;
+    static char *dirname = NULL;
+
+    if(unlikely(do_capacity == -1)) {
+        do_capacity    = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery capacity", CONFIG_BOOLEAN_YES);
+        do_property[0] = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery charge", CONFIG_BOOLEAN_NO);
+        do_property[1] = config_get_boolean("plugin:proc:/sys/class/power_supply", "battery energy", CONFIG_BOOLEAN_NO);
+        do_property[2] = config_get_boolean("plugin:proc:/sys/class/power_supply", "power supply voltage", CONFIG_BOOLEAN_NO);
+
+        keep_fds_open_config = config_get_boolean_ondemand("plugin:proc:/sys/class/power_supply", "keep files open", CONFIG_BOOLEAN_AUTO);
+
+        char filename[FILENAME_MAX + 1];
+        snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/class/power_supply");
+        dirname = config_get("plugin:proc:/sys/class/power_supply", "directory to monitor", filename);
+    }
+
+    DIR *dir = opendir(dirname);
+    if(unlikely(!dir)) {
+        error("Cannot read directory '%s'", dirname);
+        return 1;
+    }
+
+    struct dirent *de = NULL;
+    while(likely(de = readdir(dir))) {
+        if(likely(de->d_type == DT_DIR
+            && (
+                (de->d_name[0] == '.' && de->d_name[1] == '\0')
+                || (de->d_name[0] == '.' && de->d_name[1] == '.' && de->d_name[2] == '\0')
+                )))
+            continue;
+
+        if(likely(de->d_type == DT_LNK || de->d_type == DT_DIR)) {
+            uint32_t hash = simple_hash(de->d_name);
+
+            struct power_supply *ps;
+            for(ps = power_supply_root; ps; ps = ps->next) {
+                if(unlikely(ps->hash == hash && !strcmp(ps->name, de->d_name))) {
+                    ps->found = 1;
+                    break;
+                }
+            }
+
+            // allocate memory for power supply and initialize it
+            if(unlikely(!ps)) {
+                ps = callocz(sizeof(struct power_supply), 1);
+                ps->name = strdupz(de->d_name);
+                ps->hash = simple_hash(de->d_name);
+                ps->found = 1;
+                ps->next = power_supply_root;
+                power_supply_root = ps;
+
+                struct stat stbuf;
+                if(likely(do_capacity != CONFIG_BOOLEAN_NO)) {
+                    char filename[FILENAME_MAX + 1];
+                    snprintfz(filename, FILENAME_MAX, "%s/%s/%s", dirname, de->d_name, "capacity");
+                    if (stat(filename, &stbuf) == 0) {
+                        ps->capacity = callocz(sizeof(struct capacity), 1);
+                        ps->capacity->filename = strdupz(filename);
+                        ps->capacity->fd = -1;
+                        files_num++;
+                    }
+                }
+
+                // allocate memory and initialize structures for every property and file found
+                size_t pr_idx, pd_idx;
+                size_t prev_idx = 3; // there is no property with this index
+
+                for(pr_idx = 0; pr_idx < 3; pr_idx++) {
+                    if(unlikely(do_property[pr_idx] != CONFIG_BOOLEAN_NO)) {
+                        struct ps_property *pr = NULL;
+
+                        for(pd_idx = pr_idx * 5; pd_idx < pr_idx * 5 + 5; pd_idx++) {
+
+                            // check if file exists
+                            char filename[FILENAME_MAX + 1];
+                            snprintfz(filename, FILENAME_MAX, "%s/%s/%s_%s", dirname, de->d_name,
+                                      ps_property_names[pr_idx], ps_property_dim_names[pd_idx]);
+                            if (stat(filename, &stbuf) == 0) {
+
+                                // add chart
+                                if(unlikely(prev_idx != pr_idx)) {
+                                    pr = callocz(sizeof(struct ps_property), 1);
+                                    pr->name = strdupz(ps_property_names[pr_idx]);
+                                    pr->title = strdupz(ps_property_titles[pr_idx]);
+                                    pr->units = strdupz(ps_property_units[pr_idx]);
+                                    prev_idx = pr_idx;
+                                    pr->next = ps->property_root;
+                                    ps->property_root = pr;
+                                }
+
+                                // add dimension
+                                struct ps_property_dim *pd;
+                                pd= callocz(sizeof(struct ps_property_dim), 1);
+                                pd->name = strdupz(ps_property_dim_names[pd_idx]);
+                                pd->filename = strdupz(filename);
+                                pd->fd = -1;
+                                files_num++;
+                                pd->next = pr->property_dim_root;
+                                pr->property_dim_root = pd;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // read capacity file
+            if(likely(ps->capacity)) {
+                char buffer[30 + 1];
+
+                if(unlikely(ps->capacity->fd == -1)) {
+                    ps->capacity->fd = open(ps->capacity->filename, O_RDONLY, 0666);
+                    if(unlikely(ps->capacity->fd == -1)) {
+                        error("Cannot open file '%s'", ps->capacity->filename);
+                        power_supply_free(ps);
+                    }
+                }
+
+                ssize_t r = read(ps->capacity->fd, buffer, 30);
+                if(unlikely(r < 1)) {
+                    error("Cannot read file '%s'", ps->capacity->filename);
+                    power_supply_free(ps);
+                }
+                buffer[r] = '\0';
+                ps->capacity->value = str2ull(buffer);
+
+                if(unlikely(!keep_fds_open)) {
+                    close(ps->capacity->fd);
+                    ps->capacity->fd = -1;
+                }
+                else if(unlikely(lseek(ps->capacity->fd, 0, SEEK_SET) == -1)) {
+                    error("Cannot seek in file '%s'", ps->capacity->filename);
+                    close(ps->capacity->fd);
+                    ps->capacity->fd = -1;
+                }
+            }
+
+            // read property files
+            int read_error = 0;
+            struct ps_property *pr;
+            for(pr = ps->property_root; pr && !read_error; pr = pr->next) {
+                struct ps_property_dim *pd;
+                for(pd = pr->property_dim_root; pd; pd = pd->next) {
+                    char buffer[30 + 1];
+
+                    if(unlikely(pd->fd == -1)) {
+                        pd->fd = open(pd->filename, O_RDONLY, 0666);
+                        if(unlikely(pd->fd == -1)) {
+                            error("Cannot open file '%s'", pd->filename);
+                            read_error = 1;
+                            power_supply_free(ps);
+                            break;
+                        }
+                    }
+
+                    ssize_t r = read(pd->fd, buffer, 30);
+                    if(unlikely(r < 1)) {
+                        error("Cannot read file '%s'", pd->filename);
+                        read_error = 1;
+                        power_supply_free(ps);
+                        break;
+                    }
+                    buffer[r] = '\0';
+                    pd->value = str2ull(buffer);
+
+                    if(unlikely(!keep_fds_open)) {
+                        close(pd->fd);
+                        pd->fd = -1;
+                    }
+                    else if(unlikely(lseek(pd->fd, 0, SEEK_SET) == -1)) {
+                        error("Cannot seek in file '%s'", pd->filename);
+                        close(pd->fd);
+                        pd->fd = -1;
+                    }
+                }
+            }
+        }
+    }
+
+    closedir(dir);
+
+    keep_fds_open = keep_fds_open_config;
+    if(likely(keep_fds_open_config == CONFIG_BOOLEAN_AUTO)) {
+        if(unlikely(files_num > 32))
+            keep_fds_open = CONFIG_BOOLEAN_NO;
+        else
+            keep_fds_open = CONFIG_BOOLEAN_YES;
+    }
+
+    // --------------------------------------------------------------------
+
+    struct power_supply *ps = power_supply_root;
+    while(unlikely(ps)) {
+        if(unlikely(!ps->found)) {
+            struct power_supply *f = ps;
+            ps = ps->next;
+            power_supply_free(f);
+            continue;
+        }
+
+        if(likely(ps->capacity)) {
+            if(unlikely(!ps->capacity->st)) {
+                ps->capacity->st = rrdset_create_localhost(
+                        "powersupply_capacity"
+                        , ps->name
+                        , NULL
+                        , ps->name
+                        , "powersupply.capacity"
+                        , "Battery capacity"
+                        , "percentage"
+                        , PLUGIN_PROC_NAME
+                        , PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME
+                        , NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY
+                        , update_every
+                        , RRDSET_TYPE_LINE
+                );
+            }
+            else
+                rrdset_next(ps->capacity->st);
+
+            if(unlikely(!ps->capacity->rd)) ps->capacity->rd = rrddim_add(ps->capacity->st, "capacity", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+            rrddim_set_by_pointer(ps->capacity->st, ps->capacity->rd, ps->capacity->value);
+
+            rrdset_done(ps->capacity->st);
+        }
+
+        struct ps_property *pr;
+        for(pr = ps->property_root; pr; pr = pr->next) {
+            if(unlikely(!pr->st)) {
+                char id[50 + 1], context[50 + 1];
+                snprintfz(id, RRD_ID_LENGTH_MAX, "powersupply_%s", pr->name);
+                snprintfz(context, RRD_ID_LENGTH_MAX, "powersupply.%s", pr->name);
+
+                pr->st = rrdset_create_localhost(
+                        id
+                        , ps->name
+                        , NULL
+                        , ps->name
+                        , context
+                        , pr->title
+                        , pr->units
+                        , PLUGIN_PROC_NAME
+                        , PLUGIN_PROC_MODULE_POWER_SUPPLY_NAME
+                        , NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY
+                        , update_every
+                        , RRDSET_TYPE_LINE
+                );
+            }
+            else
+                rrdset_next(pr->st);
+
+            struct ps_property_dim *pd;
+            for(pd = pr->property_dim_root; pd; pd = pd->next) {
+                if(unlikely(!pd->rd)) pd->rd = rrddim_add(pr->st, pd->name, NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
+                rrddim_set_by_pointer(pr->st, pd->rd, pd->value);
+            }
+
+            rrdset_done(pr->st);
+        }
+
+        ps->found = 0;
+        ps = ps->next;
+    }
+
+    return 0;
+}
diff --git a/collectors/python.d.plugin/linux_power_supply/README.md b/collectors/python.d.plugin/linux_power_supply/README.md
index 26e6554da0..f5b05d1994 100644
--- a/collectors/python.d.plugin/linux_power_supply/README.md
+++ b/collectors/python.d.plugin/linux_power_supply/README.md
@@ -1,5 +1,10 @@
 # Linux power supply
 
+> THIS MODULE IS OBSOLETE.
+> USE THE [PROC PLUGIN](../../proc.plugin) - IT IS MORE EFFICIENT
+
+---
+
 This module monitors variosu metrics reported by power supply drivers
 on Linux.  This allows tracking and alerting on things like remaining
 battery capacity.
diff --git a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
index 665921a1b9..6521fed94e 100644
--- a/collectors/python.d.plugin/python.d.plugin.in
+++ b/collectors/python.d.plugin/python.d.plugin.in
@@ -56,7 +56,7 @@ BASE_CONFIG = {'update_every': os.getenv('NETDATA_UPDATE_EVERY', 1),
 
 
 MODULE_EXTENSION = '.chart.py'
-OBSOLETE_MODULES = ['apache_cache', 'gunicorn_log', 'nginx_log', 'cpufreq', 'cpuidle', 'mdstat']
+OBSOLETE_MODULES = ['apache_cache', 'gunicorn_log', 'nginx_log', 'cpufreq', 'cpuidle', 'mdstat', 'linux_power_supply']
 
 
 def module_ok(m):
diff --git a/health/health.d/linux_power_supply.conf b/health/health.d/linux_power_supply.conf
index 27a172a14b..745d2c3dd4 100644
--- a/health/health.d/linux_power_supply.conf
+++ b/health/health.d/linux_power_supply.conf
@@ -1,7 +1,7 @@
 # Alert on low battery capacity.
 
 template: linux_power_supply_capacity
-      on: power_supply.capacity
+      on: powersupply.capacity
     calc: $capacity
    units: %
    every: 10s
diff --git a/web/gui/dashboard_info.js b/web/gui/dashboard_info.js
index 2f542d436e..89fe3a1996 100644
--- a/web/gui/dashboard_info.js
+++ b/web/gui/dashboard_info.js
@@ -436,10 +436,10 @@ netdataDashboard.menu = {
         info: undefined
     },
 
-    'linux_power_supply': {
+    'powersupply': {
         title: 'Power Supply',
         icon: '<i class="fas fa-battery-half"></i>',
-        info: 'Statistics for the various system power supplies.'
+        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>.'
     }
 };
 
@@ -2315,6 +2315,25 @@ netdataDashboard.context = {
 
     'proxysql.commands_duration': {
         info: 'The total time spent executing commands of that type, in ms'
+    },
+
+    // ------------------------------------------------------------------------
+    // Power Supplies
+
+    'powersupply.capacity': {
+        info: undefined
+    },
+
+    'powersupply.charge': {
+        info: undefined
+    },
+
+    'powersupply.energy': {
+        info: undefined
+    },
+
+    'powersupply.voltage': {
+        info: undefined
     }
 
     // ------------------------------------------------------------------------
diff --git a/web/gui/index.html b/web/gui/index.html
index 05b64d2718..af03f64046 100644
--- a/web/gui/index.html
+++ b/web/gui/index.html
@@ -14,7 +14,7 @@
     <meta name="author" content="costa@tsaousis.gr">
 
     <link rel="stylesheet" type="text/css" href="main.css?v=2">
-    
+
     <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">
 
     <!-- <link rel="apple-touch-icon" sizes="57x57" href="images/apple-icon-57x57.png">
@@ -168,7 +168,7 @@
                     <i class="fas fa-copyright"></i> Copyright 2016-2018, <a href="mailto:costa@tsaousis.gr">Costa Tsaousis</a>.<br/>
                 </div>
                 <div class="p">
-                    Released under <a href="http://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GPL v3 or later</a>. 
+                    Released under <a href="http://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GPL v3 or later</a>.
                     Netdata uses <a href="https://github.com/netdata/netdata/blob/master/REDISTRIBUTED.md" target="_blank">third party tools</a>.
                     <br /><br />
                 </div>
@@ -1261,6 +1261,6 @@
         </div>
     </div>
     <div id="hiddenDownloadLinks" style="display: none;" hidden></div>
-    <script type="text/javascript" src="dashboard.js?v20181114-1"></script>
+    <script type="text/javascript" src="dashboard.js?v20181211-1"></script>
 </body>
 </html>
diff --git a/web/gui/main.js b/web/gui/main.js
index b923e47616..3056f24574 100644
--- a/web/gui/main.js
+++ b/web/gui/main.js
@@ -489,8 +489,8 @@ function clipString(str, maxLength) {
     return `${str.substring(0, spanLength)}...${str.substring(str.length - spanLength)}`;
 }
 
-// When you stream metrics from netdata to netdata, the recieving netdata now 
-// has multiple host databases. It's own, and multiple mirrored. Mirrored databases 
+// When you stream metrics from netdata to netdata, the recieving netdata now
+// has multiple host databases. It's own, and multiple mirrored. Mirrored databases
 // can be accessed with <http://localhost:19999/host/NAME/>
 function renderStreamedHosts(options) {
     let html = `<div class="info-item">Databases streamed to this agent</div>`;
@@ -528,7 +528,7 @@ function renderStreamedHosts(options) {
             `<div class="agent-item">
                 <a class="registry_link" href="${url}#" onClick="return gotoHostedModalHandler('${url}');">
                     <i class="fas fa-${icon}" style="color: #999;"></i>
-                </a>                    
+                </a>
                 <span class="__title" onClick="return gotoHostedModalHandler('${url}');">
                     <a class="registry_link" href="${url}#">${hostname}</a>
                 </span>
@@ -599,13 +599,13 @@ function renderMachines(machinesArray) {
         if (machines) {
             html += (
                 `<div class="info-item">
-                    <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Your netdata server list is empty</a> 
+                    <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Your netdata server list is empty</a>
                 </div>`
             )
         } else {
             html += (
                 `<div class="info-item">
-                    <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Failed to contact the registry</a> 
+                    <a href="https://github.com/netdata/netdata/tree/master/registry#netdata-registry" target="_blank">Failed to contact the registry</a>
                 </div>`
             )
         }
@@ -1167,6 +1167,7 @@ function enrichChartData(chart) {
         case 'ap':
         case 'net':
         case 'disk':
+        case 'powersupply':
         case 'statsd':
             chart.menu = tmp;
             break;
@@ -4108,7 +4109,7 @@ function runOnceOnDashboardWithjQuery() {
                                 }
                             }
                         }
-                        
+
                         if (inTag && content[i] === '>') {
                             inTag = false;
                         }