added $Id$ RCS string and added @HOST_DEFAULTS to list of possible params

diff --git a/src/lib/Spong/Network/plugins/check_interfaces b/src/lib/Spong/Network/plugins/check_interfaces
index fe18a788c0e65f91511a842b91b1cba1adb0a8f5..ebebdca145b2838f491e6b56935e2c6e25dd73a8 100644 (file)
--- a/src/lib/Spong/Network/plugins/check_interfaces
+++ b/src/lib/Spong/Network/plugins/check_interfaces
@@ -10,6 +10,8 @@ on a host by polling via SNMP. It reports any interfaces that are
 administratively up but operationally not up.
 
 =cut
+#
+# $Id: check_interfaces,v 1.5 2000/11/29 17:12:49 sljohnson Exp $ 
 
 # Register the routine with the plugin registry
 $PLUGINS{'interfaces'} = \&check_interfaces;
@@ -27,7 +29,9 @@ sub check_interfaces {
        my ($host ) = @_;
        my ($color, $summary, $message ) = ( "green", "", "" );
        my  $snmp_session;
-       my ($snmp_community) = $HOSTS{$host}->{'snmp_community'} || 'public';
+       my ($snmp_community) = $HOSTS{$host}->{'snmp_community'} ||
+                               $HOSTS_DEFAULTS{'snmp_community'} ||
+                               'public';
 
        $snmp_session = SNMP_Session->open ($host, $snmp_community, 161);
 

diff --git a/src/lib/Spong/Network/plugins/check_snmp b/src/lib/Spong/Network/plugins/check_snmp
index db1187240ac4ea13ed49492d062b9a738af9b14c..bf9c40d4028805b5b00e94a2df73f58110e70586 100644 (file)
--- a/src/lib/Spong/Network/plugins/check_snmp
+++ b/src/lib/Spong/Network/plugins/check_snmp
@@ -16,6 +16,8 @@ value retrieved in the snmpget operation. If the values don't agree, a
 critical (red) status is reported
 
 =cut
+#
+# $Id: check_snmp,v 1.5 2000/11/29 17:12:49 sljohnson Exp $
 
 # Register the routine with the plugin registry
 $PLUGINS{'snmp'} = \&check_snmp;
@@ -32,8 +34,15 @@ sub check_snmp {
        my ($host ) = @_;
        my ($color, $summary, $message ) = ( "green", "", "" );
        my  $snmp_session;
-       my ($community) = $HOSTS{$host}->{'snmp_community'} || 'public';
-       my ($expect) = $HOSTS{$host}->{'expect_oid'};
+
+        # Find the community name to use
+       my ($community) = $HOSTS{$host}->{'snmp_community'} ||
+                          $HOSTS_DEFAULTS{'snmp_community'} ||
+                          'public';
+
+        # Find an expect oid to find
+       my ($expect) = $HOSTS{$host}->{'expect_oid'} ||
+                       $HOSTS_DEFAULTS{'expect_oid'};
    
        $snmp_session = SNMP_Session->open ($host, $community, 161);