added permanent labels to all charts about plugin, module and family; added labels to all proc plugin modules

16 files changed, 360 insertions, 195 deletions

diff --git a/collectors/diskspace.plugin/plugin_diskspace.c b/collectors/diskspace.plugin/plugin_diskspace.c
index f2d9e93ba9..fcf64f3e6f 100644
--- a/collectors/diskspace.plugin/plugin_diskspace.c
+++ b/collectors/diskspace.plugin/plugin_diskspace.c
@@ -431,7 +431,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
         };
 
         mp.chart_labels = rrdlabels_create();
-        rrdlabels_add(mp.chart_labels, "fstype", mi->filesystem, RRDLABEL_SRC_AUTO);
+        rrdlabels_add(mp.chart_labels, "mount_point", mi->mount_point, RRDLABEL_SRC_AUTO);
+        rrdlabels_add(mp.chart_labels, "filesystem", mi->filesystem, RRDLABEL_SRC_AUTO);
+        rrdlabels_add(mp.chart_labels, "mount_root", mi->root, RRDLABEL_SRC_AUTO);
 
         m = dictionary_set(dict_mountpoints, mi->mount_point, &mp, sizeof(struct mount_point_metadata));
 
diff --git a/collectors/proc.plugin/proc_diskstats.c b/collectors/proc.plugin/proc_diskstats.c
index ad752d2ef0..be4a481cdb 100644
--- a/collectors/proc.plugin/proc_diskstats.c
+++ b/collectors/proc.plugin/proc_diskstats.c
@@ -830,6 +830,30 @@ static struct disk *get_disk(unsigned long major, unsigned long minor, char *dis
     return d;
 }
 
+static void add_labels_to_disk(struct disk *d, RRDSET *st) {
+    rrdlabels_add(st->state->chart_labels, "device", d->disk, RRDLABEL_SRC_AUTO);
+    rrdlabels_add(st->state->chart_labels, "mount_point", d->mount_point, RRDLABEL_SRC_AUTO);
+
+    switch (d->type) {
+        default:
+        case DISK_TYPE_UNKNOWN:
+            rrdlabels_add(st->state->chart_labels, "device_type", "unknown", RRDLABEL_SRC_AUTO);
+            break;
+
+        case DISK_TYPE_PHYSICAL:
+            rrdlabels_add(st->state->chart_labels, "device_type", "physical", RRDLABEL_SRC_AUTO);
+            break;
+
+        case DISK_TYPE_PARTITION:
+            rrdlabels_add(st->state->chart_labels, "device_type", "partition", RRDLABEL_SRC_AUTO);
+            break;
+
+        case DISK_TYPE_VIRTUAL:
+            rrdlabels_add(st->state->chart_labels, "device_type", "virtual", RRDLABEL_SRC_AUTO);
+            break;
+    }
+}
+
 int do_proc_diskstats(int update_every, usec_t dt) {
     static procfile *ff = NULL;
 
@@ -1067,6 +1091,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 d->rd_io_reads  = rrddim_add(d->st_io, "reads",  NULL, d->sector_size, 1024,      RRD_ALGORITHM_INCREMENTAL);
                 d->rd_io_writes = rrddim_add(d->st_io, "writes", NULL, d->sector_size * -1, 1024, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_io);
             }
             else rrdset_next(d->st_io);
 
@@ -1094,8 +1120,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                         , RRDSET_TYPE_AREA
                 );
 
-                d->rd_io_discards =
-                    rrddim_add(d->st_ext_io, "discards", NULL, d->sector_size, 1024, RRD_ALGORITHM_INCREMENTAL);
+                d->rd_io_discards = rrddim_add(d->st_ext_io, "discards", NULL, d->sector_size, 1024, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_ext_io);
             } else
                 rrdset_next(d->st_ext_io);
 
@@ -1130,6 +1157,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 d->rd_ops_reads  = rrddim_add(d->st_ops, "reads",  NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_ops_writes = rrddim_add(d->st_ops, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_ops);
             }
             else rrdset_next(d->st_ops);
 
