added prefix in multi-chart plugins
Costa Tsaousis (ktsaou) committed
Nov 19, 2015 at 01:30 UTC
1a989c369f68b810f1261b0261d626aa715d6d4c
2 files changed
+16
-16
charts.d/mysql.chart.sh
+8
-8
@@ -35,8 +35,8 @@ mysql_check() {
35
36
if [ ${#mysql_opts[@]} -eq 0 ]
37
then
38
- mysql_cmds[localhost]="$mysql_cmd"
39
- mysql_opts[localhost]=
38
+ mysql_cmds[local]="$mysql_cmd"
39
+ mysql_opts[local]=
40
fi
41
42
# check once if the url works
@@ -76,16 +76,16 @@ mysql_create() {
76
for m in "${mysql_ids[@]}"
77
do
78
cat <<EOF
79
-CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits / sec" $m mysql area 20001 $mysql_update_every
79
+CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits / sec" mysql_$m mysql area 20001 $mysql_update_every
80
DIMENSION Bytes_received in incremental 8 $((1024 * mysql_update_every))
81
DIMENSION Bytes_sent out incremental -8 $((1024 * mysql_update_every))
82
83
-CHART mysql_$m.queries '' "mysql Queries" "queries / sec" $m mysql line 20002 $mysql_update_every
83
+CHART mysql_$m.queries '' "mysql Queries" "queries / sec" mysql_$m mysql line 20002 $mysql_update_every
84
DIMENSION Queries queries incremental 1 $((1 * mysql_update_every))
85
DIMENSION Questions questions incremental 1 $((1 * mysql_update_every))
86
DIMENSION Slow_queries slow_queries incremental -1 $((1 * mysql_update_every))
87
88
-CHART mysql_$m.operations '' "mysql Operations" "operations / sec" $m mysql line 20003 $mysql_update_every
88
+CHART mysql_$m.operations '' "mysql Operations" "operations / sec" mysql_$m mysql line 20003 $mysql_update_every
89
DIMENSION Opened_tables opened_tables incremental 1 $((1 * mysql_update_every))
90
DIMENSION Flush_commands flush incremental 1 $((1 * mysql_update_every))
91
DIMENSION Handler_commit commit incremental 1 $((1 * mysql_update_every))
@@ -103,18 +103,18 @@ DIMENSION Handler_savepoint_rollback savepoint_rollback incremental 1 $((1 * mys
103
DIMENSION Handler_update update incremental 1 $((1 * mysql_update_every))
104
DIMENSION Handler_write write incremental 1 $((1 * mysql_update_every))
105
106
-CHART mysql_$m.table_locks '' "mysql Tables Locks" "locks / sec" $m mysql line 20004 $mysql_update_every
106
+CHART mysql_$m.table_locks '' "mysql Tables Locks" "locks / sec" mysql_$m mysql line 20004 $mysql_update_every
107
DIMENSION Table_locks_immediate immediate incremental 1 $((1 * mysql_update_every))
108
DIMENSION Table_locks_waited waited incremental -1 $((1 * mysql_update_every))
109
110
-CHART mysql_$m.select_issues '' "mysql Select Issues" "issues / sec" $m mysql line 20005 $mysql_update_every
110
+CHART mysql_$m.select_issues '' "mysql Select Issues" "issues / sec" mysql_$m mysql line 20005 $mysql_update_every
111
DIMENSION Select_full_join full_join incremental 1 $((1 * mysql_update_every))
112
DIMENSION Select_full_range_join full_range_join incremental 1 $((1 * mysql_update_every))
113
DIMENSION Select_range range incremental 1 $((1 * mysql_update_every))
114
DIMENSION Select_range_check range_check incremental 1 $((1 * mysql_update_every))
115
DIMENSION Select_scan scan incremental 1 $((1 * mysql_update_every))
116
117
-CHART mysql_$m.sort_issues '' "mysql Sort Issues" "issues / sec" $m mysql line 20006 $mysql_update_every
117
+CHART mysql_$m.sort_issues '' "mysql Sort Issues" "issues / sec" mysql_$m mysql line 20006 $mysql_update_every
118
DIMENSION Sort_merge_passes merge_passes incremental 1 $((1 * mysql_update_every))
119
DIMENSION Sort_range range incremental 1 $((1 * mysql_update_every))
120
DIMENSION Sort_scan scan incremental 1 $((1 * mysql_update_every))
charts.d/nut.chart.sh
+8
-8
@@ -60,34 +60,34 @@ nut_create() {
60
for x in "${nut_ids[@]}"
61
do
62
cat <<EOF
63
-CHART nut_$x.charge '' "UPS Charge" "percentage" $x nut area 21001 $nut_update_every
63
+CHART nut_$x.charge '' "UPS Charge" "percentage" ups_$x nut area 21001 $nut_update_every
64
DIMENSION battery_charge charge absolute 1 100
65
66
-CHART nut_$x.battery_voltage '' "UPS Battery Voltage" "Volts" $x nut line 21002 $nut_update_every
66
+CHART nut_$x.battery_voltage '' "UPS Battery Voltage" "Volts" ups_$x nut line 21002 $nut_update_every
67
DIMENSION battery_voltage voltage absolute 1 100
68
DIMENSION battery_voltage_high high absolute 1 100
69
DIMENSION battery_voltage_low low absolute 1 100
70
DIMENSION battery_voltage_nominal nominal absolute 1 100
71
72
-CHART nut_$x.input_voltage '' "UPS Input Voltage" "Volts" $x nut line 21003 $nut_update_every
72
+CHART nut_$x.input_voltage '' "UPS Input Voltage" "Volts" ups_$x nut line 21003 $nut_update_every
73
DIMENSION input_voltage voltage absolute 1 100
74
DIMENSION input_voltage_fault fault absolute 1 100
75
DIMENSION input_voltage_nominal nominal absolute 1 100
76
77
-CHART nut_$x.input_current '' "UPS Input Current" "Ampere" $x nut line 21004 $nut_update_every
77
+CHART nut_$x.input_current '' "UPS Input Current" "Ampere" ups_$x nut line 21004 $nut_update_every
78
DIMENSION input_current_nominal nominal absolute 1 100
79
80
-CHART nut_$x.input_frequency '' "UPS Input Frequency" "Hz" $x nut line 21005 $nut_update_every
80
+CHART nut_$x.input_frequency '' "UPS Input Frequency" "Hz" ups_$x nut line 21005 $nut_update_every
81
DIMENSION input_frequency frequency absolute 1 100
82
DIMENSION input_frequency_nominal nominal absolute 1 100
83
84
-CHART nut_$x.output_voltage '' "UPS Output Voltage" "Volts" $x nut line 21006 $nut_update_every
84
+CHART nut_$x.output_voltage '' "UPS Output Voltage" "Volts" ups_$x nut line 21006 $nut_update_every
85
DIMENSION output_voltage voltage absolute 1 100
86
87
-CHART nut_$x.load '' "UPS Load" "percentage" $x nut area 21000 $nut_update_every
87
+CHART nut_$x.load '' "UPS Load" "percentage" ups_$x nut area 21000 $nut_update_every
88
DIMENSION load load absolute 1 100
89
90
-CHART nut_$x.temp '' "UPS Temperature" "temperature" $x nut line 21007 $nut_update_every
90
+CHART nut_$x.temp '' "UPS Temperature" "temperature" ups_$x nut line 21007 $nut_update_every
91
DIMENSION temp temp absolute 1 100
92
EOF
93
done