fixed a bug in the incremental calculations where the exact duration (in nanoseconds) between incremental updates was not taken into account, so the values were always calculated using the pre-agreed update_every duration

6 files changed, 123 insertions, 123 deletions

diff --git a/charts.d/airsearches.chart.sh b/charts.d/airsearches.chart.sh
index c3ff22f399..449b14255a 100755
--- a/charts.d/airsearches.chart.sh
+++ b/charts.d/airsearches.chart.sh
@@ -57,7 +57,7 @@ airsearches_create() {
 	echo "CHART airsearches.affiliates '' 'Air Searches per affiliate' 'requests / min' airsearches '' stacked 20000 $airsearches_update_every"
 	for x in $airsearches_cmds
 	do
-		echo "DIMENSION $x '' incremental 60 $airsearches_update_every"
+		echo "DIMENSION $x '' incremental 60 1"
 	done
 
 	return 0
diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
index d0165ad331..879cbbddd3 100755
--- a/charts.d/cpu_apps.chart.sh
+++ b/charts.d/cpu_apps.chart.sh
@@ -34,7 +34,7 @@ cpu_apps_create() {
 	local x=
 	for x in $cpu_apps_apps
 	do
-		echo "DIMENSION $x $x incremental 1000 $((cpu_apps_clockticks * cpu_apps_update_every))"
+		echo "DIMENSION $x $x incremental 1000 $cpu_apps_clockticks"
 
 		# this string is needed later in the update() function
 		# to finalize the instructions for the bc command
diff --git a/charts.d/crsproxy.chart.sh b/charts.d/crsproxy.chart.sh
index f3f9c6df73..fc5358b436 100755
--- a/charts.d/crsproxy.chart.sh
+++ b/charts.d/crsproxy.chart.sh
@@ -54,18 +54,18 @@ DIMENSION web '' absolute 1 1
 DIMENSION native '' absolute 1 1
 DIMENSION virtual '' absolute 1 1
 CHART crsproxy.requests '' "CRS Proxy Requests Rate" "requests / min" crsproxy '' area 20001 $crsproxy_update_every
-DIMENSION web '' incremental 60 $crsproxy_update_every
-DIMENSION native '' incremental -60 $crsproxy_update_every
+DIMENSION web '' incremental 60 1
+DIMENSION native '' incremental -60 1
 CHART crsproxy.clients '' "CRS Proxy Clients Rate" "clients / min" crsproxy '' area 20010 $crsproxy_update_every
-DIMENSION web '' incremental 60 $crsproxy_update_every
-DIMENSION native '' incremental -60 $crsproxy_update_every
-DIMENSION virtual '' incremental 60 $crsproxy_update_every
+DIMENSION web '' incremental 60 1
+DIMENSION native '' incremental -60 1
+DIMENSION virtual '' incremental 60 1
 CHART crsproxy.replies '' "CRS Replies Rate" "replies / min" crsproxy '' area 20020 $crsproxy_update_every
-DIMENSION ok '' incremental 60 $crsproxy_update_every
-DIMENSION failed '' incremental -60 $crsproxy_update_every
+DIMENSION ok '' incremental 60 1
+DIMENSION failed '' incremental -60 1
 CHART crsproxy.bconnections '' "Back-End Connections Rate" "connections / min" crsproxy '' area 20030 $crsproxy_update_every
-DIMENSION ok '' incremental 60 $crsproxy_update_every
-DIMENSION failed '' incremental -60 $crsproxy_update_every
+DIMENSION ok '' incremental 60 1
+DIMENSION failed '' incremental -60 1
 EOF
 
 	local x=
diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
index ffd635ff8e..dda1e568b9 100755
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -164,76 +164,76 @@ mysql_create() {
 	do
 		cat <<EOF
 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))
+DIMENSION Bytes_received in incremental 8 1024
+DIMENSION Bytes_sent out incremental -8 1024
 
 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))
+DIMENSION Queries queries incremental 1 1
+DIMENSION Questions questions incremental 1 1
+DIMENSION Slow_queries slow_queries incremental -1 1
 
 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))