@@ -1162,7 +1191,10 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 d->rd_ops_discards = rrddim_add(d->st_ext_ops, "discards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 if (do_fl_stats)
                     d->rd_ops_flushes = rrddim_add(d->st_ext_ops, "flushes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            } else
+
+                add_labels_to_disk(d, d->st_ext_ops);
+            }
+            else
                 rrdset_next(d->st_ext_ops);
 
             last_discards = rrddim_set_by_pointer(d->st_ext_ops, d->rd_ops_discards, discards);
@@ -1196,6 +1228,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 rrdset_flag_set(d->st_qops, RRDSET_FLAG_DETAIL);
 
                 d->rd_qops_operations = rrddim_add(d->st_qops, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                add_labels_to_disk(d, d->st_qops);
             }
             else rrdset_next(d->st_qops);
 
@@ -1228,6 +1262,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 rrdset_flag_set(d->st_backlog, RRDSET_FLAG_DETAIL);
 
                 d->rd_backlog_backlog = rrddim_add(d->st_backlog, "backlog", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_backlog);
             }
             else rrdset_next(d->st_backlog);
 
@@ -1259,8 +1295,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 rrdset_flag_set(d->st_busy, RRDSET_FLAG_DETAIL);
 
-                d->rd_busy_busy =
-                    rrddim_add(d->st_busy, "busy", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+                d->rd_busy_busy = rrddim_add(d->st_busy, "busy", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_busy);
             }
             else rrdset_next(d->st_busy);
 
@@ -1288,6 +1325,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 rrdset_flag_set(d->st_util, RRDSET_FLAG_DETAIL);
 
                 d->rd_util_utilization = rrddim_add(d->st_util, "utilization", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                add_labels_to_disk(d, d->st_util);
             }
             else rrdset_next(d->st_util);
 
@@ -1326,6 +1365,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 d->rd_mops_reads  = rrddim_add(d->st_mops, "reads",  NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_mops_writes = rrddim_add(d->st_mops, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_mops);
             }
             else rrdset_next(d->st_mops);
 
@@ -1358,7 +1399,10 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 rrdset_flag_set(d->st_ext_mops, RRDSET_FLAG_DETAIL);
 
                 d->rd_mops_discards = rrddim_add(d->st_ext_mops, "discards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            } else
+
+                add_labels_to_disk(d, d->st_ext_mops);
+            }
+            else
                 rrdset_next(d->st_ext_mops);
 
             rrddim_set_by_pointer(d->st_ext_mops, d->rd_mops_discards, mdiscards);
@@ -1391,6 +1435,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 d->rd_iotime_reads  = rrddim_add(d->st_iotime, "reads",  NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_iotime_writes = rrddim_add(d->st_iotime, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_iotime);
             }
             else rrdset_next(d->st_iotime);
 
@@ -1422,9 +1468,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                 d->rd_iotime_discards = rrddim_add(d->st_ext_iotime, "discards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 if (do_fl_stats)
-                    d->rd_iotime_flushes =
-                        rrddim_add(d->st_ext_iotime, "flushes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            } else
+                    d->rd_iotime_flushes = rrddim_add(d->st_ext_iotime, "flushes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                add_labels_to_disk(d, d->st_ext_iotime);
+            }
+            else
                 rrdset_next(d->st_ext_iotime);
 
             last_discardms = rrddim_set_by_pointer(d->st_ext_iotime, d->rd_iotime_discards, discardms);
@@ -1465,6 +1513,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_await_reads  = rrddim_add(d->st_await, "reads",  NULL,  1, 1, RRD_ALGORITHM_ABSOLUTE);
                     d->rd_await_writes = rrddim_add(d->st_await, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_await);
                 }
                 else rrdset_next(d->st_await);
 
@@ -1494,18 +1544,22 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_await_discards = rrddim_add(d->st_ext_await, "discards", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                     if (do_fl_stats)
-                        d->rd_await_flushes =
-                            rrddim_add(d->st_ext_await, "flushes", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
-                } else
+                        d->rd_await_flushes = rrddim_add(d->st_ext_await, "flushes", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_ext_await);
+                }
+                else
                     rrdset_next(d->st_ext_await);
 
                 rrddim_set_by_pointer(
                     d->st_ext_await, d->rd_await_discards,
                     (discards - last_discards) ? (discardms - last_discardms) / (discards - last_discards) : 0);
+
                 if (do_fl_stats)
                     rrddim_set_by_pointer(
                         d->st_ext_await, d->rd_await_flushes,
                         (flushes - last_flushes) ? (flushms - last_flushms) / (flushes - last_flushes) : 0);
+
                 rrdset_done(d->st_ext_await);
             }
 
