Merging upstream version 1.16.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 5 insertions, 5 deletions

diff --git a/collectors/proc.plugin/README.md b/collectors/proc.plugin/README.md
index 37dc19f86..cacde84f6 100644
--- a/collectors/proc.plugin/README.md
+++ b/collectors/proc.plugin/README.md
@@ -75,7 +75,7 @@ netdata will automatically set the name of disks on the dashboard, from the moun
 
 ### performance metrics
 
-By default netdata will enable monitoring metrics only when they are not zero. If they are constantly zero they are ignored. Metrics that will start having values, after netdata is started, will be detected and charts will be automatically added to the dashboard (a refresh of the dashboard is needed for them to appear though).
+By default, Netdata will enable monitoring metrics only when they are not zero. If they are constantly zero they are ignored. Metrics that will start having values, after netdata is started, will be detected and charts will be automatically added to the dashboard (a refresh of the dashboard is needed for them to appear though). Set `yes` for a chart instead of `auto` to enable it permanently.
 
 netdata categorizes all block devices in 3 categories:
 
diff --git a/collectors/proc.plugin/proc_mdstat.c b/collectors/proc.plugin/proc_mdstat.c
index d0925ec32..5c29d31c7 100644
--- a/collectors/proc.plugin/proc_mdstat.c
+++ b/collectors/proc.plugin/proc_mdstat.c
@@ -13,7 +13,7 @@ struct raid {
     unsigned long long failed_disks;

 

     RRDSET *st_disks;

-    RRDDIM *rd_total;

+    RRDDIM *rd_down;

     RRDDIM *rd_inuse;

     unsigned long long total_disks;

     unsigned long long inuse_disks;

@@ -439,11 +439,11 @@ int do_proc_mdstat(int update_every, usec_t dt) {
 

                 if(unlikely(!raid->rd_inuse && !(raid->rd_inuse = rrddim_find(raid->st_disks, "inuse"))))

                     raid->rd_inuse = rrddim_add(raid->st_disks, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);

-                if(unlikely(!raid->rd_total && !(raid->rd_total = rrddim_find(raid->st_disks, "total"))))

-                    raid->rd_total = rrddim_add(raid->st_disks, "total", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);

+                if(unlikely(!raid->rd_down && !(raid->rd_down = rrddim_find(raid->st_disks, "down"))))

+                    raid->rd_down = rrddim_add(raid->st_disks, "down", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);

 

                 rrddim_set_by_pointer(raid->st_disks, raid->rd_inuse, raid->inuse_disks);

-                rrddim_set_by_pointer(raid->st_disks, raid->rd_total, raid->total_disks);

+                rrddim_set_by_pointer(raid->st_disks, raid->rd_down, raid->failed_disks);

 

                 rrdset_done(raid->st_disks);

             }