-DIMENSION Handler_read_first read_first incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_read_key read_key incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_read_next read_next incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_read_prev read_prev incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_read_rnd read_rnd incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_read_rnd_next read_rnd_next incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_rollback rollback incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_savepoint savepoint incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_savepoint_rollback savepoint_rollback incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_update update incremental 1 $((1 * mysql_update_every))
-DIMENSION Handler_write write incremental 1 $((1 * mysql_update_every))
+DIMENSION Handler_commit commit incremental 1 1
+DIMENSION Handler_delete delete incremental 1 1
+DIMENSION Handler_prepare prepare incremental 1 1
+DIMENSION Handler_read_first read_first incremental 1 1
+DIMENSION Handler_read_key read_key incremental 1 1
+DIMENSION Handler_read_next read_next incremental 1 1
+DIMENSION Handler_read_prev read_prev incremental 1 1
+DIMENSION Handler_read_rnd read_rnd incremental 1 1
+DIMENSION Handler_read_rnd_next read_rnd_next incremental 1 1
+DIMENSION Handler_rollback rollback incremental 1 1
+DIMENSION Handler_savepoint savepoint incremental 1 1
+DIMENSION Handler_savepoint_rollback savepoint_rollback incremental 1 1
+DIMENSION Handler_update update incremental 1 1
+DIMENSION Handler_write write incremental 1 1
 
 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))
+DIMENSION Table_locks_immediate immediate incremental 1 1
+DIMENSION Table_locks_waited waited incremental -1 1
 
 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))
+DIMENSION Select_full_join full_join incremental 1 1
+DIMENSION Select_full_range_join full_range_join incremental 1 1
+DIMENSION Select_range range incremental 1 1
+DIMENSION Select_range_check range_check incremental 1 1
+DIMENSION Select_scan scan incremental 1 1
 
 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))
+DIMENSION Sort_merge_passes merge_passes incremental 1 1
+DIMENSION Sort_range range incremental 1 1
+DIMENSION Sort_scan scan incremental 1 1
 
 CHART mysql_$m.tmp '' "mysql Tmp Operations" "counter" mysql_$m mysql line 20007 $mysql_update_every
-DIMENSION Created_tmp_disk_tables disk_tables incremental 1 $((1 * mysql_update_every))
-DIMENSION Created_tmp_files files incremental 1 $((1 * mysql_update_every))
-DIMENSION Created_tmp_tables tables incremental 1 $((1 * mysql_update_every))
+DIMENSION Created_tmp_disk_tables disk_tables incremental 1 1
+DIMENSION Created_tmp_files files incremental 1 1
+DIMENSION Created_tmp_tables tables incremental 1 1
 
 CHART mysql_$m.connections '' "mysql Connections" "connections/s" mysql_$m mysql line 20009 $mysql_update_every
-DIMENSION Connections all incremental 1 $((1 * mysql_update_every))
-DIMENSION Aborted_connects aborded incremental 1 $((1 * mysql_update_every))
+DIMENSION Connections all incremental 1 1
+DIMENSION Aborted_connects aborded incremental 1 1
 
 CHART mysql_$m.binlog_cache '' "mysql Binlog Cache" "transactions/s" mysql_$m mysql line 20010 $mysql_update_every
-DIMENSION Binlog_cache_disk_use disk incremental 1 $((1 * mysql_update_every))
-DIMENSION Binlog_cache_use all incremental 1 $((1 * mysql_update_every))
+DIMENSION Binlog_cache_disk_use disk incremental 1 1
+DIMENSION Binlog_cache_use all incremental 1 1
 
 CHART mysql_$m.threads '' "mysql Threads" "threads" mysql_$m mysql line 20012 $mysql_update_every
 DIMENSION Threads_connected connected absolute 1 1
-DIMENSION Threads_created created incremental 1 $((1 * mysql_update_every))
+DIMENSION Threads_created created incremental 1 1
 DIMENSION Threads_cached cached absolute -1 1