@@ -1534,6 +1588,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_avgsz_reads  = rrddim_add(d->st_avgsz, "reads",  NULL, d->sector_size, 1024,      RRD_ALGORITHM_ABSOLUTE);
                     d->rd_avgsz_writes = rrddim_add(d->st_avgsz, "writes", NULL, d->sector_size * -1, 1024, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_avgsz);
                 }
                 else rrdset_next(d->st_avgsz);
 
@@ -1561,9 +1617,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     rrdset_flag_set(d->st_ext_avgsz, RRDSET_FLAG_DETAIL);
 
-                    d->rd_avgsz_discards =
-                        rrddim_add(d->st_ext_avgsz, "discards", NULL, d->sector_size, 1024, RRD_ALGORITHM_ABSOLUTE);
-                } else
+                    d->rd_avgsz_discards = rrddim_add(d->st_ext_avgsz, "discards", NULL, d->sector_size, 1024, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_ext_avgsz);
+                }
+                else
                     rrdset_next(d->st_ext_avgsz);
 
                 rrddim_set_by_pointer(
@@ -1599,8 +1657,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     rrdset_flag_set(d->st_svctm, RRDSET_FLAG_DETAIL);
 
                     d->rd_svctm_svctm = rrddim_add(d->st_svctm, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_svctm);
                 }
-                else rrdset_next(d->st_svctm);
+                else
+                    rrdset_next(d->st_svctm);
 
                 rrddim_set_by_pointer(d->st_svctm, d->rd_svctm_svctm, ((reads - last_reads) + (writes - last_writes)) ? (busy_ms - last_busy_ms) / ((reads - last_reads) + (writes - last_writes)) : 0);
                 rrdset_done(d->st_svctm);
@@ -1705,8 +1766,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     d->rd_bcache_hit_ratio_1hour = rrddim_add(d->st_bcache_hit_ratio, "1hour", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                     d->rd_bcache_hit_ratio_1day  = rrddim_add(d->st_bcache_hit_ratio, "1day",  NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                     d->rd_bcache_hit_ratio_total = rrddim_add(d->st_bcache_hit_ratio, "ever",  NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_bcache_hit_ratio);
                 }
-                else rrdset_next(d->st_bcache_hit_ratio);
+                else
+                    rrdset_next(d->st_bcache_hit_ratio);
 
                 rrddim_set_by_pointer(d->st_bcache_hit_ratio, d->rd_bcache_hit_ratio_5min, stats_five_minute_cache_hit_ratio);
                 rrddim_set_by_pointer(d->st_bcache_hit_ratio, d->rd_bcache_hit_ratio_1hour, stats_hour_cache_hit_ratio);
@@ -1735,8 +1799,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_bcache_rate_congested = rrddim_add(d->st_bcache_rates, "congested", NULL,  1, 1024, RRD_ALGORITHM_ABSOLUTE);
                     d->rd_bcache_rate_writeback = rrddim_add(d->st_bcache_rates, "writeback", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_bcache_rates);
                 }
-                else rrdset_next(d->st_bcache_rates);
+                else
+                    rrdset_next(d->st_bcache_rates);
 
                 rrddim_set_by_pointer(d->st_bcache_rates, d->rd_bcache_rate_writeback, writeback_rate);
                 rrddim_set_by_pointer(d->st_bcache_rates, d->rd_bcache_rate_congested, cache_congested);
@@ -1761,8 +1828,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     );
 
                     d->rd_bcache_dirty_size = rrddim_add(d->st_bcache_size, "dirty", NULL,  1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_bcache_size);
                 }
-                else rrdset_next(d->st_bcache_size);
+                else
+                    rrdset_next(d->st_bcache_size);
 
                 rrddim_set_by_pointer(d->st_bcache_size, d->rd_bcache_dirty_size, dirty_data);
                 rrdset_done(d->st_bcache_size);
@@ -1786,8 +1856,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     );
 
                     d->rd_bcache_available_percent = rrddim_add(d->st_bcache_usage, "avail", NULL,  1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                    add_labels_to_disk(d, d->st_bcache_usage);
                 }
