Merge branch 'develop' of github.com:splunk/splunk-connect-for-snmp into feat/autodiscovery

Author: cwadhwani-splunk

CHANGELOG.md

@@ -2,14 +2,34 @@
 
 ## Unreleased
 
+### Changed
+- **Redis Migration**: Replaced Bitnami Redis chart with custom Kubernetes manifests
+  - Updated to official Redis image version 8.2.2 (addresses security vulnerabilities)
+  - Added authentication support (password or Kubernetes Secret)
+  - Implemented automatic data migration from Bitnami deployments (PVC reuse)
+  - Enabled AOF persistence by default for data durability
+- add CounterBasedGauge64 and ZeroBasedCounter64 as metrics types
+- add SNMP-enabled device discovery feature
+
+### Fixes
+- fix problem with service rendering when `traps.service.usemetallb` is set to false
+
+## [1.14.1]
+- update mongodb volumePermission image repository to `bitnamileagcy`
+
+## [1.14.0]
+- change bulkWalk `nonRepeater` to 0 and allow user to set `MAX_REPETITIONS` to achieve better polling performance
+- update bitnami image repository to `bitnamileagcy`
+
+## [1.13.0]
+
 ### Changed
 - implemented mTLS for Splunk 10
 - update default microk8s to 1.33
 - introduce `splunkMetricNameHyphenToUnderscore` parameter to make metric names follow Splunk schema
 - change default walk to get only SNMPv2-MIB
 - add `disableMongoDebugLogging` parameter to disable extensive pymnogo logs while `logLevel` is set to `DEBUG`
 - add `includeSecurityContextId` parameter to control whether to add the `context_engine_id` field to v3 trap events
-- added SNMP-enabled device discovery feature
 
 ### Fixed
 - fix text SNMP values with numbers and 'E' being interpreted as scientific notation

Dockerfile

@@ -11,7 +11,7 @@ WORKDIR /app
 
 FROM base AS builder
 RUN pip install --upgrade pip ;\
-    pip install poetry 
+    pip install poetry
 
 COPY poetry.lock pyproject.toml /app/
 COPY splunk_connect_for_snmp /app/splunk_connect_for_snmp

charts/splunk-connect-for-snmp/Chart.lock

@@ -2,11 +2,8 @@ dependencies:
 - name: mongodb
   repository: https://charts.bitnami.com/bitnami
   version: 15.6.26
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 20.2.2
 - name: mibserver
   repository: https://pysnmp.github.io/mibs/charts/
   version: 1.15.25
-digest: sha256:b7c83eee7395cbc67d21833ab21da52d1d43481c798e52d0a9a7f0a7c3fe05b4
-generated: "2025-08-13T13:56:57.099109+02:00"
+digest: sha256:747fcedec83bf0d80600166a021b35436d8d2ea877b60e9a43044ed2140cf1c5
+generated: "2025-10-13T12:15:04.255986+02:00"

charts/splunk-connect-for-snmp/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: splunk-connect-for-snmp
-description: A Helm chart for SNMP Connect for SNMP
+description: A Helm chart for Splunk Connect for SNMP
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -14,20 +14,17 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.13.0-beta.9
+version: 1.14.2-beta.4
 # 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.13.0-beta.9"
+appVersion: "1.14.2-beta.4"
 #
 dependencies:
   - name: mongodb
     version: ~15.6.0
     repository: https://charts.bitnami.com/bitnami
-  - name: redis
-    version: ~20.2.0
-    repository: https://charts.bitnami.com/bitnami
   - name: mibserver
     version: ~1.15
     repository: https://pysnmp.github.io/mibs/charts/

charts/splunk-connect-for-snmp/templates/NOTES.txt

@@ -1,3 +1,3 @@
 Default walk no longer calls full oid tree, instead it is collecting only 'SNMPv2-MIB'.
 If you want to call full oid for the devices, you have to set enableFullWalk flag to true.
-If the discovery feature is enabled, the time required may increase depending on the number of devices in the specified subnet.
+If the discovery feature is enabled, the time required may increase depending on the number of devices in the specified subnet.

charts/splunk-connect-for-snmp/templates/_helpers.tpl

@@ -14,22 +14,6 @@
 {{- end }}
 {{- end }}
 
