From a2170c363ba906a8ab2959ab3c1a84b009a6a69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 28 Aug 2012 17:07:36 -0700 Subject: [PATCH] netapp: move plugins within snmp folder as that's what they are. Fix them so that the renamed version works; these still don't use Munin::SNMP and somebody who has access to them might want to rename them. --- plugins/{netapp/netapp_cifs => snmp/snmp__netapp_cifs} | 2 +- plugins/{netapp/netapp_cpu_ => snmp/snmp__netapp_cpu} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename plugins/{netapp/netapp_cifs => snmp/snmp__netapp_cifs} (97%) rename plugins/{netapp/netapp_cpu_ => snmp/snmp__netapp_cpu} (97%) diff --git a/plugins/netapp/netapp_cifs b/plugins/snmp/snmp__netapp_cifs similarity index 97% rename from plugins/netapp/netapp_cifs rename to plugins/snmp/snmp__netapp_cifs index 792b12c8..31272469 100755 --- a/plugins/netapp/netapp_cifs +++ b/plugins/snmp/snmp__netapp_cifs @@ -23,7 +23,7 @@ def snmpget(iservername,isnmpid): return output.split()[3] # The interface number corresponds to vif1 on the tested netapp -servername = sys.argv[0].split('_')[2] +servername = sys.argv[0].split('_')[1] cifsConnectedUsers = '1.3.6.1.4.1.789.1.7.2.9.0' cifsNSessions = '1.3.6.1.4.1.789.1.7.2.12.0' cifsNOpenFiles = '1.3.6.1.4.1.789.1.7.2.13.0' diff --git a/plugins/netapp/netapp_cpu_ b/plugins/snmp/snmp__netapp_cpu similarity index 97% rename from plugins/netapp/netapp_cpu_ rename to plugins/snmp/snmp__netapp_cpu index 5abb4059..11c7a438 100755 --- a/plugins/netapp/netapp_cpu_ +++ b/plugins/snmp/snmp__netapp_cpu @@ -25,7 +25,7 @@ def snmpget(iservername,isnmpid): snmpid = "1.3.6.1.4.1.789.1.2.1.3.0" warning = 80 critical = 95 -servername = sys.argv[0].split('_')[2] +servername = sys.argv[0].split('_')[1] if len(sys.argv) == 2 and sys.argv[1] == "config": print 'graph_title CPU usage on', servername