-DIMENSION Threads_running running absolute 1 $((1 * mysql_update_every))
+DIMENSION Threads_running running absolute 1 1
 
 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
 
 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))
+DIMENSION Innodb_data_read read incremental 1 1024
+DIMENSION Innodb_data_written write incremental -1 1024
 
 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))
-DIMENSION Innodb_data_writes writes incremental -1 $((1 * mysql_update_every))
-DIMENSION Innodb_data_fsyncs fsyncs incremental 1 $((1 * mysql_update_every))
+DIMENSION Innodb_data_reads reads incremental 1 1
+DIMENSION Innodb_data_writes writes incremental -1 1
+DIMENSION Innodb_data_fsyncs fsyncs incremental 1 1
 
 CHART mysql_$m.innodb_io_pending_ops '' "mysql InnoDB Pending I/O Operations" "operations/s" mysql_$m mysql line 20015 $mysql_update_every
 DIMENSION Innodb_data_pending_reads reads absolute 1 1
@@ -241,26 +241,26 @@ DIMENSION Innodb_data_pending_writes writes absolute -1 1
 DIMENSION Innodb_data_pending_fsyncs fsyncs absolute 1 1
 
 CHART mysql_$m.innodb_log '' "mysql InnoDB Log Operations" "operations/s" mysql_$m mysql line 20016 $mysql_update_every
-DIMENSION Innodb_log_waits waits incremental 1 $((1 * mysql_update_every))
-DIMENSION Innodb_log_write_requests write_requests incremental -1 $((1 * mysql_update_every))
-DIMENSION Innodb_log_writes writes incremental -1 $((1 * mysql_update_every))
+DIMENSION Innodb_log_waits waits incremental 1 1
+DIMENSION Innodb_log_write_requests write_requests incremental -1 1
+DIMENSION Innodb_log_writes writes incremental -1 1
 
 CHART mysql_$m.innodb_os_log '' "mysql InnoDB OS Log Operations" "operations/s" mysql_$m mysql line 20017 $mysql_update_every
-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))
+DIMENSION Innodb_os_log_fsyncs fsyncs incremental 1 1
+DIMENSION Innodb_os_log_pending_fsyncs pending_fsyncs incremental 1 1
+DIMENSION Innodb_os_log_pending_writes pending_writes incremental -1 1
 
 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))
+DIMENSION Innodb_os_log_written write incremental -1 1024
 
 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
 
 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))
-DIMENSION Innodb_rows_deleted deleted incremental -1 $((1 * mysql_update_every))
-DIMENSION Innodb_rows_inserted inserted incremental 1 $((1 * mysql_update_every))
-DIMENSION Innodb_rows_updated updated incremental -1 $((1 * mysql_update_every))
+DIMENSION Innodb_rows_read read incremental 1 1
+DIMENSION Innodb_rows_deleted deleted incremental -1 1
+DIMENSION Innodb_rows_inserted inserted incremental 1 1
+DIMENSION Innodb_rows_updated updated incremental -1 1
 
 EOF
 
@@ -268,8 +268,8 @@ EOF
 		then
 		cat <<EOF
 CHART mysql_$m.binlog_stmt_cache '' "mysql Binlog Statement Cache" "statements/s" mysql_$m mysql line 20011 $mysql_update_every
-DIMENSION Binlog_stmt_cache_disk_use disk incremental 1 $((1 * mysql_update_every))
-DIMENSION Binlog_stmt_cache_use all incremental 1 $((1 * mysql_update_every))
+DIMENSION Binlog_stmt_cache_disk_use disk incremental 1 1
+DIMENSION Binlog_stmt_cache_use all incremental 1 1
 EOF
 	fi
 
@@ -277,12 +277,12 @@ EOF
 		then
 		cat <<EOF
 CHART mysql_$m.connection_errors '' "mysql Connection Errors" "connections/s" mysql_$m mysql line 20008 $mysql_update_every
