chore: updating integeration tests docker env[run-int-tests]

Author: cwadhwani-splunk

integration_tests/.env

@@ -35,6 +35,11 @@ SPLUNK_HEC_PATH=/services/collector
 SPLUNK_AGGREGATE_TRAPS_EVENTS=false
 IGNORE_EMPTY_VARBINDS=false
 
+# Discovery
+DISCOVERY_ENABLE=true
+DISCOVERY_LOG_LEVEL=INFO
+DISCOVERY_PATH=
+
 # Workers configration
 WALK_RETRY_MAX_INTERVAL=180
 WALK_MAX_RETRIES=5
@@ -75,6 +80,15 @@ WORKER_TRAP_MEMORY_LIMIT=500M
 WORKER_TRAP_CPU_RESERVATIONS=0.5
 WORKER_TRAP_MEMORY_RESERVATIONS=250M
 
+# Worker Discovery
+WORKER_DISCOVERY_CONCURRENCY=4
+PREFETCH_DISCOVERY_COUNT=30
+WORKER_DISCOVERY_REPLICAS=1
+WORKER_DISCOVERY_CPU_LIMIT=1
+WORKER_DISCOVERY_MEMORY_LIMIT=500M
+WORKER_DISCOVERY_CPU_RESERVATIONS=0.5
+WORKER_DISCOVERY_MEMORY_RESERVATIONS=250M
+
 # Inventory configuration
 INVENTORY_LOG_LEVEL=INFO
 CHAIN_OF_TASKS_EXPIRY_TIME=500

integration_tests/automatic_setup_compose.sh

@@ -105,6 +105,7 @@ SCHEDULER_CONFIG_FILE="scheduler-config.yaml"
 TRAPS_CONFIG_FILE="traps-config.yaml"
 INVENTORY_FILE="inventory-tests.csv"
 COREFILE="Corefile"
+DISCOVERY_FOLDER="discovery"
 
 # Get the absolute paths of the files
 SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH=$(realpath "$SCHEDULER_CONFIG_FILE")
@@ -113,6 +114,7 @@ INVENTORY_FILE_ABSOLUTE_PATH=$(realpath "$INVENTORY_FILE")
 COREFILE_ABS_PATH=$(realpath "$COREFILE")
 SPLUNK_HEC_HOST=$(hostname -I | cut -d " " -f1)
 SPLUNK_HEC_TOKEN=$(cat hec_token)
+DISCOVERY_PATH=$(realpath "$DISCOVERY_FOLDER")
 
 # Temporary file to store the updated .env content
 TEMP_ENV_FILE=".env.tmp"
@@ -122,6 +124,7 @@ awk -v scheduler_path="$SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH" \
     -v traps_path="$TRAPS_CONFIG_FILE_ABSOLUTE_PATH" \
     -v inventory_path="$INVENTORY_FILE_ABSOLUTE_PATH" \
     -v corefile_path="$COREFILE_ABS_PATH" \
+    -v discovery_path="$DISCOVERY_PATH" \
     -v splunk_hec_host="$SPLUNK_HEC_HOST" \
     -v splunk_hec_token="$SPLUNK_HEC_TOKEN" \
     '
@@ -130,6 +133,7 @@ awk -v scheduler_path="$SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH" \
         updated["TRAPS_CONFIG_FILE_ABSOLUTE_PATH"] = 0;
         updated["INVENTORY_FILE_ABSOLUTE_PATH"] = 0;
         updated["COREFILE_ABS_PATH"] = 0;
+        updated["DISCOVERY_PATH"] = 0;
         updated["SPLUNK_HEC_HOST"] = 0;
         updated["SPLUNK_HEC_TOKEN"] = 0;
     }
@@ -146,6 +150,9 @@ awk -v scheduler_path="$SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH" \
         } else if ($1 == "COREFILE_ABS_PATH=") {
             print "COREFILE_ABS_PATH=" corefile_path;
             updated["COREFILE_ABS_PATH"] = 1;
+        } else if ($1 == "DISCOVERY_PATH=") {
+            print "DISCOVERY_PATH=" discovery_path;
+            updated["DISCOVERY_PATH"] = 1;
         } else if ($1 == "SPLUNK_HEC_HOST=") {
             print "SPLUNK_HEC_HOST=" splunk_hec_host;
             updated["SPLUNK_HEC_HOST"] = 1;
@@ -169,6 +176,9 @@ awk -v scheduler_path="$SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH" \
         if (updated["COREFILE_ABS_PATH"] == 0) {
             print "COREFILE_ABS_PATH=" corefile_path;
         }
+        if (updated["DISCOVERY_PATH"] == 0) {
+            print "DISCOVERY_PATH=" discovery_path;
+        }
         if (updated["SPLUNK_HEC_HOST"] == 0) {
             print "SPLUNK_HEC_HOST=" splunk_hec_host;
         }

splunk_connect_for_snmp/discovery/discovery_manager.py

@@ -95,10 +95,8 @@ def discover_snmp_devices_details(
                         logger.info(
                             f"SNMP device found: {result}. Device is from discovery: {discovery_record.discovery_name}"
                         )
-                    else: 
-                        logger.info(
-                            f"SNMP not enabled on the device: {ip}"
-                        )
+                    else:
+                        logger.info(f"SNMP not enabled on the device: {ip}")
                 except Exception as e:
                     logger.error(
                         f"Snmp check for device {ip} generated an exception : {e}"