-                else rrdset_next(d->st_bcache_usage);
+                else
+                    rrdset_next(d->st_bcache_usage);
 
                 rrddim_set_by_pointer(d->st_bcache_usage, d->rd_bcache_available_percent, cache_available_percent);
                 rrdset_done(d->st_bcache_usage);
@@ -1813,8 +1886,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_bcache_cache_read_races = rrddim_add(d->st_bcache_cache_read_races, "races",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     d->rd_bcache_cache_io_errors  = rrddim_add(d->st_bcache_cache_read_races, "errors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                    add_labels_to_disk(d, d->st_bcache_cache_read_races);
                 }
-                else rrdset_next(d->st_bcache_cache_read_races);
+                else
+                    rrdset_next(d->st_bcache_cache_read_races);
 
                 rrddim_set_by_pointer(d->st_bcache_cache_read_races, d->rd_bcache_cache_read_races, cache_read_races);
                 rrddim_set_by_pointer(d->st_bcache_cache_read_races, d->rd_bcache_cache_io_errors, cache_io_errors);
@@ -1849,8 +1925,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     d->rd_bcache_misses          = rrddim_add(d->st_bcache, "misses",     NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     d->rd_bcache_miss_collisions = rrddim_add(d->st_bcache, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     d->rd_bcache_readaheads      = rrddim_add(d->st_bcache, "readaheads", NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                    add_labels_to_disk(d, d->st_bcache);
                 }
-                else rrdset_next(d->st_bcache);
+                else
+                    rrdset_next(d->st_bcache);
 
                 rrddim_set_by_pointer(d->st_bcache, d->rd_bcache_hits, stats_total_cache_hits);
                 rrddim_set_by_pointer(d->st_bcache, d->rd_bcache_misses, stats_total_cache_misses);
@@ -1884,6 +1963,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
                     d->rd_bcache_bypass_hits   = rrddim_add(d->st_bcache_bypass, "hits",   NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     d->rd_bcache_bypass_misses = rrddim_add(d->st_bcache_bypass, "misses", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
+
+                    add_labels_to_disk(d, d->st_bcache_bypass);
                 }
                 else rrdset_next(d->st_bcache_bypass);
 
diff --git a/collectors/proc.plugin/proc_interrupts.c b/collectors/proc.plugin/proc_interrupts.c
index 78883c4756..46290554b1 100644
--- a/collectors/proc.plugin/proc_interrupts.c
+++ b/collectors/proc.plugin/proc_interrupts.c
@@ -225,6 +225,10 @@ int do_proc_interrupts(int update_every, usec_t dt) {
                         , update_every
                         , RRDSET_TYPE_STACKED
                 );
+
+                char core[50+1];
+                snprintfz(core, 50, "cpu%d", c);
+                rrdlabels_add(core_st[c]->state->chart_labels, "cpu", core, RRDLABEL_SRC_AUTO);
             }
             else rrdset_next(core_st[c]);
 
diff --git a/collectors/proc.plugin/proc_mdstat.c b/collectors/proc.plugin/proc_mdstat.c
index 469966db92..c8015827ee 100644
--- a/collectors/proc.plugin/proc_mdstat.c
+++ b/collectors/proc.plugin/proc_mdstat.c
@@ -77,6 +77,11 @@ static inline void make_chart_obsolete(char *name, const char *id_modifier)
     }
 }
 
+static void add_labels_to_mdstat(struct raid *raid, RRDSET *st) {
+    rrdlabels_add(st->state->chart_labels, "device", raid->name, RRDLABEL_SRC_AUTO);
+    rrdlabels_add(st->state->chart_labels, "raid_level", raid->level, RRDLABEL_SRC_AUTO);
+}
+
 int do_proc_mdstat(int update_every, usec_t dt)
 {
     (void)dt;
@@ -407,7 +412,8 @@ int do_proc_mdstat(int update_every, usec_t dt)
                 RRDSET_TYPE_LINE);
 
             rrdset_isnot_obsolete(st_mdstat_health);
-        } else
+        }
+        else
             rrdset_next(st_mdstat_health);
 
         if (!redundant_num) {
@@ -458,7 +464,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         RRDSET_TYPE_STACKED);
 
                     rrdset_isnot_obsolete(raid->st_disks);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_disks);
