Changeset 295

Timestamp:

09/04/04 00:56:51 (8 years ago)

Author:

jimmyo

Message:

Added support for SNMP probing.

Files:

• trunk/ChangeLog (modified) (1 diff, 1 prop)
• trunk/Makefile (modified) (1 diff, 1 prop)
• trunk/node/munin-node-configure-snmp (deleted)
• trunk/node/munin-node-configure-snmp.in (added)
• trunk/node/munin-node-configure.in (modified) (5 diffs, 1 prop)
• trunk/node/node.d/snmp__df.in (modified) (2 diffs, 1 prop)
• trunk/node/node.d/snmp__load.in (modified) (2 diffs, 1 prop)
• trunk/node/node.d/snmp__processes.in (modified) (2 diffs, 1 prop)
• trunk/node/node.d/snmp__users.in (modified) (2 diffs, 1 prop)

trunk/ChangeLog

@@ -7 +7 @@
-  * Small layout improvements.
-  * Added new options "graph_height" and "graph_width", to beter control size.
+  * Added support for SNMP probing.
-  
-munin (1.1.3)

trunk/Makefile

@@ -65 +65 @@
-        $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
-        $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
+        $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
-        test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-        $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/

trunk/node/munin-node-configure.in

@@ -4 +4 @@
-#
-# $Log$
+# Revision 1.5  2004/09/03 22:56:51  jimmyo
+# Added support for SNMP probing.
+#
-# Revision 1.4  2004/01/29 19:25:52  jimmyo
-# Fixed bad debug output (forgotten linebreaks) in munin-node-configure (SF#882385).
@@ -57 +60 @@
-my @dfamilies  = ("auto");
-my @families   = ();
+my @snmp       = ();
+my $snmpver    = undef;
+my $snmpcomm   = undef;
-my $removes    = 0;
-my $do_usage   = 0;
@@ -64 +70 @@
-
-$do_error = 1 unless GetOptions (
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-);
-
@@ -120 +129 @@
-}
-
+if (@snmp and !$shell)
+{
+    print "Fatal: --snmp only supported along with --shell.\n";
+    exit 3;
+}
+
-if (!@families)
-{
@@ -271 +286 @@
-        }
-        
+    }
+}
+
+if (@snmp and $shell)
+{
+    if (-x "$bindir/munin-node-configure-snmp")
+    {
+        if (eval "require Net::SNMP;")
+        {
+            my @params;
+            push (@params, "$bindir/munin-node-configure-snmp");
+            push (@params, "--snmpversion", $snmpver) if defined $snmpver;
+            push (@params, "--community", $snmpcomm) if defined $snmpcomm;
+            push (@params, @snmp);
+            exec (@params);
+            # NOTREACHED
+        }
+        else
+        {
+            print STDERR "# ERROR: Cannot perform SNMP probe. SNMP operations require the perl module\n";
+            print STDERR "# Net::SNMP, which is currently not installed (or not in one of the following\n";
+            print STDERR "# directories: @INC\n";
+        }
+    }
+    else
+    {
+        print STDERR "# ERROR: Cannot perform SNMP probe. SNMP operations require the SNMP part\n";
+        print STDERR "# of Munin to be installed, which is currently not installed, or not in the \n";
+        print STDERR "# rigt directory: $bindir\n";
-    }
-}

trunk/node/node.d/snmp__df.in

@@ -2 +2 @@
-#
-# $Log$
+# Revision 1.2  2004/09/03 22:56:51  jimmyo
+# Added support for SNMP probing.
+#
-# Revision 1.1  2004/04/29 22:29:57  jimmyo
-# New SNMP plugin for disk usage.
@@ -122 +125 @@
-if (defined $ARGV[0] and $ARGV[0] eq "config")
-{
+        print "host_name $host\n";
-    print "graph_title Filesystem usage (in %)\n";
-    print "graph_args --upper-limit 100 -l 0\n";

trunk/node/node.d/snmp__load.in

@@ -2 +2 @@
-#
-# $Log$
+# Revision 1.2  2004/09/03 22:56:51  jimmyo
+# Added support for SNMP probing.
+#
-# Revision 1.1  2004/05/01 10:50:53  jimmyo
-# New SNMP plugins users and load.
@@ -75 +78 @@
-if (defined $ARGV[0] and $ARGV[0] eq "config")
-{
+        print "host_name $host\n";
-        print "graph_title Load average
-graph_args --base 1000 -l 0 

trunk/node/node.d/snmp__processes.in

@@ -2 +2 @@
-#
-# $Log$
+# Revision 1.2  2004/09/03 22:56:51  jimmyo
+# Added support for SNMP probing.
+#
-# Revision 1.1  2004/04/30 20:13:53  jimmyo
-# New SNMP plugin for number of procs.
@@ -72 +75 @@
-if (defined $ARGV[0] and $ARGV[0] eq "config")
-{
+        print "host_name $host\n";
-        print "graph_title Number of Processes
-graph_args --base 1000 -l 0 

trunk/node/node.d/snmp__users.in

@@ -2 +2 @@
-#
-# $Log$
+# Revision 1.2  2004/09/03 22:56:51  jimmyo
+# Added support for SNMP probing.
+#
-# Revision 1.1  2004/05/01 10:50:53  jimmyo
-# New SNMP plugins users and load.
@@ -75 +78 @@
-if (defined $ARGV[0] and $ARGV[0] eq "config")
-{
+        print "host_name $host\n";
-        print "graph_title Number of users
-graph_args --base 1000 -l 0