fix: remove instance-specific information from chart titles (#12644)

Co-authored-by: Vasilis Kalintiris <vasilis@netdata.cloud>

8 files changed, 31 insertions, 32 deletions

diff --git a/collectors/charts.d.plugin/sensors/sensors.chart.sh b/collectors/charts.d.plugin/sensors/sensors.chart.sh
index bff381f1cf..0527e1e7e0 100644
--- a/collectors/charts.d.plugin/sensors/sensors.chart.sh
+++ b/collectors/charts.d.plugin/sensors/sensors.chart.sh
@@ -143,8 +143,8 @@ sensors_create() {
 				files="$(sensors_check_files "$files")"
 				files="$(sensors_check_temp_type "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.temp_$id '' '$name Temperature' 'Celsius' 'temperature' 'sensors.temp' line $((sensors_priority + 1)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.temp_$id \$1\""
+				echo "CHART 'sensors.temp_${id}_${name}' '' 'Temperature' 'Celsius' 'temperature' 'sensors.temp' line $((sensors_priority + 1)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.temp_${id}_${name}' \$1\""
 				divisor=1000
 				;;
 
@@ -152,8 +152,8 @@ sensors_create() {
 				files="$(ls "$path"/in*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.volt_$id '' '$name Voltage' 'Volts' 'voltage' 'sensors.volt' line $((sensors_priority + 2)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.volt_$id \$1\""
+				echo "CHART 'sensors.volt_${id}_${name}' '' 'Voltage' 'Volts' 'voltage' 'sensors.volt' line $((sensors_priority + 2)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.volt_${id}_${name}' \$1\""
 				divisor=1000
 				;;
 
@@ -161,8 +161,8 @@ sensors_create() {
 				files="$(ls "$path"/curr*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.curr_$id '' '$name Current' 'Ampere' 'current' 'sensors.curr' line $((sensors_priority + 3)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.curr_$id \$1\""
+				echo "CHART 'sensors.curr_${id}_${name}' '' 'Current' 'Ampere' 'current' 'sensors.curr' line $((sensors_priority + 3)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.curr_${id}_${name}' \$1\""
 				divisor=1000
 				;;
 
@@ -170,8 +170,8 @@ sensors_create() {
 				files="$(ls "$path"/power*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.power_$id '' '$name Power' 'Watt' 'power' 'sensors.power' line $((sensors_priority + 4)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.power_$id \$1\""
+				echo "CHART 'sensors.power_${id}_${name}' '' 'Power' 'Watt' 'power' 'sensors.power' line $((sensors_priority + 4)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.power_${id}_${name}' \$1\""
 				divisor=1000000
 				;;
 
@@ -179,16 +179,16 @@ sensors_create() {
 				files="$(ls "$path"/fan*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.fan_$id '' '$name Fans Speed' 'Rotations / Minute' 'fans' 'sensors.fans' line $((sensors_priority + 5)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.fan_$id \$1\""
+				echo "CHART 'sensors.fan_${id}_${name}' '' 'Fans Speed' 'Rotations / Minute' 'fans' 'sensors.fans' line $((sensors_priority + 5)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.fan_${id}_${name}' \$1\""
 				;;
 
 			energy)
 				files="$(ls "$path"/energy*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.energy_$id '' '$name Energy' 'Joule' 'energy' 'sensors.energy' areastack $((sensors_priority + 6)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.energy_$id \$1\""
+				echo "CHART 'sensors.energy_${id}_${name}' '' 'Energy' 'Joule' 'energy' 'sensors.energy' areastack $((sensors_priority + 6)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.energy_${id}_${name}' \$1\""
 				algorithm="incremental"
 				divisor=1000000
 				;;
@@ -197,8 +197,8 @@ sensors_create() {
 				files="$(ls "$path"/humidity*_input 2>/dev/null)"
 				files="$(sensors_check_files "$files")"
 				[ -z "$files" ] && continue
-				echo "CHART sensors.humidity_$id '' '$name Humidity' 'Percent' 'humidity' 'sensors.humidity' line $((sensors_priority + 7)) $sensors_update_every '' '' 'sensors'"
-				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN sensors.humidity_$id \$1\""
+				echo "CHART 'sensors.humidity_${id}_${name}' '' 'Humidity' 'Percent' 'humidity' 'sensors.humidity' line $((sensors_priority + 7)) $sensors_update_every '' '' 'sensors'"
+				echo >>"$TMP_DIR/sensors.sh" "echo \"BEGIN 'sensors.humidity_${id}_${name}' \$1\""
 				divisor=1000
 				;;
 
diff --git a/collectors/diskspace.plugin/plugin_diskspace.c b/collectors/diskspace.plugin/plugin_diskspace.c
index c148e415a6..b6a52c0611 100644
--- a/collectors/diskspace.plugin/plugin_diskspace.c
+++ b/collectors/diskspace.plugin/plugin_diskspace.c
@@ -284,7 +284,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
             m->st_space = rrdset_find_active_bytype_localhost("disk_space", disk);
             if(unlikely(!m->st_space)) {
                 char title[4096 + 1];
-                snprintfz(title, 4096, "Disk Space Usage for %s [%s]", family, mi->mount_source);
+                snprintfz(title, 4096, "Disk Space Usage");
                 m->st_space = rrdset_create_localhost(
                         "disk_space"
                         , disk
@@ -326,7 +326,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
             m->st_inodes = rrdset_find_active_bytype_localhost("disk_inodes", disk);
             if(unlikely(!m->st_inodes)) {
                 char title[4096 + 1];
-                snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", family, mi->mount_source);
+                snprintfz(title, 4096, "Disk Files (inodes) Usage");
                 m->st_inodes = rrdset_create_localhost(
                         "disk_inodes"
                         , disk
diff --git a/collectors/proc.plugin/proc_interrupts.c b/collectors/proc.plugin/proc_interrupts.c
index 2db980a030..78883c4756 100644
--- a/collectors/proc.plugin/proc_interrupts.c
+++ b/collectors/proc.plugin/proc_interrupts.c
@@ -210,7 +210,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {
                 snprintfz(id, 50, "cpu%d_interrupts", c);
 
                 char title[100+1];
-                snprintfz(title, 100, "CPU%d Interrupts", c);
+                snprintfz(title, 100, "CPU Interrupts");
                 core_st[c] = rrdset_create_localhost(
                         "cpu"
                         , id
diff --git a/collectors/proc.plugin/proc_net_softnet_stat.c b/collectors/proc.plugin/proc_net_softnet_stat.c
index a29ccccd1a..1f704a427e 100644
--- a/collectors/proc.plugin/proc_net_softnet_stat.c
+++ b/collectors/proc.plugin/proc_net_softnet_stat.c
@@ -117,7 +117,7 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
             st = rrdset_find_active_bytype_localhost("cpu", id);
             if(unlikely(!st)) {
                 char title[100+1];
-                snprintfz(title, 100, "CPU%zu softnet_stat", l);
+                snprintfz(title, 100, "CPU softnet_stat");
 
                 st = rrdset_create_localhost(
                         "cpu"
diff --git a/collectors/proc.plugin/proc_softirqs.c b/collectors/proc.plugin/proc_softirqs.c
index d68c69bb79..bb14c15966 100644
--- a/collectors/proc.plugin/proc_softirqs.c
+++ b/collectors/proc.plugin/proc_softirqs.c
@@ -201,7 +201,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
                 snprintfz(id, 50, "cpu%d_softirqs", c);
 
                 char title[100 + 1];
-                snprintfz(title, 100, "CPU%d softirqs", c);
+                snprintfz(title, 100, "CPU softirqs");
 
                 core_st[c] = rrdset_create_localhost(
                         "cpu"
diff --git a/collectors/proc.plugin/sys_fs_btrfs.c b/collectors/proc.plugin/sys_fs_btrfs.c
index 4e58a1a4c2..e28b60a7a5 100644
--- a/collectors/proc.plugin/sys_fs_btrfs.c
+++ b/collectors/proc.plugin/sys_fs_btrfs.c
@@ -552,7 +552,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
 
                 snprintf(id, RRD_ID_LENGTH_MAX, "disk_%s", node->id);
                 snprintf(name, RRD_ID_LENGTH_MAX, "disk_%s", node->label);
-                snprintf(title, 200, "BTRFS Physical Disk Allocation for %s", node->label);
+                snprintf(title, 200, "BTRFS Physical Disk Allocation");
 
                 netdata_fix_chart_id(id);
                 netdata_fix_chart_name(name);
@@ -610,7 +610,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
 
                 snprintf(id, RRD_ID_LENGTH_MAX, "data_%s", node->id);
                 snprintf(name, RRD_ID_LENGTH_MAX, "data_%s", node->label);
-                snprintf(title, 200, "BTRFS Data Allocation for %s", node->label);
+                snprintf(title, 200, "BTRFS Data Allocation");
 
                 netdata_fix_chart_id(id);
                 netdata_fix_chart_name(name);
@@ -653,7 +653,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
 
                 snprintf(id, RRD_ID_LENGTH_MAX, "metadata_%s", node->id);
                 snprintf(name, RRD_ID_LENGTH_MAX, "metadata_%s", node->label);
-                snprintf(title, 200, "BTRFS Metadata Allocation for %s", node->label);
+                snprintf(title, 200, "BTRFS Metadata Allocation");
 
                 netdata_fix_chart_id(id);
                 netdata_fix_chart_name(name);
@@ -698,7 +698,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
 
                 snprintf(id, RRD_ID_LENGTH_MAX, "system_%s", node->id);
                 snprintf(name, RRD_ID_LENGTH_MAX, "system_%s", node->label);
-                snprintf(title, 200, "BTRFS System Allocation for %s", node->label);
+                snprintf(title, 200, "BTRFS System Allocation");
 
                 netdata_fix_chart_id(id);
                 netdata_fix_chart_name(name);
diff --git a/collectors/python.d.plugin/python_modules/bases/charts.py b/collectors/python.d.plugin/python_modules/bases/charts.py
index 2526af8ce4..54986a9373 100644
--- a/collectors/python.d.plugin/python_modules/bases/charts.py
+++ b/collectors/python.d.plugin/python_modules/bases/charts.py
@@ -23,7 +23,7 @@ DIMENSION_SET = "SET '{id}' = {value}\n"
 
 CHART_VARIABLE_SET = "VARIABLE CHART '{id}' = {value}\n"
 
-RUNTIME_CHART_CREATE = "CHART netdata.runtime_{job_name} '' 'Execution time for {job_name}' 'ms' 'python.d' " \
+RUNTIME_CHART_CREATE = "CHART netdata.runtime_{job_name} '' 'Execution time' 'ms' 'python.d' " \
                        "netdata.pythond_runtime line 145000 {update_every} '' 'python.d.plugin' '{module_name}'\n" \
                        "DIMENSION run_time 'run time' absolute 1 1\n"
 
diff --git a/collectors/python.d.plugin/sensors/sensors.chart.py b/collectors/python.d.plugin/sensors/sensors.chart.py
index 8c0cde6bb6..f089e147ac 100644
--- a/collectors/python.d.plugin/sensors/sensors.chart.py
+++ b/collectors/python.d.plugin/sensors/sensors.chart.py
@@ -19,43 +19,43 @@ ORDER = [
 # This is a prototype of chart definition which is used to dynamically create self.definitions
 CHARTS = {
     'temperature': {
-        'options': [None, ' temperature', 'Celsius', 'temperature', 'sensors.temperature', 'line'],
+        'options': [None, 'Temperature', 'Celsius', 'temperature', 'sensors.temperature', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
     },
     'voltage': {
-        'options': [None, ' voltage', 'Volts', 'voltage', 'sensors.voltage', 'line'],
+        'options': [None, 'Voltage', 'Volts', 'voltage', 'sensors.voltage', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
     },
     'current': {
-        'options': [None, ' current', 'Ampere', 'current', 'sensors.current', 'line'],
+        'options': [None, 'Current', 'Ampere', 'current', 'sensors.current', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
     },
     'power': {
-        'options': [None, ' power', 'Watt', 'power', 'sensors.power', 'line'],
+        'options': [None, 'Power', 'Watt', 'power', 'sensors.power', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
     },
     'fan': {
-        'options': [None, ' fans speed', 'Rotations/min', 'fans', 'sensors.fan', 'line'],
+        'options': [None, 'Fans speed', 'Rotations/min', 'fans', 'sensors.fan', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
     },
     'energy': {
-        'options': [None, ' energy', 'Joule', 'energy', 'sensors.energy', 'line'],
+        'options': [None, 'Energy', 'Joule', 'energy', 'sensors.energy', 'line'],
         'lines': [
             [None, None, 'incremental', 1, 1000]
         ]
     },
     'humidity': {
-        'options': [None, ' humidity', 'Percent', 'humidity', 'sensors.humidity', 'line'],
+        'options': [None, 'Humidity', 'Percent', 'humidity', 'sensors.humidity', 'line'],
         'lines': [
             [None, None, 'absolute', 1, 1000]
         ]
@@ -143,7 +143,6 @@ class Service(SimpleService):
                         if name not in self.order:
                             self.order.append(name)
                             chart_def = list(CHARTS[sensor]['options'])
-                            chart_def[1] = chip_name + chart_def[1]
                             self.definitions[name] = {'options': chart_def}
                             self.definitions[name]['lines'] = []
                         line = list(CHARTS[sensor]['lines'][0])