+                }
+                else
                     rrdset_next(raid->st_disks);
 
                 if (unlikely(!raid->rd_inuse && !(raid->rd_inuse = rrddim_find_active(raid->st_disks, "inuse"))))
@@ -495,7 +504,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         RRDSET_TYPE_LINE);
 
                     rrdset_isnot_obsolete(raid->st_mismatch_cnt);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_mismatch_cnt);
+                }
+                else
                     rrdset_next(raid->st_mismatch_cnt);
 
                 if (unlikely(!raid->rd_mismatch_cnt && !(raid->rd_mismatch_cnt = rrddim_find_active(raid->st_mismatch_cnt, "count"))))
@@ -529,7 +541,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         RRDSET_TYPE_LINE);
 
                     rrdset_isnot_obsolete(raid->st_operation);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_operation);
+                }
+                else
                     rrdset_next(raid->st_operation);
 
                 if(unlikely(!raid->rd_check && !(raid->rd_check = rrddim_find_active(raid->st_operation, "check"))))
@@ -569,7 +584,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         update_every, RRDSET_TYPE_LINE);
 
                     rrdset_isnot_obsolete(raid->st_finish);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_finish);
+                }
+                else
                     rrdset_next(raid->st_finish);
 
                 if(unlikely(!raid->rd_finish_in && !(raid->rd_finish_in = rrddim_find_active(raid->st_finish, "finish_in"))))
@@ -601,7 +619,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         RRDSET_TYPE_LINE);
 
                     rrdset_isnot_obsolete(raid->st_speed);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_speed);
+                }
+                else
                     rrdset_next(raid->st_speed);
 
                 if (unlikely(!raid->rd_speed && !(raid->rd_speed = rrddim_find_active(raid->st_speed, "speed"))))
@@ -635,7 +656,10 @@ int do_proc_mdstat(int update_every, usec_t dt)
                         RRDSET_TYPE_LINE);
 
                     rrdset_isnot_obsolete(raid->st_nonredundant);
-                } else
+
+                    add_labels_to_mdstat(raid, raid->st_nonredundant);
+                }
+                else
                     rrdset_next(raid->st_nonredundant);
 
                 if (unlikely(!raid->rd_nonredundant && !(raid->rd_nonredundant = rrddim_find_active(raid->st_nonredundant, "available"))))
