summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--collectors/charts.d.plugin/sensors/sensors.chart.sh28
-rw-r--r--collectors/diskspace.plugin/plugin_diskspace.c4
-rw-r--r--collectors/proc.plugin/proc_interrupts.c2
-rw-r--r--collectors/proc.plugin/proc_net_softnet_stat.c2
-rw-r--r--collectors/proc.plugin/proc_softirqs.c2
-rw-r--r--collectors/proc.plugin/sys_fs_btrfs.c8
-rw-r--r--collectors/python.d.plugin/python_modules/bases/charts.py2
-rw-r--r--collectors/python.d.plugin/sensors/sensors.chart.py15
-rw-r--r--ml/Host.cc30
-rw-r--r--web/server/static/static-threaded.c2
10 files changed, 44 insertions, 51 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])
diff --git a/ml/Host.cc b/ml/Host.cc
index c110f264b8..b287d1f228 100644
--- a/ml/Host.cc
+++ b/ml/Host.cc
@@ -20,11 +20,10 @@ static void updateDimensionsChart(RRDHOST *RH,
static thread_local RRDDIM *NumAnomalousDimensionsRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "dimensions_on_" << localhost->machine_guid;
NameSS << "dimensions_on_" << localhost->hostname;
- TitleSS << "Anomaly detection dimensions for host " << RH->hostname;
RS = rrdset_create(
RH,
@@ -33,7 +32,7 @@ static void updateDimensionsChart(RRDHOST *RH,
NameSS.str().c_str(), // name
"dimensions", // family
"anomaly_detection.dimensions", // ctx
- TitleSS.str().c_str(), // title
+ "Anomaly detection dimensions", // title
"dimensions", // units
"netdata", // plugin
"ml", // module
@@ -67,11 +66,10 @@ static void updateRateChart(RRDHOST *RH, collected_number AnomalyRate) {
static thread_local RRDDIM *AnomalyRateRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "anomaly_rate_on_" << localhost->machine_guid;
NameSS << "anomaly_rate_on_" << localhost->hostname;
- TitleSS << "Percentage of anomalous dimensions for host " << RH->hostname;
RS = rrdset_create(
RH,
@@ -80,7 +78,7 @@ static void updateRateChart(RRDHOST *RH, collected_number AnomalyRate) {
NameSS.str().c_str(), // name
"anomaly_rate", // family
"anomaly_detection.anomaly_rate", // ctx
- TitleSS.str().c_str(), // title
+ "Percentage of anomalous dimensions", // title
"percentage", // units
"netdata", // plugin
"ml", // module
@@ -105,11 +103,10 @@ static void updateWindowLengthChart(RRDHOST *RH, collected_number WindowLength)
static thread_local RRDDIM *WindowLengthRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "detector_window_on_" << localhost->machine_guid;
NameSS << "detector_window_on_" << localhost->hostname;
- TitleSS << "Anomaly detector window length for host " << RH->hostname;
RS = rrdset_create(
RH,
@@ -118,7 +115,7 @@ static void updateWindowLengthChart(RRDHOST *RH, collected_number WindowLength)
NameSS.str().c_str(), // name
"detector_window", // family
"anomaly_detection.detector_window", // ctx
- TitleSS.str().c_str(), // title
+ "Anomaly detector window length", // title
"seconds", // units
"netdata", // plugin
"ml", // module
@@ -147,11 +144,10 @@ static void updateEventsChart(RRDHOST *RH,
static thread_local RRDDIM *NewAnomalyEventRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "detector_events_on_" << localhost->machine_guid;
NameSS << "detector_events_on_" << localhost->hostname;
- TitleSS << "Anomaly events triggered for host " << RH->hostname;
RS = rrdset_create(
RH,
@@ -160,7 +156,7 @@ static void updateEventsChart(RRDHOST *RH,
NameSS.str().c_str(), // name
"detector_events", // family
"anomaly_detection.detector_events", // ctx
- TitleSS.str().c_str(), // title
+ "Anomaly events triggered", // title
"boolean", // units
"netdata", // plugin
"ml", // module
@@ -194,11 +190,10 @@ static void updateDetectionChart(RRDHOST *RH) {
static thread_local RRDDIM *UserRD, *SystemRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "prediction_stats_" << RH->machine_guid;
NameSS << "prediction_stats_for_" << RH->hostname;
- TitleSS << "Prediction thread CPU usage for host " << RH->hostname;
RS = rrdset_create_localhost(
"netdata", // type
@@ -206,7 +201,7 @@ static void updateDetectionChart(RRDHOST *RH) {
NameSS.str().c_str(), // name
"ml", // family
"netdata.prediction_stats", // ctx
- TitleSS.str().c_str(), // title
+ "Prediction thread CPU usage", // title
"milliseconds/s", // units
"netdata", // plugin
"ml", // module
@@ -235,11 +230,10 @@ static void updateTrainingChart(RRDHOST *RH, struct rusage *TRU)
static thread_local RRDDIM *SystemRD = nullptr;
if (!RS) {
- std::stringstream IdSS, NameSS, TitleSS;
+ std::stringstream IdSS, NameSS;
IdSS << "training_stats_" << RH->machine_guid;
NameSS << "training_stats_for_" << RH->hostname;
- TitleSS << "Training thread CPU usage for host " << RH->hostname;
RS = rrdset_create_localhost(
"netdata", // type
@@ -247,7 +241,7 @@ static void updateTrainingChart(RRDHOST *RH, struct rusage *TRU)
NameSS.str().c_str(), // name
"ml", // family
"netdata.training_stats", // ctx
- TitleSS.str().c_str(), // title
+ "Training thread CPU usage", // title
"milliseconds/s", // units
"netdata", // plugin
"ml", // module
diff --git a/web/server/static/static-threaded.c b/web/server/static/static-threaded.c
index 07aa3fa3d2..ff10cb8819 100644
--- a/web/server/static/static-threaded.c
+++ b/web/server/static/static-threaded.c
@@ -331,7 +331,7 @@ static void web_server_tmr_callback(void *timer_data) {
char title[100 + 1];
snprintfz(id, 100, "web_thread%d_cpu", worker_private->id + 1);
- snprintfz(title, 100, "Netdata web server thread No %d CPU usage", worker_private->id + 1);
+ snprintfz(title, 100, "Netdata web server thread CPU usage");
st = rrdset_create_localhost(
"netdata"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 21:39:06 +0000