added prefix in multi-chart plugins

diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
index 1580aa9eeec38e884020ecb0450b4829801233e6..934e3bda89732323c77e32a62f85597b6194bbba 100755 (executable)
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -35,8 +35,8 @@ mysql_check() {
 
        if [ ${#mysql_opts[@]} -eq 0 ]
                then
-               mysql_cmds[localhost]="$mysql_cmd"
-               mysql_opts[localhost]=
+               mysql_cmds[local]="$mysql_cmd"
+               mysql_opts[local]=
        fi
 
        # check once if the url works
@@ -76,16 +76,16 @@ mysql_create() {
        for m in "${mysql_ids[@]}"
        do
                cat <<EOF
-CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits / sec" $m mysql area 20001 $mysql_update_every
+CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits / sec" mysql_$m mysql area 20001 $mysql_update_every
 DIMENSION Bytes_received in incremental 8 $((1024 * mysql_update_every))
 DIMENSION Bytes_sent out incremental -8 $((1024 * mysql_update_every))
 
-CHART mysql_$m.queries '' "mysql Queries" "queries / sec" $m mysql line 20002 $mysql_update_every
+CHART mysql_$m.queries '' "mysql Queries" "queries / sec" mysql_$m mysql line 20002 $mysql_update_every
 DIMENSION Queries queries incremental 1 $((1 * mysql_update_every))
 DIMENSION Questions questions incremental 1 $((1 * mysql_update_every))
 DIMENSION Slow_queries slow_queries incremental -1 $((1 * mysql_update_every))
 
-CHART mysql_$m.operations '' "mysql Operations" "operations / sec" $m mysql line 20003 $mysql_update_every
+CHART mysql_$m.operations '' "mysql Operations" "operations / sec" mysql_$m mysql line 20003 $mysql_update_every
 DIMENSION Opened_tables opened_tables incremental 1 $((1 * mysql_update_every))
 DIMENSION Flush_commands flush incremental 1 $((1 * mysql_update_every))
 DIMENSION Handler_commit commit incremental 1 $((1 * mysql_update_every))
@@ -103,18 +103,18 @@ DIMENSION Handler_savepoint_rollback savepoint_rollback incremental 1 $((1 * mys
 DIMENSION Handler_update update incremental 1 $((1 * mysql_update_every))
 DIMENSION Handler_write write incremental 1 $((1 * mysql_update_every))
 
-CHART mysql_$m.table_locks '' "mysql Tables Locks" "locks / sec" $m mysql line 20004 $mysql_update_every
+CHART mysql_$m.table_locks '' "mysql Tables Locks" "locks / sec" mysql_$m mysql line 20004 $mysql_update_every
 DIMENSION Table_locks_immediate immediate incremental 1 $((1 * mysql_update_every))
 DIMENSION Table_locks_waited waited incremental -1 $((1 * mysql_update_every))
 
-CHART mysql_$m.select_issues '' "mysql Select Issues" "issues / sec" $m mysql line 20005 $mysql_update_every
+CHART mysql_$m.select_issues '' "mysql Select Issues" "issues / sec" mysql_$m mysql line 20005 $mysql_update_every
 DIMENSION Select_full_join full_join incremental 1 $((1 * mysql_update_every))
 DIMENSION Select_full_range_join full_range_join incremental 1 $((1 * mysql_update_every))
 DIMENSION Select_range range incremental 1 $((1 * mysql_update_every))
 DIMENSION Select_range_check range_check incremental 1 $((1 * mysql_update_every))
 DIMENSION Select_scan scan incremental 1 $((1 * mysql_update_every))
 
-CHART mysql_$m.sort_issues '' "mysql Sort Issues" "issues / sec" $m mysql line 20006 $mysql_update_every
+CHART mysql_$m.sort_issues '' "mysql Sort Issues" "issues / sec" mysql_$m mysql line 20006 $mysql_update_every
 DIMENSION Sort_merge_passes merge_passes incremental 1 $((1 * mysql_update_every))
 DIMENSION Sort_range range incremental 1 $((1 * mysql_update_every))
 DIMENSION Sort_scan scan incremental 1 $((1 * mysql_update_every))

diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
index 156e9bdec601fced759a34c698e741302de884e1..d756c82374d2e5cef2ae003862598b805f0a2e9f 100755 (executable)
--- a/charts.d/nut.chart.sh
+++ b/charts.d/nut.chart.sh
@@ -60,34 +60,34 @@ nut_create() {
        for x in "${nut_ids[@]}"
        do
                cat <<EOF
-CHART nut_$x.charge '' "UPS Charge" "percentage" $x nut area 21001 $nut_update_every
+CHART nut_$x.charge '' "UPS Charge" "percentage" ups_$x nut area 21001 $nut_update_every
 DIMENSION battery_charge charge absolute 1 100
 
-CHART nut_$x.battery_voltage '' "UPS Battery Voltage" "Volts" $x nut line 21002 $nut_update_every
+CHART nut_$x.battery_voltage '' "UPS Battery Voltage" "Volts" ups_$x nut line 21002 $nut_update_every
 DIMENSION battery_voltage voltage absolute 1 100
 DIMENSION battery_voltage_high high absolute 1 100
 DIMENSION battery_voltage_low low absolute 1 100
 DIMENSION battery_voltage_nominal nominal absolute 1 100
 
-CHART nut_$x.input_voltage '' "UPS Input Voltage" "Volts" $x nut line 21003 $nut_update_every
+CHART nut_$x.input_voltage '' "UPS Input Voltage" "Volts" ups_$x nut line 21003 $nut_update_every
 DIMENSION input_voltage voltage absolute 1 100
 DIMENSION input_voltage_fault fault absolute 1 100
 DIMENSION input_voltage_nominal nominal absolute 1 100
 
-CHART nut_$x.input_current '' "UPS Input Current" "Ampere" $x nut line 21004 $nut_update_every
+CHART nut_$x.input_current '' "UPS Input Current" "Ampere" ups_$x nut line 21004 $nut_update_every
 DIMENSION input_current_nominal nominal absolute 1 100
 
-CHART nut_$x.input_frequency '' "UPS Input Frequency" "Hz" $x nut line 21005 $nut_update_every
+CHART nut_$x.input_frequency '' "UPS Input Frequency" "Hz" ups_$x nut line 21005 $nut_update_every
 DIMENSION input_frequency frequency absolute 1 100
 DIMENSION input_frequency_nominal nominal absolute 1 100
 
-CHART nut_$x.output_voltage '' "UPS Output Voltage" "Volts" $x nut line 21006 $nut_update_every
+CHART nut_$x.output_voltage '' "UPS Output Voltage" "Volts" ups_$x nut line 21006 $nut_update_every
 DIMENSION output_voltage voltage absolute 1 100
 
-CHART nut_$x.load '' "UPS Load" "percentage" $x nut area 21000 $nut_update_every
+CHART nut_$x.load '' "UPS Load" "percentage" ups_$x nut area 21000 $nut_update_every
 DIMENSION load load absolute 1 100
 
-CHART nut_$x.temp '' "UPS Temperature" "temperature" $x nut line 21007 $nut_update_every
+CHART nut_$x.temp '' "UPS Temperature" "temperature" ups_$x nut line 21007 $nut_update_every
 DIMENSION temp temp absolute 1 100
 EOF
        done