From 8af93fce060f5a2e738a995e821289e9534a5464 Mon Sep 17 00:00:00 2001 From: dipohl Date: Tue, 21 Feb 2017 00:41:40 +0100 Subject: [PATCH] Category Tree: Reduce number of categories Don't use variable to set category, plugin gallery build script needs the pure string.. --- plugins/mysql/hs_read | 2 +- plugins/mysql/hs_write | 2 +- plugins/mysql/mysql-schema-size | 2 +- plugins/mysql/mysql-table-size | 2 +- plugins/mysql/mysql_aggregate_ | 6 +++--- plugins/mysql/mysql_connections | 2 +- plugins/mysql/mysql_connections_per_user | 2 +- plugins/mysql/mysql_qcache | 2 +- plugins/mysql/mysql_qcache_mem | 2 +- plugins/mysql/mysql_report | 4 +--- plugins/mysql/mysql_size_ | 2 +- plugins/mysql/mysql_size_all | 2 +- plugins/mysql/mysql_size_ondisk | 2 +- plugins/mysql/mysql_slave | 2 +- plugins/mysql/mysql_slave_threads | 2 +- plugins/percona/percona_ | 2 +- plugins/snmp/snmp__rms2_ | 2 +- 17 files changed, 19 insertions(+), 21 deletions(-) diff --git a/plugins/mysql/hs_read b/plugins/mysql/hs_read index 2468f056..ae3e093e 100644 --- a/plugins/mysql/hs_read +++ b/plugins/mysql/hs_read @@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then echo 'graph_title HS Read port connections' echo "graph_args --base 1000 -l 0" - echo 'graph_category mysql' + echo 'graph_category db' echo 'total.label Total' echo 'total.draw AREA' echo 'total.min 0' diff --git a/plugins/mysql/hs_write b/plugins/mysql/hs_write index 5442a4d4..6ab14b6f 100644 --- a/plugins/mysql/hs_write +++ b/plugins/mysql/hs_write @@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then echo 'graph_title HS Write port connections' echo "graph_args --base 1000 -l 0" - echo 'graph_category mysql' + echo 'graph_category db' echo 'total.label Total' echo 'total.draw AREA' echo 'total.min 0' diff --git a/plugins/mysql/mysql-schema-size b/plugins/mysql/mysql-schema-size index f25c9872..d1227479 100755 --- a/plugins/mysql/mysql-schema-size +++ b/plugins/mysql/mysql-schema-size @@ -28,7 +28,7 @@ while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { if($argc > 1 && $argv[1] == 'config') { $text = << 1 && $argv[1] == 'config') { $text = <<http://rodolphe.quiedeville.org/hack/munin/ '); diff --git a/plugins/mysql/mysql_qcache_mem b/plugins/mysql/mysql_qcache_mem index 0fe06c31..cd5ec1d2 100755 --- a/plugins/mysql/mysql_qcache_mem +++ b/plugins/mysql/mysql_qcache_mem @@ -92,7 +92,7 @@ sub print_config { print('graph_title MySQL Queries Cache Size graph_args --base 1024 -l 0 graph_vlabel bytes -graph_category mysql +graph_category db graph_order used free graph_total Total graph_info Plugin available at http://rodolphe.quiedeville.org/hack/munin/ diff --git a/plugins/mysql/mysql_report b/plugins/mysql/mysql_report index 8ae0e02c..e8bf94fa 100755 --- a/plugins/mysql/mysql_report +++ b/plugins/mysql/mysql_report @@ -54,7 +54,6 @@ mysqlbin=$(which mysql) default_errorvalue=30 default_title="Results from MySQL queries" -default_category="mysql" default_vlabel="value / sec" default_info="This graph shows results of one or more SQL queries." default_args="--base 1000 -l 0" @@ -77,7 +76,6 @@ fi [ -n "${errorvalue}" ] || errorvalue=${default_errorvalue} [ -n "${title}" ] || title="${default_title}" -[ -n "${category}" ] || category="${default_category}" [ -n "${vlabel}" ] || vlabel="${default_vlabel}" [ -n "${info}" ] || info="${default_info}" [ -n "${args}" ] || args="${default_args}" @@ -89,7 +87,7 @@ graph_title ${title} graph_args ${args} graph_scale ${scale} graph_vlabel ${vlabel} -graph_category ${category} +graph_category db graph_info ${info} EOH1 [ -n "${period}" ] && echo "graph_period ${period}" diff --git a/plugins/mysql/mysql_size_ b/plugins/mysql/mysql_size_ index 1199fcf9..1b96107f 100755 --- a/plugins/mysql/mysql_size_ +++ b/plugins/mysql/mysql_size_ @@ -115,7 +115,7 @@ sub print_config { print("graph_title MySQL database $db size\n"); print ('graph_args --base 1024 -l 0 graph_vlabel bytes -graph_category mysql +graph_category db graph_info Plugin available at http://rodolphe.quiedeville.org/hack/munin/ '); diff --git a/plugins/mysql/mysql_size_all b/plugins/mysql/mysql_size_all index e22645d2..c6f617b9 100755 --- a/plugins/mysql/mysql_size_all +++ b/plugins/mysql/mysql_size_all @@ -126,7 +126,7 @@ sub print_config { print("graph_title MySQL databases size\n"); print ('graph_args --base 1024 -l 0 graph_vlabel bytes -graph_category mysql +graph_category db graph_info Plugin available at http://rodolphe.quiedeville.org/hack/munin/ '); diff --git a/plugins/mysql/mysql_size_ondisk b/plugins/mysql/mysql_size_ondisk index c18b9a38..1045b04a 100755 --- a/plugins/mysql/mysql_size_ondisk +++ b/plugins/mysql/mysql_size_ondisk @@ -50,7 +50,7 @@ then elif [ "${1:-}" = "config" ] then echo "graph_title MySQL on-disk database size" - echo "graph_category mysql" + echo "graph_category db" # graph_info cannot have newlines - replace by
which will be rendered to newlines in # the web interface. echo "graph_info ${INFO//$'\n'/
}" diff --git a/plugins/mysql/mysql_slave b/plugins/mysql/mysql_slave index e4cef7e3..600ade22 100755 --- a/plugins/mysql/mysql_slave +++ b/plugins/mysql/mysql_slave @@ -79,7 +79,7 @@ sub print_config { print "graph_title MySQL Slave Status\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel Seconds\n"; - print "graph_category mysql\n"; + print "graph_category db\n"; print "seconds.label Seconds behind master\n"; print "seconds.min 0\n"; print "seconds.draw LINE2\n"; diff --git a/plugins/mysql/mysql_slave_threads b/plugins/mysql/mysql_slave_threads index abd9ac6b..f09f97af 100755 --- a/plugins/mysql/mysql_slave_threads +++ b/plugins/mysql/mysql_slave_threads @@ -28,7 +28,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') { print <{$mode}->{'title'}); # print "graph_args --base 1000\n"; - print("graph_category envsensor\n"); + print("graph_category sensors\n"); printf("graph_vlabel %s\n", $graphs->{$mode}->{'unit'}); unless (defined($graphs->{$mode}->{'thatype'})) { print("graph_info For contact sensors, the values mean: 1 = open, 2 = closed, 3 = armed, 4 = triggered\n");