-DIMENSION Connection_errors_accept accept incremental 1 $((1 * mysql_update_every))
-DIMENSION Connection_errors_internal internal incremental 1 $((1 * mysql_update_every))
-DIMENSION Connection_errors_max_connections max incremental 1 $((1 * mysql_update_every))
-DIMENSION Connection_errors_peer_addr peer_addr incremental 1 $((1 * mysql_update_every))
-DIMENSION Connection_errors_select select incremental 1 $((1 * mysql_update_every))
-DIMENSION Connection_errors_tcpwrap tcpwrap incremental 1 $((1 * mysql_update_every))
+DIMENSION Connection_errors_accept accept incremental 1 1
+DIMENSION Connection_errors_internal internal incremental 1 1
+DIMENSION Connection_errors_max_connections max incremental 1 1
+DIMENSION Connection_errors_peer_addr peer_addr incremental 1 1
+DIMENSION Connection_errors_select select incremental 1 1
+DIMENSION Connection_errors_tcpwrap tcpwrap incremental 1 1
 EOF
 	fi
 
diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
index 372197ee3a..e6ae7a8a73 100755
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -52,79 +52,79 @@ CHART opensips.users '' "OpenSIPS Users" "users" opensips '' line 20002 $opensip
 DIMENSION usrloc_registered_users registered absolute 1 1
 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))
+DIMENSION usrloc_location_expires expires incremental -1 1
 
 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))
+DIMENSION registrar_accepted_regs accepted incremental 1 1
+DIMENSION registrar_rejected_regs rejected incremental -1 1
 
 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))
+DIMENSION tm_UAS_transactions UAS incremental 1 1
+DIMENSION tm_UAC_transactions UAC incremental -1 1
 
 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))
+DIMENSION core_rcv_requests requests incremental 1 1
+DIMENSION core_rcv_replies replies incremental -1 1
 
 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))
+DIMENSION core_fwd_requests requests incremental 1 1
+DIMENSION core_fwd_replies replies incremental -1 1
 
 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))
+DIMENSION core_drop_requests requests incremental 1 1
+DIMENSION core_drop_replies replies incremental -1 1
 
 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))
+DIMENSION core_err_requests requests incremental 1 1
+DIMENSION core_err_replies replies incremental -1 1
 
 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))
+DIMENSION core_bad_URIs_rcvd bad_URIs_rcvd incremental 1 1
+DIMENSION core_unsupported_methods unsupported_methods incremental 1 1
+DIMENSION core_bad_msg_hdr bad_msg_hdr incremental 1 1
 
 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))
+DIMENSION tm_received_replies received incremental 1 1
+DIMENSION tm_relayed_replies relayed incremental 1 1
+DIMENSION tm_local_replies local incremental 1 1
 
 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))
-DIMENSION tm_5xx_transactions 5xx incremental 1 $((1 * opensips_update_every))
-DIMENSION tm_6xx_transactions 6xx incremental 1 $((1 * opensips_update_every))
+DIMENSION tm_2xx_transactions 2xx incremental 1 1
+DIMENSION tm_3xx_transactions 3xx incremental 1 1
+DIMENSION tm_4xx_transactions 4xx incremental 1 1
+DIMENSION tm_5xx_transactions 5xx incremental 1 1
+DIMENSION tm_6xx_transactions 6xx incremental 1 1
 
 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/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))
-DIMENSION sl_4xx_replies 4xx incremental 1 $((1 * opensips_update_every))
-DIMENSION sl_5xx_replies 5xx incremental 1 $((1 * opensips_update_every))
-DIMENSION sl_6xx_replies 6xx incremental 1 $((1 * opensips_update_every))
-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))
+DIMENSION sl_1xx_replies 1xx incremental 1 1
+DIMENSION sl_2xx_replies 2xx incremental 1 1
+DIMENSION sl_3xx_replies 3xx incremental 1 1
+DIMENSION sl_4xx_replies 4xx incremental 1 1
+DIMENSION sl_5xx_replies 5xx incremental 1 1
+DIMENSION sl_6xx_replies 6xx incremental 1 1
+DIMENSION sl_sent_replies sent incremental 1 1
+DIMENSION sl_sent_err_replies error incremental 1 1
+DIMENSION sl_received_ACKs ACKed incremental 1 1
 
 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))