-{{- define "splunk-connect-for-snmp.celery_url" -}}
-{{- if and ( eq .Values.redis.architecture "replication" ) .Values.redis.sentinel.enabled  }}
-{{- printf "redis://%s-redis:6379/0" .Release.Name }}
-{{- else }}
-{{- printf "redis://%s-redis-master:6379/0" .Release.Name }}
-{{- end }}
-{{- end }}
-
-{{- define "splunk-connect-for-snmp.redis_url" -}}
-{{- if and ( eq .Values.redis.architecture "replication" ) .Values.redis.sentinel.enabled  }}
-{{- printf "redis://%s-redis:6379/1" .Release.Name }}
-{{- else }}
-{{- printf "redis://%s-redis-master:6379/1" .Release.Name }}
-{{- end }}
-{{- end }}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -94,7 +78,7 @@ Create the name of the service account to use
 Whether enable traps
 */}}
 {{- define "splunk-connect-for-snmp.traps.enable" -}}
-{{- if or (and (eq .Values.traps.service.type "LoadBalancer") .Values.traps.loadBalancerIP ) (and (eq .Values.traps.service.type "NodePort") .Values.traps.service.nodePort) }}
+{{- if or (and (eq .Values.traps.service.type "LoadBalancer") .Values.traps.loadBalancerIP ) (and (eq .Values.traps.service.type "NodePort") .Values.traps.service.nodePort ) ( not .Values.traps.service.usemetallb) }}
 {{- printf "true" }}
 {{- else }}
 {{- printf "false" }}

charts/splunk-connect-for-snmp/templates/inventory/job.yaml

@@ -30,12 +30,28 @@ spec:
           env:
           - name: CONFIG_PATH
             value: /app/config/config.yaml
-          - name: REDIS_URL
-            value: {{ include "splunk-connect-for-snmp.redis_url" . }}
+        {{- if .Values.redis.auth.enabled }}
+          - name: REDIS_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                {{- if .Values.redis.auth.existingSecret }}
+                name: {{ .Values.redis.auth.existingSecret }}
+                key: {{ .Values.redis.auth.existingSecretPasswordKey | default "password" }}
+                {{- else }}
+                name: {{ .Release.Name }}-redis-secret
+                key: password
+                {{- end }}
+          {{- end }}
+          - name: REDIS_HOST
+            value: {{ .Release.Name }}-redis
+          - name: REDIS_PORT
+            value: "6379"
+          - name: REDIS_DB
+            value: "1"
+          - name: CELERY_DB
+            value: "0"
           - name: INVENTORY_PATH
             value: /app/inventory/inventory.csv
-          - name: CELERY_BROKER_URL
-            value: {{ include "splunk-connect-for-snmp.celery_url" . }}
           - name: MONGO_URI
             value: {{ include "splunk-connect-for-snmp.mongo_uri" . }}
           - name: MIB_SOURCES

charts/splunk-connect-for-snmp/templates/mongodb-6.0-upgrade-job.yaml

@@ -15,7 +15,11 @@ spec:
     spec:
       containers:
         - name: mongo-fcv-check
-          image: {{ .Values.mongodb.image.repository }}:{{ .Values.mongodb.image.tag }}
+          image:  {{- if .Values.mongodb.image.registry }}
+                    {{ .Values.mongodb.image.registry }}/{{ .Values.mongodb.image.repository }}:{{ .Values.mongodb.image.tag }}
+                  {{- else }}
+                    {{ .Values.mongodb.image.repository }}:{{ .Values.mongodb.image.tag }}
+                  {{- end }}
           command:
             - /bin/bash
             - -c

charts/splunk-connect-for-snmp/templates/redis/redis-config.yaml

@@ -0,0 +1,37 @@
+{{- if eq .Values.redis.architecture "standalone" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-redis-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-redis
+data:
+  redis.conf: |
+    # Data directory
+    dir /data
+
+    # Persistence - RDB
+    save 900 1
+    save 300 10
+    save 60 10000
+
+    # Persistence - AOF
+    {{- if .Values.redis.persistence.aof.enabled }}
+    appendonly yes
+    appendfsync {{ .Values.redis.persistence.aof.fsync }}
+    {{- else }}
+    appendonly no
+    {{- end }}
+
+    # Logging
+    loglevel notice
+
+    # Memory
+    maxmemory-policy noeviction
+
+    # Network
+    bind 0.0.0.0
+    protected-mode no
+    port 6379
+{{- end }}

charts/splunk-connect-for-snmp/templates/redis/redis-secret.yaml

@@ -0,0 +1,10 @@
+{{- if and .Values.redis.auth.enabled (not .Values.redis.auth.existingSecret) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-redis-secret
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  password: {{ .Values.redis.auth.password | b64enc }}
+{{- end }}