fix units

diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
index 9f7664165b21076d880467f51c4adbce4e557203..20bbbc696115d224740adef71c43b5ba4e9f65f4 100755 (executable)
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -159,16 +159,16 @@ mysql_create() {
        for m in "${mysql_ids[@]}"
        do
                cat <<EOF
-CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits / sec" mysql_$m mysql area 20001 $mysql_update_every
+CHART mysql_$m.bandwidth '' "mysql Bandwidth" "kilobits/s" 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" mysql_$m mysql line 20002 $mysql_update_every
+CHART mysql_$m.queries '' "mysql Queries" "queries/s" 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.handlers '' "mysql Handlers" "handlers / sec" mysql_$m mysql line 20003 $mysql_update_every
+CHART mysql_$m.handlers '' "mysql Handlers" "handlers/s" mysql_$m mysql line 20003 $mysql_update_every
 DIMENSION Handler_commit commit incremental 1 $((1 * mysql_update_every))
 DIMENSION Handler_delete delete incremental 1 $((1 * mysql_update_every))
 DIMENSION Handler_prepare prepare incremental 1 $((1 * mysql_update_every))
@@ -184,18 +184,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" mysql_$m mysql line 20004 $mysql_update_every
+CHART mysql_$m.table_locks '' "mysql Tables Locks" "locks/s" 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.join_issues '' "mysql Select Join Issues" "joins / sec" mysql_$m mysql line 20005 $mysql_update_every
+CHART mysql_$m.join_issues '' "mysql Select Join Issues" "joins/s" 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" mysql_$m mysql line 20006 $mysql_update_every
+CHART mysql_$m.sort_issues '' "mysql Sort Issues" "issues/s" 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))
@@ -214,17 +214,17 @@ DIMENSION Binlog_cache_disk_use disk incremental 1 $((1 * mysql_update_every))
 DIMENSION Binlog_cache_use all incremental 1 $((1 * mysql_update_every))
 
 CHART mysql_$m.threads '' "mysql Threads" "threads" mysql_$m mysql line 20012 $mysql_update_every
-DIMENSION Threads_connected connected absolute 1 $((1 * mysql_update_every))
+DIMENSION Threads_connected connected absolute 1 1
 DIMENSION Threads_created created incremental 1 $((1 * mysql_update_every))
-DIMENSION Threads_cached cached absolute -1 $((1 * mysql_update_every))
+DIMENSION Threads_cached cached absolute -1 1
 DIMENSION Threads_running running absolute 1 $((1 * mysql_update_every))
 
 CHART mysql_$m.thread_cache_misses '' "mysql Threads Cache Misses" "misses" mysql_$m mysql area 20013 $mysql_update_every
-DIMENSION misses misses absolute 1 $((100 * mysql_update_every))
+DIMENSION misses misses absolute 1 100
 
-CHART mysql_$m.innodb_io '' "mysql InnoDB I/O Bandwidth" "kbps" mysql_$m mysql area 20014 $mysql_update_every
-DIMENSION Innodb_data_read read incremental 8 $((1000 * mysql_update_every))
-DIMENSION Innodb_data_written write incremental -8 $((1000 * mysql_update_every))
+CHART mysql_$m.innodb_io '' "mysql InnoDB I/O Bandwidth" "kilobytes/s" mysql_$m mysql area 20014 $mysql_update_every
+DIMENSION Innodb_data_read read incremental 1 $((1000 * mysql_update_every))
+DIMENSION Innodb_data_written write incremental -1 $((1000 * mysql_update_every))
 
 CHART mysql_$m.innodb_io_ops '' "mysql InnoDB I/O Operations" "operations/s" mysql_$m mysql line 20015 $mysql_update_every
 DIMENSION Innodb_data_reads reads incremental 1 $((1 * mysql_update_every))