+DIMENSION dialog_processed_dialogs processed incremental 1 1
+DIMENSION dialog_expired_dialogs expired incremental 1 1
+DIMENSION dialog_failed_dialogs failed incremental -1 1
 
 CHART opensips.net_waiting '' "OpenSIPS Network Waiting" "kilobytes" opensips '' line 20015 $opensips_update_every
 DIMENSION net_waiting_udp UDP absolute 1 1024
 DIMENSION net_waiting_tcp TCP absolute 1 1024
 
 CHART opensips.uri_checks '' "OpenSIPS URI Checks" "checks / sec" opensips '' line 20016 $opensips_update_every
-DIMENSION uri_positive_checks positive incremental 1 $((1 * opensips_update_every))
-DIMENSION uri_negative_checks negative incremental -1 $((1 * opensips_update_every))
+DIMENSION uri_positive_checks positive incremental 1 1
+DIMENSION uri_negative_checks negative incremental -1 1
 
 CHART opensips.traces '' "OpenSIPS Traces" "traces / sec" opensips '' line 20017 $opensips_update_every
-DIMENSION siptrace_traced_requests requests incremental 1 $((1 * opensips_update_every))
-DIMENSION siptrace_traced_replies replies incremental -1 $((1 * opensips_update_every))
+DIMENSION siptrace_traced_requests requests incremental 1 1
+DIMENSION siptrace_traced_replies replies incremental -1 1
 
 CHART opensips.shmem '' "OpenSIPS Shared Memory" "kilobytes" opensips '' line 20018 $opensips_update_every
 DIMENSION shmem_total_size total absolute 1 1024
diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
index 55ece266ea..08a61ed754 100755
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -70,22 +70,22 @@ squid_create() {
 	# create the charts
 	cat <<EOF
 CHART squid.clients_net '' "Squid Client Bandwidth" "kilobits / sec" squid '' area 20001 $squid_update_every
-DIMENSION client_http_kbytes_in in incremental 8 $((1 * squid_update_every))
-DIMENSION client_http_kbytes_out out incremental -8 $((1 * squid_update_every))
-DIMENSION client_http_hit_kbytes_out hits incremental -8 $((1 * squid_update_every))
+DIMENSION client_http_kbytes_in in incremental 8 1
+DIMENSION client_http_kbytes_out out incremental -8 1
+DIMENSION client_http_hit_kbytes_out hits incremental -8 1
 
 CHART squid.clients_requests '' "Squid Client Requests" "requests / sec" squid '' line 20003 $squid_update_every
-DIMENSION client_http_requests requests incremental 1 $((1 * squid_update_every))
-DIMENSION client_http_hits hits incremental 1 $((1 * squid_update_every))
-DIMENSION client_http_errors errors incremental -1 $((1 * squid_update_every))
+DIMENSION client_http_requests requests incremental 1 1
+DIMENSION client_http_hits hits incremental 1 1
+DIMENSION client_http_errors errors incremental -1 1
 
 CHART squid.servers_net '' "Squid Server Bandwidth" "kilobits / sec" squid '' area 20002 $squid_update_every
-DIMENSION server_all_kbytes_in in incremental 8 $((1 * squid_update_every))
-DIMENSION server_all_kbytes_out out incremental -8 $((1 * squid_update_every))
+DIMENSION server_all_kbytes_in in incremental 8 1
+DIMENSION server_all_kbytes_out out incremental -8 1
 
 CHART squid.servers_requests '' "Squid Server Requests" "requests / sec" squid '' line 20004 $squid_update_every
-DIMENSION server_all_requests requests incremental 1 $((1 * squid_update_every))
-DIMENSION server_all_errors errors incremental -1 $((1 * squid_update_every))
+DIMENSION server_all_requests requests incremental 1 1
+DIMENSION server_all_errors errors incremental -1 1
 EOF
 	
 	return 0