Merge branch '6338-snmpv3' into 'master'

allow multiple hosts per line in snmp.cfg

See merge request !71

check_snmp_data

@@ -186,7 +186,7 @@ $_methods
 
 CONFIG FILE:
     The config file can be multiline and has the syntax
-    [SNMPTARGET]:[auth parameters]
+    [SNMPTARGET[,target2]]:[auth parameters]
     The auth parameters set the version and all needed values to connect.
     Snmp v2 uses a community string.
     Snmp v3 is highly recommended (you should disable Snmp v2) and needs

check_snmp_includes

@@ -35,10 +35,14 @@ read_config(){
     SNMPAUTH="-v $SNMPVERSION -c $SNMPCOMMUNITY"
 
     if [ -r "$SNMPCONFIG" ]; then
-        if grep "^${SNMPTARGET}:" "$SNMPCONFIG" >/dev/null; then
-            SNMPAUTH="$( grep "^${SNMPTARGET}:" "$SNMPCONFIG" | cut -f 2- -d ':' )"
-        else
+        SNMPAUTH="$( grep -v "^#" "$SNMPCONFIG" | grep "^,*${SNMPTARGET}[,:]" | cut -f 2- -d ':' )"
+        if [ -z "$SNMPAUTH" ]; then
             SNMPAUTH="$( grep "^DEFAULT:" "$SNMPCONFIG" | cut -f 2- -d ':' )"
+            if [ -z "$SNMPAUTH" ]; then
+                ph.setStatus "unknown"
+                echo "ERROR: No authentication data were found for [${SNMPTARGET}] in config file [$SNMPCONFIG]."
+                ph.exit
+            fi
         fi
     else
         ph.setStatus "unknown"

check_snmp_synology

@@ -96,7 +96,7 @@ OPTIONS:
 
 CONFIG FILE:
     The config file can be multiline and has the syntax
-    [SNMPTARGET]:[auth parameters]
+    [SNMPTARGET[,target2]]:[auth parameters]
     The auth parameters set the version and all needed values to connect.
     Snmp v2 uses a community string.
     Snmp v3 is highly recommended (you should disable Snmp v2) and needs

inc_pluginfunctions

@@ -325,8 +325,8 @@ function ph.getFileAge(){
 function ph._getStorefile(){
         local varName=$1
 
-        local mydir="/tmp/icinga_counter_$( whoami )"
-        test -n "$dir_data" && mydir="${dir_data}/_counter_$( whoami )"
+        local mydir="/tmp/icinga_counter_${USER}"
+        test -n "$dir_data" && mydir="${dir_data}/_counter_${USER}"
         local _basename
         _basename=$(basename $0)