From 6ffd50195cc29e452f9dee971f119d14b4d28091 Mon Sep 17 00:00:00 2001 From: Gabriele Pohl Date: Sun, 7 Sep 2014 02:03:45 +0200 Subject: [PATCH] Reduce number of categories, use more generic terms --- plugins/bind9/bind9_rr | 2 +- plugins/boinc/boinc_processes | 1 + plugins/disk/xfs | 2 +- plugins/disk/xfs_frag | 2 +- plugins/dxtv/hadoop-under_replicated-blocks | 2 +- plugins/ftp/pure-ftpd-bw | 2 +- plugins/ftp/pure-ftpd-logs | 2 +- plugins/ftp/pureftpd_traffic | 2 +- plugins/google/google-rank | 2 +- plugins/mail/postfwd2 | 2 +- plugins/mysql/mysql-schema-size | 2 +- plugins/mysql/mysql-table-size | 2 +- plugins/printer/xerox-wc3220 | 2 +- plugins/printer/xerox-wc7232-consumables | 2 +- plugins/snmp/snmp__netapp_ops | 2 +- plugins/virtualization/vmware/esxi | 4 ++-- plugins/yacy/yacy | 2 +- plugins/zfs/zfs-filesystem-graph | 2 +- plugins/zfs/zfs-stats-for-freebsd-arc-efficiency | 4 ++-- plugins/zfs/zfs-stats-for-freebsd-arc-utilization | 2 +- plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list | 2 +- plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type | 4 ++-- plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch | 4 ++-- plugins/zfs/zfs_stats_ | 2 +- plugins/zfs/zfs_usage_ | 2 +- plugins/zfs/zlist | 2 +- plugins/zfs/zpool_iostat | 2 +- 27 files changed, 31 insertions(+), 30 deletions(-) diff --git a/plugins/bind9/bind9_rr b/plugins/bind9/bind9_rr index 2d028ca7..1e29be03 100755 --- a/plugins/bind9/bind9_rr +++ b/plugins/bind9/bind9_rr @@ -108,7 +108,7 @@ sub do_config { my $k; print "graph_title DNS Queries by RR -graph_category BIND +graph_category dns graph_vlabel Queries / \${graph_period} "; get_state; diff --git a/plugins/boinc/boinc_processes b/plugins/boinc/boinc_processes index 09aa635d..61854b57 100755 --- a/plugins/boinc/boinc_processes +++ b/plugins/boinc/boinc_processes @@ -98,6 +98,7 @@ sub config { while (chomp($reply = <$client>) && ($reply ne "")) { if ($reply =~ /(.*)<\/domain_name>/) { print "graph_title BOINC task progress [$1]\n"; + print "graph_category boinc\n"; print "graph_args -l 0\n"; print "graph_vlabel %\n"; } diff --git a/plugins/disk/xfs b/plugins/disk/xfs index f555645a..94a7cb53 100755 --- a/plugins/disk/xfs +++ b/plugins/disk/xfs @@ -99,7 +99,7 @@ foreach my $func ( keys %config ) { print "graph_title $config{$func}->{title}\n"; print "graph_args --base 1000\n"; print "graph_vlabel $config{$func}->{vtitle}\n"; - print "graph_category XFS\n"; + print "graph_category filesystem\n"; my $iter = 0; foreach my $param (@{$config{$func}->{params}}) { print "$param.type DERIVE\n"; diff --git a/plugins/disk/xfs_frag b/plugins/disk/xfs_frag index 7218934a..8c67ac4c 100755 --- a/plugins/disk/xfs_frag +++ b/plugins/disk/xfs_frag @@ -40,7 +40,7 @@ case $1 in cat <<'EOF' graph_title XFS fragmentation graph_vlabel Percent -graph_category disk +graph_category filesystem EOF cat /etc/mtab | awk '{print $2 " " $3}' | while read LINE do diff --git a/plugins/dxtv/hadoop-under_replicated-blocks b/plugins/dxtv/hadoop-under_replicated-blocks index 630f136f..2e313423 100755 --- a/plugins/dxtv/hadoop-under_replicated-blocks +++ b/plugins/dxtv/hadoop-under_replicated-blocks @@ -8,7 +8,7 @@ case $1 in config) cat <<'EOM' graph_title Under Replicated Blocks Hadoop -graph_category Dxtv +graph_category hadoop graph_vlabel block block.label block EOM diff --git a/plugins/ftp/pure-ftpd-bw b/plugins/ftp/pure-ftpd-bw index ce58dfbe..e9a6c42b 100755 --- a/plugins/ftp/pure-ftpd-bw +++ b/plugins/ftp/pure-ftpd-bw @@ -54,7 +54,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Pure Ftpd Bandwidth' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Datas sent / received' - echo 'graph_category pure-ftpd' + echo 'graph_category ftp' echo 'dl.label Bytes downloaded' echo 'ul.label Bytes uploaded' exit 0 diff --git a/plugins/ftp/pure-ftpd-logs b/plugins/ftp/pure-ftpd-logs index 91758014..e4d9f881 100755 --- a/plugins/ftp/pure-ftpd-logs +++ b/plugins/ftp/pure-ftpd-logs @@ -44,7 +44,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Pure Ftpd Logs' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Connections number' - echo 'graph_category pure-ftp' + echo 'graph_category ftp' echo 'nc.label new connection' echo 'al.label anonymous logged' echo 'ul.label auth user logged' diff --git a/plugins/ftp/pureftpd_traffic b/plugins/ftp/pureftpd_traffic index 8eda5225..f2eacc09 100755 --- a/plugins/ftp/pureftpd_traffic +++ b/plugins/ftp/pureftpd_traffic @@ -23,7 +23,7 @@ if ($ARGV[0] eq "test") { if ($ARGV[0] eq "config") { $out.="graph_title pureftpd traffic -graph_category PureFTPd +graph_category ftp graph_info This graph shows pureftpd traffic. graph_vlabel Bytes get.label Get diff --git a/plugins/google/google-rank b/plugins/google/google-rank index 4db99f6d..b8a0f2fb 100755 --- a/plugins/google/google-rank +++ b/plugins/google/google-rank @@ -55,7 +55,7 @@ if [ "$1" = "config" ]; then iLoop=1 echo 'graph_title Google page rank' echo 'graph_args --upper-limit 100 -l 0' - echo 'graph_category other' + echo 'graph_category google' echo 'graph_scale no' echo 'graph_info Google page rank for URLs & Words' diff --git a/plugins/mail/postfwd2 b/plugins/mail/postfwd2 index de9844aa..1c0405f4 100755 --- a/plugins/mail/postfwd2 +++ b/plugins/mail/postfwd2 @@ -214,7 +214,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) { print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n"; print 'graph_width 600', "\n"; print 'graph_args --lower-limit 0 ', $args, "\n"; - print 'graph_category others', "\n"; + print 'graph_category other', "\n"; print $label, '.label ', $graphs{$key}->{series}->{$label}->{label}, "\n"; print $label, '.draw LINE', "\n"; print $label, '.type GAUGE', "\n"; diff --git a/plugins/mysql/mysql-schema-size b/plugins/mysql/mysql-schema-size index 08caaca9..f25c9872 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 = <<{$action} graph_info $titles->{$action} -graph_category YaCy +graph_category search EOF if ($action =~ /network_(peers|documents)/) { print <{$fs}}) { diff --git a/plugins/zfs/zlist b/plugins/zfs/zlist index 5fa76d71..3892f683 100755 --- a/plugins/zfs/zlist +++ b/plugins/zfs/zlist @@ -4,7 +4,7 @@ if [ "$1" = "config" ]; then echo 'graph_title zpool list' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel zpool list' - echo 'graph_category zfs' + echo 'graph_category filesystem' echo 'graph_scale no' echo 'graph_info This graph shows zpool list on the server.' zlist=`/sbin/zpool list -H|awk '{print $1}'` diff --git a/plugins/zfs/zpool_iostat b/plugins/zfs/zpool_iostat index c019d86c..51c606e6 100755 --- a/plugins/zfs/zpool_iostat +++ b/plugins/zfs/zpool_iostat @@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then echo 'graph_title zpool iostat' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel write - read KBytes/s' - echo 'graph_category zfs' + echo 'graph_category filesystem' echo 'graph_scale no' echo 'graph_info This graph shows zpool iostat' echo 'graph_order '$zorder