fix IEC units in bash modules (#5049)
Paweł Krupa committed
Dec 31, 2018 at 10:53 UTC
31dc2e9761ab404b13655aa174cff726dc63d03a
2 files changed
+6
-6
collectors/charts.d.plugin/mysql/mysql.chart.sh
+2
-2
@@ -221,7 +221,7 @@ DIMENSION Innodb_buffer_pool_pages_flushed flushed incremental -1 1
221
DIMENSION Innodb_buffer_pool_pages_misc misc absolute -1 1
222
DIMENSION Innodb_buffer_pool_pages_total total absolute 1 1
223
224
-CHART mysql_$x.innodb_buffer_pool_bytes '' "mysql InnoDB Buffer Pool Bytes" "MB" innodb mysql.innodb_buffer_pool_bytes area $((mysql_priority + 21)) $mysql_update_every
224
+CHART mysql_$x.innodb_buffer_pool_bytes '' "mysql InnoDB Buffer Pool Bytes" "MiB" innodb mysql.innodb_buffer_pool_bytes area $((mysql_priority + 21)) $mysql_update_every
225
DIMENSION Innodb_buffer_pool_bytes_data data absolute 1 $((1024 * 1024))
226
DIMENSION Innodb_buffer_pool_bytes_dirty dirty absolute -1 $((1024 * 1024))
227
@@ -247,7 +247,7 @@ DIMENSION Qcache_not_cached 'not cached' incremental -1 1
247
CHART mysql_$x.qcache '' "mysql QCache Queries in Cache" "queries" qcache mysql.qcache line $((mysql_priority + 26)) $mysql_update_every
248
DIMENSION Qcache_queries_in_cache queries absolute 1 1
249
250
-CHART mysql_$x.qcache_freemem '' "mysql QCache Free Memory" "MB" qcache mysql.qcache_freemem area $((mysql_priority + 27)) $mysql_update_every
250
+CHART mysql_$x.qcache_freemem '' "mysql QCache Free Memory" "MiB" qcache mysql.qcache_freemem area $((mysql_priority + 27)) $mysql_update_every
251
DIMENSION Qcache_free_memory free absolute 1 $((1024 * 1024))
252
253
CHART mysql_$x.qcache_memblocks '' "mysql QCache Memory Blocks" "blocks" qcache mysql.qcache_memblocks line $((mysql_priority + 28)) $mysql_update_every
collectors/charts.d.plugin/tomcat/tomcat.chart.sh
+4
-4
@@ -32,8 +32,8 @@ tomcat_priority=60000
32
# will be in the proper units
33
tomcat_decimal_detail=1000000
34
35
-# used by volume chart to convert bytes to KB
36
-tomcat_decimal_KB_detail=1000
35
+# used by volume chart to convert bytes to kB
36
+tomcat_decimal_kB_detail=1000
37
38
tomcat_check() {
39
@@ -109,8 +109,8 @@ tomcat_create() {
109
cat <<EOF
110
CHART tomcat.accesses '' "tomcat requests" "requests/s" statistics tomcat.accesses area $((tomcat_priority + 8)) $tomcat_update_every
111
DIMENSION accesses '' incremental
112
-CHART tomcat.volume '' "tomcat volume" "KB/s" volume tomcat.volume area $((tomcat_priority + 5)) $tomcat_update_every
113
-DIMENSION volume '' incremental divisor ${tomcat_decimal_KB_detail}
112
+CHART tomcat.volume '' "tomcat volume" "kB/s" volume tomcat.volume area $((tomcat_priority + 5)) $tomcat_update_every
113
+DIMENSION volume '' incremental divisor ${tomcat_decimal_kB_detail}
114
CHART tomcat.threads '' "tomcat threads" "current threads" statistics tomcat.threads line $((tomcat_priority + 6)) $tomcat_update_every
115
DIMENSION current '' absolute 1
116
DIMENSION busy '' absolute 1