Merge branch 'main' into develop

splunk · Dec 17, 2021 · 398f3ae · 398f3ae
2 parents 0fde096 + 6a7ddfe
commit 398f3ae
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/charts/splunk-connect-for-snmp/Chart.yaml b/charts/splunk-connect-for-snmp/Chart.yaml
@@ -14,12 +14,12 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.0.4-beta.1
+version: 1.0.5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.4-beta.1"
+appVersion: "1.0.5"
 #
 dependencies:
   - name: mongodb

diff --git a/charts/splunk-connect-for-snmp/templates/worker/deployment.yaml b/charts/splunk-connect-for-snmp/templates/worker/deployment.yaml
@@ -48,6 +48,8 @@ spec:
               value: {{ include "splunk-connect-for-snmp.mongo_uri" . }}
             - name: LOG_LEVEL
               value: {{ .Values.worker.logLevel | default "INFO" }}
+            - name: UDP_CONNECTION_TIMEOUT
+              value: {{ .Values.worker.udpConnectionTimeout | default "1" | quote }}
             - name: MIB_SOURCES
               value: "http://{{ printf "%s-%s" .Release.Name "mibserver" }}/asn1/@mib@"
             - name: MIB_INDEX

diff --git a/docs/gettingstarted/sc4snmp-installation.md b/docs/gettingstarted/sc4snmp-installation.md
@@ -45,6 +45,8 @@ traps:
 worker:
   # replicas: Number of replicas for worker container should two or more
   #replicaCount: 2
+  # udpConnectionTimeout: timeout in seconds for SNMP operations
+  #udpConnectionTimeout: 5
   logLevel: "DEBUG"
 scheduler:
   logLevel: "INFO"

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splunk-connect-for-snmp"
-version = "1.0.4-beta.1"
+version = "1.0.5"
 description = ""
 authors = ["rfaircloth-splunk <[email protected]>"]
 license = "Apache-2.0"

diff --git a/splunk_connect_for_snmp/__init__.py b/splunk_connect_for_snmp/__init__.py
@@ -15,5 +15,4 @@
 #
 
 
-__version__ = "1.0.4-beta.1"
-
+__version__ = "1.0.5"
diff --git a/splunk_connect_for_snmp/snmp/auth.py b/splunk_connect_for_snmp/snmp/auth.py
@@ -34,6 +34,8 @@
 from splunk_connect_for_snmp.snmp.const import AuthProtocolMap, PrivProtocolMap
 from splunk_connect_for_snmp.snmp.exceptions import SnmpActionError
 
+UDP_CONNECTION_TIMEOUT = int(os.getenv("UDP_CONNECTION_TIMEOUT", 1))
+
 
 def getSecretValue(
     location: str, key: str, default: str = None, required: bool = False
@@ -55,7 +57,7 @@ def getSecretValue(
 def getSecurityEngineId(logger, ir: InventoryRecord, snmpEngine: SnmpEngine):
     observerContext = {}
 
-    transportTarget = UdpTransportTarget((ir.address, ir.port))
+    transportTarget = UdpTransportTarget((ir.address, ir.port), timeout=UDP_CONNECTION_TIMEOUT)
 
     # Register a callback to be invoked at specified execution point of
     # SNMP Engine and passed local variables at execution point's local scope

diff --git a/splunk_connect_for_snmp/snmp/manager.py b/splunk_connect_for_snmp/snmp/manager.py
@@ -49,6 +49,7 @@
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB = os.getenv("MONGO_DB", "sc4snmp")
 CONFIG_PATH = os.getenv("CONFIG_PATH", "/app/config/config.yaml")
+UDP_CONNECTION_TIMEOUT = int(os.getenv("UDP_CONNECTION_TIMEOUT", 1))
 
 logger = get_task_logger(__name__)
 
@@ -238,7 +239,7 @@ def dowork(self, address: str, walk: bool = False, profiles: List[str] = None):
         authData = GetAuth(logger, ir, self.snmpEngine)
         contextData = getContextData(logger, ir)
 
-        transport = UdpTransportTarget((ir.address, ir.port))
+        transport = UdpTransportTarget((ir.address, ir.port), timeout=UDP_CONNECTION_TIMEOUT)
 
         metrics = {}
         retry = False
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,4 @@
		#


		__version__ = "1.0.4-beta.1"

		__version__ = "1.0.5"