From f523f095f9bdd8141a10138aa804a204d4f32c77 Mon Sep 17 00:00:00 2001 From: dipohl Date: Wed, 22 Feb 2017 19:44:59 +0100 Subject: [PATCH] Category Tree: Reduce number of categories netapp -> san --- plugins/{mail => mailman}/mailman-queue-check | 0 plugins/{mail => mailman}/mailman_subscribers | 0 plugins/{snmp => netapp}/snmp__netapp_cifs | 2 +- plugins/{snmp => netapp}/snmp__netapp_cifs2 | 2 +- plugins/{snmp => netapp}/snmp__netapp_cifscalls | 2 +- plugins/{snmp => netapp}/snmp__netapp_cpu | 2 +- plugins/{snmp => netapp}/snmp__netapp_cpu2 | 2 +- plugins/{snmp => netapp}/snmp__netapp_diskbusy | 2 +- plugins/{snmp => netapp}/snmp__netapp_diskusage2_ | 2 +- plugins/{snmp => netapp}/snmp__netapp_diskutil | 2 +- plugins/{snmp => netapp}/snmp__netapp_ndmp | 2 +- plugins/{snmp => netapp}/snmp__netapp_net | 2 +- plugins/{snmp => netapp}/snmp__netapp_nfs3calls | 2 +- plugins/{snmp => netapp}/snmp__netapp_ops | 2 +- plugins/{snmp => netapp}/snmp__netapp_reallocate | 2 +- plugins/{snmp => netapp}/snmp__netapp_sis | 2 +- plugins/{mail => postfix}/postgrey | 0 plugins/{mail => postfix}/postgrey-new | 0 18 files changed, 14 insertions(+), 14 deletions(-) rename plugins/{mail => mailman}/mailman-queue-check (100%) rename plugins/{mail => mailman}/mailman_subscribers (100%) rename plugins/{snmp => netapp}/snmp__netapp_cifs (98%) rename plugins/{snmp => netapp}/snmp__netapp_cifs2 (98%) rename plugins/{snmp => netapp}/snmp__netapp_cifscalls (98%) rename plugins/{snmp => netapp}/snmp__netapp_cpu (97%) rename plugins/{snmp => netapp}/snmp__netapp_cpu2 (99%) rename plugins/{snmp => netapp}/snmp__netapp_diskbusy (97%) rename plugins/{snmp => netapp}/snmp__netapp_diskusage2_ (98%) rename plugins/{snmp => netapp}/snmp__netapp_diskutil (97%) rename plugins/{snmp => netapp}/snmp__netapp_ndmp (98%) rename plugins/{snmp => netapp}/snmp__netapp_net (97%) rename plugins/{snmp => netapp}/snmp__netapp_nfs3calls (98%) rename plugins/{snmp => netapp}/snmp__netapp_ops (98%) rename plugins/{snmp => netapp}/snmp__netapp_reallocate (99%) rename plugins/{snmp => netapp}/snmp__netapp_sis (99%) rename plugins/{mail => postfix}/postgrey (100%) rename plugins/{mail => postfix}/postgrey-new (100%) diff --git a/plugins/mail/mailman-queue-check b/plugins/mailman/mailman-queue-check similarity index 100% rename from plugins/mail/mailman-queue-check rename to plugins/mailman/mailman-queue-check diff --git a/plugins/mail/mailman_subscribers b/plugins/mailman/mailman_subscribers similarity index 100% rename from plugins/mail/mailman_subscribers rename to plugins/mailman/mailman_subscribers diff --git a/plugins/snmp/snmp__netapp_cifs b/plugins/netapp/snmp__netapp_cifs similarity index 98% rename from plugins/snmp/snmp__netapp_cifs rename to plugins/netapp/snmp__netapp_cifs index f84ac53b..0b1eafc4 100755 --- a/plugins/snmp/snmp__netapp_cifs +++ b/plugins/netapp/snmp__netapp_cifs @@ -33,7 +33,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config": print 'graph_title CIFS usage on '+servername print 'graph_args --base 1000 -l 0' print 'graph_vlabel number' - print 'graph_category netapp' + print 'graph_category san' print 'graph_info This graph shows CIFS usage on '+servername print 'cifsConnectedUsers.label ConnectedUsers' diff --git a/plugins/snmp/snmp__netapp_cifs2 b/plugins/netapp/snmp__netapp_cifs2 similarity index 98% rename from plugins/snmp/snmp__netapp_cifs2 rename to plugins/netapp/snmp__netapp_cifs2 index 31686e53..52d52836 100755 --- a/plugins/snmp/snmp__netapp_cifs2 +++ b/plugins/netapp/snmp__netapp_cifs2 @@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host CIFS sessions\n"; print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel CIFS\n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_info This graph shows CIFS sessions status for the $host.\n"; print "graph_order "; foreach (sort keys %oids) diff --git a/plugins/snmp/snmp__netapp_cifscalls b/plugins/netapp/snmp__netapp_cifscalls similarity index 98% rename from plugins/snmp/snmp__netapp_cifscalls rename to plugins/netapp/snmp__netapp_cifscalls index 4ad9e97a..88860e95 100755 --- a/plugins/snmp/snmp__netapp_cifscalls +++ b/plugins/netapp/snmp__netapp_cifscalls @@ -91,7 +91,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host CIFS calls\n"; print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel calls / \${graph_period}\n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_info This graph shows cifs calls for the $host NetApp equipment.\n"; print "graph_order "; foreach (sort keys %oids) diff --git a/plugins/snmp/snmp__netapp_cpu b/plugins/netapp/snmp__netapp_cpu similarity index 97% rename from plugins/snmp/snmp__netapp_cpu rename to plugins/netapp/snmp__netapp_cpu index 11c7a438..e850a958 100755 --- a/plugins/snmp/snmp__netapp_cpu +++ b/plugins/netapp/snmp__netapp_cpu @@ -34,7 +34,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config": print 'graph_scale no' print 'graph_info This graph shows how CPU time is spent.' print 'graph_period second' - print 'graph_category netapp' + print 'graph_category san' print 'usage.label cpu_usage ' print 'usage.draw STACK' diff --git a/plugins/snmp/snmp__netapp_cpu2 b/plugins/netapp/snmp__netapp_cpu2 similarity index 99% rename from plugins/snmp/snmp__netapp_cpu2 rename to plugins/netapp/snmp__netapp_cpu2 index f7ab8c1d..d5855526 100755 --- a/plugins/snmp/snmp__netapp_cpu2 +++ b/plugins/netapp/snmp__netapp_cpu2 @@ -93,7 +93,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host CPU \n"; print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel CPU \n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_info This graph shows cpu busy value for the $host in percent.\n"; print "graph_order "; foreach (sort keys %oids) diff --git a/plugins/snmp/snmp__netapp_diskbusy b/plugins/netapp/snmp__netapp_diskbusy similarity index 97% rename from plugins/snmp/snmp__netapp_diskbusy rename to plugins/netapp/snmp__netapp_diskbusy index 9ecab19c..35a4b262 100755 --- a/plugins/snmp/snmp__netapp_diskbusy +++ b/plugins/netapp/snmp__netapp_diskbusy @@ -63,7 +63,7 @@ sub do_collect sub do_config_root { - # graph_category netapp # To show plugin in Gallery also in this category + # graph_category san # To show plugin in Gallery also in this category my ($host) = @_; diff --git a/plugins/snmp/snmp__netapp_diskusage2_ b/plugins/netapp/snmp__netapp_diskusage2_ similarity index 98% rename from plugins/snmp/snmp__netapp_diskusage2_ rename to plugins/netapp/snmp__netapp_diskusage2_ index 4f23daa0..4f76d021 100755 --- a/plugins/snmp/snmp__netapp_diskusage2_ +++ b/plugins/netapp/snmp__netapp_diskusage2_ @@ -135,7 +135,7 @@ sub do_config_vol } print "graph_args --base 1024 --lower-limit 0\n"; print "graph_vlabel bytes\n"; - # graph_category netapp # To show plugin in Gallery also in this category + # graph_category san # To show plugin in Gallery also in this category print "graph_category disk\n"; print "graph_order df64UsedKBytes df64SnapShotUsedKBytes df64SisSavedKBytes df64TotalKBytes df64SnapShotTotalKBytes df64TotalAndSnapTotalKBytes \n"; diff --git a/plugins/snmp/snmp__netapp_diskutil b/plugins/netapp/snmp__netapp_diskutil similarity index 97% rename from plugins/snmp/snmp__netapp_diskutil rename to plugins/netapp/snmp__netapp_diskutil index b05db9ef..f6a19c57 100755 --- a/plugins/snmp/snmp__netapp_diskutil +++ b/plugins/netapp/snmp__netapp_diskutil @@ -82,7 +82,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host Disk throughput\n"; print "graph_args --base 1024\n"; print "graph_vlabel Bytes/\${graph_period} write (-) / read (+)\n"; - # graph_category netapp # To show plugin in Gallery also in this category + # graph_category san # To show plugin in Gallery also in this category print "graph_category disk\n"; print "graph_info This graph shows DiskUtil calls for the $host NetApp equipment.\n"; print "graph_order misc64DiskWriteBytes misc64DiskReadBytes\n"; diff --git a/plugins/snmp/snmp__netapp_ndmp b/plugins/netapp/snmp__netapp_ndmp similarity index 98% rename from plugins/snmp/snmp__netapp_ndmp rename to plugins/netapp/snmp__netapp_ndmp index 2219b9e9..c8e2899f 100755 --- a/plugins/snmp/snmp__netapp_ndmp +++ b/plugins/netapp/snmp__netapp_ndmp @@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host NDMP \n"; print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel NDMP status\n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_info This graph shows NDMP status for the $host NetApp equipment.\n"; print "graph_order "; foreach (sort keys %oids) diff --git a/plugins/snmp/snmp__netapp_net b/plugins/netapp/snmp__netapp_net similarity index 97% rename from plugins/snmp/snmp__netapp_net rename to plugins/netapp/snmp__netapp_net index f380031c..b2ab602b 100755 --- a/plugins/snmp/snmp__netapp_net +++ b/plugins/netapp/snmp__netapp_net @@ -82,7 +82,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host Network interface traffic\n"; print "graph_args --base 1000\n"; print "graph_vlabel Bytes in (-) / out (+) per \${graph_period}\n"; - # graph_category netapp # To show plugin in Gallery also in this category + # graph_category san # To show plugin in Gallery also in this category print "graph_category network\n"; print "graph_info This graph shows net stats for the $host NetApp equipment.\n"; print "graph_order misc64NetRcvdBytes misc64NetSentBytes\n"; diff --git a/plugins/snmp/snmp__netapp_nfs3calls b/plugins/netapp/snmp__netapp_nfs3calls similarity index 98% rename from plugins/snmp/snmp__netapp_nfs3calls rename to plugins/netapp/snmp__netapp_nfs3calls index cf7eb142..ab897ae3 100755 --- a/plugins/snmp/snmp__netapp_nfs3calls +++ b/plugins/netapp/snmp__netapp_nfs3calls @@ -120,7 +120,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title $host NFSv3 calls\n"; print "graph_args --base 1000\n"; print "graph_vlabel calls / \${graph_period}\n"; - # graph_category netapp # To show plugin in Gallery also in this category + # graph_category san # To show plugin in Gallery also in this category print "graph_category nfs\n"; print "graph_info This graph shows NFSv3 calls for the $host NetApp equipment.\n"; print "graph_order "; diff --git a/plugins/snmp/snmp__netapp_ops b/plugins/netapp/snmp__netapp_ops similarity index 98% rename from plugins/snmp/snmp__netapp_ops rename to plugins/netapp/snmp__netapp_ops index b95bcee9..141bf6b0 100755 --- a/plugins/snmp/snmp__netapp_ops +++ b/plugins/netapp/snmp__netapp_ops @@ -85,7 +85,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title $host OPS \n"; print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel OPS \n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_info This graph shows OPS for the $host NetApp equipment.\n"; print "graph_order misc64CifsOps misc64NfsOps iscsi64Ops fcp64Ops misc64HttpOps\n"; foreach my $k (sort keys %config) diff --git a/plugins/snmp/snmp__netapp_reallocate b/plugins/netapp/snmp__netapp_reallocate similarity index 99% rename from plugins/snmp/snmp__netapp_reallocate rename to plugins/netapp/snmp__netapp_reallocate index e912f648..92b0780b 100755 --- a/plugins/snmp/snmp__netapp_reallocate +++ b/plugins/netapp/snmp__netapp_reallocate @@ -112,7 +112,7 @@ sub do_config_vol } print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel reallocate_status status\n"; - print "graph_category netapp\n"; + print "graph_category san\n"; foreach my $state ("reallocating", "redirecting", "quiesce", "debug") { print "$state.label $state\n"; diff --git a/plugins/snmp/snmp__netapp_sis b/plugins/netapp/snmp__netapp_sis similarity index 99% rename from plugins/snmp/snmp__netapp_sis rename to plugins/netapp/snmp__netapp_sis index 2c81f43d..4c0cf48b 100755 --- a/plugins/snmp/snmp__netapp_sis +++ b/plugins/netapp/snmp__netapp_sis @@ -110,7 +110,7 @@ sub do_config_vol } print "graph_args --base 1000 --lower-limit 0 --rigid\n"; print "graph_vlabel sis status\n"; - print "graph_category netapp\n"; + print "graph_category san\n"; print "graph_order sisInitialising sisRunning sisPending sisDebug\n"; foreach my $state ("debug", "initialising", "running", "pending") { diff --git a/plugins/mail/postgrey b/plugins/postfix/postgrey similarity index 100% rename from plugins/mail/postgrey rename to plugins/postfix/postgrey diff --git a/plugins/mail/postgrey-new b/plugins/postfix/postgrey-new similarity index 100% rename from plugins/mail/postgrey-new rename to plugins/postfix/postgrey-new