fix: make debug mode more configurable [run-int-tests]

Signed-off-by: Ilya Kheifets <[email protected]>
splunk · Sep 9, 2024 · 19e1ad3 · 19e1ad3
1 parent c05f38b
commit 19e1ad3
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 26 deletions.
diff --git a/charts/splunk-connect-for-snmp/templates/worker/_helpers.tpl b/charts/splunk-connect-for-snmp/templates/worker/_helpers.tpl
@@ -112,7 +112,7 @@ Common labels
 - name: MAX_OID_TO_PROCESS
   value: {{ .Values.poller.maxOidToProcess | default "70" | quote }}
 - name: PYSNMP_DEBUG
-  value: {{ .Values.pysnmpDebug | default "false" | quote }}
+  value: {{ .Values.pysnmpDebug | default "" | quote }}
 - name: PROFILES_RELOAD_DELAY
   value: {{ .Values.worker.profilesReloadDelay | default "60" | quote }}
 - name: MIB_SOURCES

diff --git a/charts/splunk-connect-for-snmp/values.schema.json b/charts/splunk-connect-for-snmp/values.schema.json
@@ -38,7 +38,7 @@
       "type": "array"
     },
     "pysnmpDebug": {
-      "type": "boolean"
+      "type": "string"
     },
     "UI": {
       "type": "object",

diff --git a/docker_compose/docker-compose-worker-poller.yaml b/docker_compose/docker-compose-worker-poller.yaml
@@ -42,7 +42,7 @@ services:
     - PROFILES_RELOAD_DELAY=${PROFILES_RELOAD_DELAY:-60}
     - WORKER_CONCURRENCY=${WORKER_POLLER_CONCURRENCY:-2}
     - PREFETCH_COUNT=${PREFETCH_POLLER_COUNT:-1}
-    - PYSNMP_DEBUG=${PYSNMP_DEBUG:-false}
+    - PYSNMP_DEBUG=${PYSNMP_DEBUG}
     image: ${SC4SNMP_IMAGE}:${SC4SNMP_TAG:-latest}
     networks:
       - my_network

diff --git a/docker_compose/docker-compose-worker-sender.yaml b/docker_compose/docker-compose-worker-sender.yaml
@@ -41,7 +41,7 @@ services:
       - PROFILES_RELOAD_DELAY=${PROFILES_RELOAD_DELAY:-60}
       - WORKER_CONCURRENCY=${WORKER_SENDER_CONCURRENCY:-2}
       - PREFETCH_COUNT=${PREFETCH_SENDER_COUNT:-1}
-      - PYSNMP_DEBUG=${PYSNMP_DEBUG:-false}
+      - PYSNMP_DEBUG=${PYSNMP_DEBUG}
     depends_on:
       - redis
       - mongo

diff --git a/docker_compose/docker-compose-worker-trap.yaml b/docker_compose/docker-compose-worker-trap.yaml
@@ -44,7 +44,7 @@ services:
       - RESOLVE_TRAP_ADDRESS=${RESOLVE_TRAP_ADDRESS:-false}
       - MAX_DNS_CACHE_SIZE_TRAPS=${MAX_DNS_CACHE_SIZE_TRAPS:-500}
       - TTL_DNS_CACHE_TRAPS=${TTL_DNS_CACHE_TRAPS:-1800}
-      - PYSNMP_DEBUG=${PYSNMP_DEBUG:-false}
+      - PYSNMP_DEBUG=${PYSNMP_DEBUG}
     depends_on:
       - redis
       - mongo

diff --git a/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/rendered/manifests/tests/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/...tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...s/tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/...s/tests_autoscaling_enabled/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...caling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/...caling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...caling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...caling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...oscaling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/...oscaling_enabled_deprecated/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/...manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...d/manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/...d/manifests/tests_enable_ui/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...ifests/tests_only_polling/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/...ifests/tests_only_polling/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...ifests/tests_only_polling/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...ifests/tests_only_polling/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...anifests/tests_only_traps/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...anifests/tests_only_traps/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/.../manifests/tests_only_traps/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/.../manifests/tests_only_traps/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...ests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml b/...ests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/poller/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...ests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml b/...ests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/sender/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/...ifests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml b/...ifests/tests_probes_enabled/splunk-connect-for-snmp/templates/worker/trap/deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MAX_OID_TO_PROCESS
               value: "70"
             - name: PYSNMP_DEBUG
-              value: "false"
+              value: ""
             - name: PROFILES_RELOAD_DELAY
               value: "60"
             - name: MIB_SOURCES

diff --git a/splunk_connect_for_snmp/snmp/manager.py b/splunk_connect_for_snmp/snmp/manager.py
@@ -63,7 +63,7 @@
 PROFILES_RELOAD_DELAY = int(os.getenv("PROFILES_RELOAD_DELAY", "60"))
 UDP_CONNECTION_TIMEOUT = int(os.getenv("UDP_CONNECTION_TIMEOUT", 3))
 MAX_OID_TO_PROCESS = int(os.getenv("MAX_OID_TO_PROCESS", 70))
-PYSNMP_DEBUG = human_bool(os.getenv("PYSNMP_DEBUG", False))
+PYSNMP_DEBUG = os.getenv("PYSNMP_DEBUG", "")
 
 DEFAULT_STANDARD_MIBS = [
     "HOST-RESOURCES-MIB",
@@ -78,7 +78,16 @@
 
 if PYSNMP_DEBUG:
     from pysnmp import debug
-    debug.setLogger(debug.Debug('all', options={'loggerName': logger}))
+
+    debug_flags = list(debug.flagMap.keys())
+    enabled_debug_flags = [
+        debug_flag.strip()
+        for debug_flag in PYSNMP_DEBUG.split(",")
+        if debug_flag.strip() in debug_flags
+    ]
+
+    if enabled_debug_flags:
+        debug.setLogger(debug.Debug(*enabled_debug_flags, loggerName=logger))
 
 
 def return_address_and_port(target):