diff --git a/collectors/proc.plugin/proc_net_dev.c b/collectors/proc.plugin/proc_net_dev.c
index a9a2abbcb5..2931783726 100644
--- a/collectors/proc.plugin/proc_net_dev.c
+++ b/collectors/proc.plugin/proc_net_dev.c
@@ -743,11 +743,13 @@ int do_proc_net_dev(int update_every, usec_t dt) {
             snprintfz(buffer, FILENAME_MAX, path_to_sys_devices_virtual_net, d->name);
             if (likely(access(buffer, R_OK) == 0)) {
                 d->virtual = 1;
-                rrdlabels_add(d->chart_labels, "type", "virtual", RRDLABEL_SRC_AUTO);
-            } else {
+                rrdlabels_add(d->chart_labels, "interface_type", "virtual", RRDLABEL_SRC_AUTO|RRDLABEL_FLAG_PERMANENT);
+            }
+            else {
                 d->virtual = 0;
-                rrdlabels_add(d->chart_labels, "type", "real", RRDLABEL_SRC_AUTO);
+                rrdlabels_add(d->chart_labels, "interface_type", "real", RRDLABEL_SRC_AUTO|RRDLABEL_FLAG_PERMANENT);
             }
+            rrdlabels_add(d->chart_labels, "device", name, RRDLABEL_SRC_AUTO|RRDLABEL_FLAG_PERMANENT);
 
             if(likely(!d->virtual)) {
                 // set the filename to get the interface speed
diff --git a/collectors/proc.plugin/proc_net_wireless.c b/collectors/proc.plugin/proc_net_wireless.c
index cff6bc54fa..c6ee4ff700 100644
--- a/collectors/proc.plugin/proc_net_wireless.c
+++ b/collectors/proc.plugin/proc_net_wireless.c
@@ -198,6 +198,10 @@ static void configure_device(int do_status, int do_quality, int do_discarded_pac
     wireless_dev->chart_id_net_missed_beacon = strdupz(buffer);
 }
 
+static void add_labels_to_wireless(struct netwireless *w, RRDSET *st) {
+    rrdlabels_add(st->state->chart_labels, "device", w->name, RRDLABEL_SRC_AUTO);
+}
+
 int do_proc_net_wireless(int update_every, usec_t dt)
 {
     UNUSED(dt);
@@ -209,21 +213,11 @@ int do_proc_net_wireless(int update_every, usec_t dt)
         char filename[FILENAME_MAX + 1];
         snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/net/wireless");
 
-        proc_net_wireless_filename = config_get(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,"filename to monitor",
-                                                filename);
-
-        do_status = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,
-                                                "status for all interfaces", CONFIG_BOOLEAN_AUTO);
-
-        do_quality = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,
-                                                 "quality for all interfaces", CONFIG_BOOLEAN_AUTO);
-
-        do_discarded_packets = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,
-                                                           "discarded packets for all interfaces",
-                                                           CONFIG_BOOLEAN_AUTO);
-
-        do_beacon = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,
-                                                "missed beacon for all interface", CONFIG_BOOLEAN_AUTO);
+        proc_net_wireless_filename = config_get(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS,"filename to monitor", filename);
+        do_status = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS, "status for all interfaces", CONFIG_BOOLEAN_AUTO);
+        do_quality = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS, "quality for all interfaces", CONFIG_BOOLEAN_AUTO);
+        do_discarded_packets = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS, "discarded packets for all interfaces", CONFIG_BOOLEAN_AUTO);
+        do_beacon = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETWIRELESS, "missed beacon for all interface", CONFIG_BOOLEAN_AUTO);
 	}
 
     if (unlikely(!ff)) {
@@ -255,25 +249,28 @@ int do_proc_net_wireless(int update_every, usec_t dt)
             wireless_dev->status = str2kernel_uint_t(procfile_lineword(ff, l, 1));
 
             if (unlikely(!wireless_dev->st_status)) {
-                wireless_dev->st_status = rrdset_create_localhost("wireless",
-                                                                  wireless_dev->chart_id_net_status,
-                                                                  NULL,
-                                                                  wireless_dev->name,
-                                                                  "wireless.status",
-                                                                  "Internal status reported by interface.",
-                                                                  "status",
-                                                                  PLUGIN_PROC_NAME,
-                                                                  PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
-                                                                  NETDATA_CHART_PRIO_WIRELESS_IFACE,
-                                                                  update_every,
-                                                                  RRDSET_TYPE_LINE);
+                wireless_dev->st_status = rrdset_create_localhost(
+                    "wireless",
+                    wireless_dev->chart_id_net_status,
+                    NULL,
+                    wireless_dev->name,
+                    "wireless.status",
+                    "Internal status reported by interface.",
+                    "status",
+                    PLUGIN_PROC_NAME,
+                    PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
+                    NETDATA_CHART_PRIO_WIRELESS_IFACE,
+                    update_every,
+                    RRDSET_TYPE_LINE);
+
                 rrdset_flag_set(wireless_dev->st_status, RRDSET_FLAG_DETAIL);
 
-                wireless_dev->rd_status = rrddim_add(wireless_dev->st_status, "status", NULL, 1,
-                                                     1, RRD_ALGORITHM_ABSOLUTE);
-            } else {
-                rrdset_next(wireless_dev->st_status);
+                wireless_dev->rd_status = rrddim_add(wireless_dev->st_status, "status", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                add_labels_to_wireless(wireless_dev, wireless_dev->st_status);
             }
+            else
+                rrdset_next(wireless_dev->st_status);
 
             rrddim_set_by_pointer(wireless_dev->st_status, wireless_dev->rd_status,
                                   (collected_number)wireless_dev->status);
@@ -286,78 +283,81 @@ int do_proc_net_wireless(int update_every, usec_t dt)
             wireless_dev->noise = str2ndd(procfile_lineword(ff, l, 4), NULL);
 
             if (unlikely(!wireless_dev->st_link)) {
-                wireless_dev->st_link = rrdset_create_localhost("wireless",
-                                                                wireless_dev->chart_id_net_link,
-                                                                NULL,
-                                                                wireless_dev->name,
-                                                                "wireless.link_quality",
-                                                                "Overall quality of the link. This is an aggregate value, and depends on the driver and hardware.",
-                                                                "value",
-                                                                PLUGIN_PROC_NAME,
-                                                                PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
-                                                                NETDATA_CHART_PRIO_WIRELESS_IFACE + 1,
-                                                                update_every,
-                                                                RRDSET_TYPE_LINE);
+                wireless_dev->st_link = rrdset_create_localhost(
+                    "wireless",
+                    wireless_dev->chart_id_net_link,
+                    NULL,
+                    wireless_dev->name,
+                    "wireless.link_quality",
+                    "Overall quality of the link. This is an aggregate value, and depends on the driver and hardware.",
+                    "value",
+                    PLUGIN_PROC_NAME,
+                    PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
+                    NETDATA_CHART_PRIO_WIRELESS_IFACE + 1,
+                    update_every,
+                    RRDSET_TYPE_LINE);
                 rrdset_flag_set(wireless_dev->st_link, RRDSET_FLAG_DETAIL);
 
-                wireless_dev->rd_link = rrddim_add(wireless_dev->st_link, "link_quality", NULL, 1, 1,
-                                                   RRD_ALGORITHM_ABSOLUTE);
-            } else {
-                rrdset_next(wireless_dev->st_link);
+                wireless_dev->rd_link = rrddim_add(wireless_dev->st_link, "link_quality", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                add_labels_to_wireless(wireless_dev, wireless_dev->st_link);
             }
+            else
+                rrdset_next(wireless_dev->st_link);
 
             if (unlikely(!wireless_dev->st_level)) {
-                wireless_dev->st_level = rrdset_create_localhost("wireless",
-                                                                 wireless_dev->chart_id_net_level,
-                                                                 NULL,
-                                                                 wireless_dev->name,
-                                                                 "wireless.signal_level",
-                                                                 "The signal level is the wireless signal power level received by the wireless client. The closer the value is to 0, the stronger the signal.",
-                                                                 "dBm",
-                                                                 PLUGIN_PROC_NAME,
-                                                                 PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
-                                                                 NETDATA_CHART_PRIO_WIRELESS_IFACE + 2,
-                                                                 update_every,
-                                                                 RRDSET_TYPE_LINE);
+                wireless_dev->st_level = rrdset_create_localhost(
+                    "wireless",
+                    wireless_dev->chart_id_net_level,
+                    NULL,
+                    wireless_dev->name,
+                    "wireless.signal_level",
+                    "The signal level is the wireless signal power level received by the wireless client. The closer the value is to 0, the stronger the signal.",
+                    "dBm",
+                    PLUGIN_PROC_NAME,
+                    PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
+                    NETDATA_CHART_PRIO_WIRELESS_IFACE + 2,
+                    update_every,
+                    RRDSET_TYPE_LINE);
                 rrdset_flag_set(wireless_dev->st_level, RRDSET_FLAG_DETAIL);
 
-                wireless_dev->rd_level = rrddim_add(wireless_dev->st_level, "signal_level", NULL, 1, 1,
-                                                    RRD_ALGORITHM_ABSOLUTE);
-            } else {
-                rrdset_next(wireless_dev->st_level);
+                wireless_dev->rd_level = rrddim_add(wireless_dev->st_level, "signal_level", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+
+                add_labels_to_wireless(wireless_dev, wireless_dev->st_level);
             }
+            else
+                rrdset_next(wireless_dev->st_level);
 
             if (unlikely(!wireless_dev->st_noise)) {
-                wireless_dev->st_noise = rrdset_create_localhost("wireless",
-                                                                 wireless_dev->chart_id_net_noise,
-                                                                 NULL,
-                                                                 wireless_dev->name,
-                                                                 "wireless.noise_level",
-                                                                 "The noise level indicates the amount of background noise in your environment. The closer the value to 0, the greater the noise level.",
-                                                                 "dBm",
-                                                                 PLUGIN_PROC_NAME,
-                                                                 PLUGIN_PROC_MODULE_NETWIRELESS_NAME,
-                                                                 NETDATA_CHART_PRIO_WIRELESS_IFACE + 3,