@@ -240,11 +240,11 @@ DIMENSION Innodb_os_log_fsyncs fsyncs incremental 1 $((1 * mysql_update_every))
 DIMENSION Innodb_os_log_pending_fsyncs pending_fsyncs incremental 1 $((1 * mysql_update_every))
 DIMENSION Innodb_os_log_pending_writes pending_writes incremental -1 $((1 * mysql_update_every))
 
-CHART mysql_$m.innodb_os_log_io '' "mysql InnoDB OS Log Bandwidth" "kbps" mysql_$m mysql area 20018 $mysql_update_every
-DIMENSION Innodb_os_log_written write incremental -8 $((1000 * mysql_update_every))
+CHART mysql_$m.innodb_os_log_io '' "mysql InnoDB OS Log Bandwidth" "kilobytes/s" mysql_$m mysql area 20018 $mysql_update_every
+DIMENSION Innodb_os_log_written write incremental -1 $((1000 * mysql_update_every))
 
 CHART mysql_$m.innodb_cur_row_lock '' "mysql InnoDB Current Row Locks" "operations" mysql_$m mysql area 20019 $mysql_update_every
-DIMENSION Innodb_row_lock_current_waits current_waits absolute 1 $((1 * mysql_update_every))
+DIMENSION Innodb_row_lock_current_waits current_waits absolute 1 1
 
 CHART mysql_$m.innodb_rows '' "mysql InnoDB Row Operations" "operations/s" mysql_$m mysql area 20020 $mysql_update_every
 DIMENSION Innodb_rows_read read incremental 1 $((1 * mysql_update_every))

diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
index 31de486cff5ea10c09d5e456863375c857046150..372197ee3a3a35d3c7b42cf4569367cec8dc4dba 100755 (executable)
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -54,41 +54,41 @@ DIMENSION usrloc_location_users location absolute 1 1
 DIMENSION usrloc_location_contacts contacts absolute 1 1
 DIMENSION usrloc_location_expires expires incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.registrar '' "OpenSIPS Registrar" "registrations / sec" opensips '' line 20003 $opensips_update_every
+CHART opensips.registrar '' "OpenSIPS Registrar" "registrations/s" opensips '' line 20003 $opensips_update_every
 DIMENSION registrar_accepted_regs accepted incremental 1 $((1 * opensips_update_every))
 DIMENSION registrar_rejected_regs rejected incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.transactions '' "OpenSIPS Transactions" "transactions / sec" opensips '' line 20004 $opensips_update_every
+CHART opensips.transactions '' "OpenSIPS Transactions" "transactions/s" opensips '' line 20004 $opensips_update_every
 DIMENSION tm_UAS_transactions UAS incremental 1 $((1 * opensips_update_every))
 DIMENSION tm_UAC_transactions UAC incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.core_rcv '' "OpenSIPS Core Receives" "queries / sec" opensips '' line 20005 $opensips_update_every
+CHART opensips.core_rcv '' "OpenSIPS Core Receives" "queries/s" opensips '' line 20005 $opensips_update_every
 DIMENSION core_rcv_requests requests incremental 1 $((1 * opensips_update_every))
 DIMENSION core_rcv_replies replies incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.core_fwd '' "OpenSIPS Core Forwards" "queries / sec" opensips '' line 20006 $opensips_update_every
+CHART opensips.core_fwd '' "OpenSIPS Core Forwards" "queries/s" opensips '' line 20006 $opensips_update_every
 DIMENSION core_fwd_requests requests incremental 1 $((1 * opensips_update_every))
 DIMENSION core_fwd_replies replies incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.core_drop '' "OpenSIPS Core Drops" "queries / sec" opensips '' line 20007 $opensips_update_every
+CHART opensips.core_drop '' "OpenSIPS Core Drops" "queries/s" opensips '' line 20007 $opensips_update_every
 DIMENSION core_drop_requests requests incremental 1 $((1 * opensips_update_every))
 DIMENSION core_drop_replies replies incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.core_err '' "OpenSIPS Core Errors" "queries / sec" opensips '' line 20008 $opensips_update_every
+CHART opensips.core_err '' "OpenSIPS Core Errors" "queries/s" opensips '' line 20008 $opensips_update_every
 DIMENSION core_err_requests requests incremental 1 $((1 * opensips_update_every))
 DIMENSION core_err_replies replies incremental -1 $((1 * opensips_update_every))
 
-CHART opensips.core_bad '' "OpenSIPS Core Bad" "queries / sec" opensips '' line 20009 $opensips_update_every
+CHART opensips.core_bad '' "OpenSIPS Core Bad" "queries/s" opensips '' line 20009 $opensips_update_every
 DIMENSION core_bad_URIs_rcvd bad_URIs_rcvd incremental 1 $((1 * opensips_update_every))
 DIMENSION core_unsupported_methods unsupported_methods incremental 1 $((1 * opensips_update_every))
 DIMENSION core_bad_msg_hdr bad_msg_hdr incremental 1 $((1 * opensips_update_every))
 
-CHART opensips.tm_replies '' "OpenSIPS TM Replies" "replies / sec" opensips '' line 20010 $opensips_update_every
+CHART opensips.tm_replies '' "OpenSIPS TM Replies" "replies/s" opensips '' line 20010 $opensips_update_every
 DIMENSION tm_received_replies received incremental 1 $((1 * opensips_update_every))
 DIMENSION tm_relayed_replies relayed incremental 1 $((1 * opensips_update_every))
 DIMENSION tm_local_replies local incremental 1 $((1 * opensips_update_every))
 
-CHART opensips.transactions_status '' "OpenSIPS Transactions Status" "transactions / sec" opensips '' line 20011 $opensips_update_every
+CHART opensips.transactions_status '' "OpenSIPS Transactions Status" "transactions/s" opensips '' line 20011 $opensips_update_every
 DIMENSION tm_2xx_transactions 2xx incremental 1 $((1 * opensips_update_every))
 DIMENSION tm_3xx_transactions 3xx incremental 1 $((1 * opensips_update_every))
 DIMENSION tm_4xx_transactions 4xx incremental 1 $((1 * opensips_update_every))
@@ -98,7 +98,7 @@ DIMENSION tm_6xx_transactions 6xx incremental 1 $((1 * opensips_update_every))
 CHART opensips.transactions_inuse '' "OpenSIPS InUse Transactions" "transactions" opensips '' line 20012 $opensips_update_every
 DIMENSION tm_inuse_transactions inuse absolute 1 1
 
-CHART opensips.sl_replies '' "OpenSIPS SL Replies" "replies / sec" opensips '' line 20013 $opensips_update_every
+CHART opensips.sl_replies '' "OpenSIPS SL Replies" "replies/s" opensips '' line 20013 $opensips_update_every
 DIMENSION sl_1xx_replies 1xx incremental 1 $((1 * opensips_update_every))
 DIMENSION sl_2xx_replies 2xx incremental 1 $((1 * opensips_update_every))
 DIMENSION sl_3xx_replies 3xx incremental 1 $((1 * opensips_update_every))
@@ -109,7 +109,7 @@ DIMENSION sl_sent_replies sent incremental 1 $((1 * opensips_update_every))
 DIMENSION sl_sent_err_replies error incremental 1 $((1 * opensips_update_every))
 DIMENSION sl_received_ACKs ACKed incremental 1 $((1 * opensips_update_every))
 
-CHART opensips.dialogs '' "OpenSIPS Dialogs" "dialogs / sec" opensips '' line 20014 $opensips_update_every
+CHART opensips.dialogs '' "OpenSIPS Dialogs" "dialogs/s" opensips '' line 20014 $opensips_update_every
 DIMENSION dialog_processed_dialogs processed incremental 1 $((1 * opensips_update_every))
 DIMENSION dialog_expired_dialogs expired incremental 1 $((1 * opensips_update_every))
 DIMENSION dialog_failed_dialogs failed incremental -1 $((1 * opensips_update_every))