feat: release 1.12.0

.github/workflows/agreements.yaml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-workflow-agreements:
-    uses: splunk/addonfactory-github-workflows/.github/workflows/reusable-agreements.yaml@v1.5.1
+    uses: splunk/addonfactory-github-workflows/.github/workflows/reusable-agreements.yaml@v1.7.0
     permissions:
       actions: read
       contents: read

.github/workflows/cd-dashboard-release.yaml

@@ -0,0 +1,22 @@
+name: dashboard-release
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  dashboard-release:
+    name: Dashboard release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Upload dashboard to release assets
+        run: |
+          VERSION=$(echo $GITHUB_REF | cut -d / -f 3)
+          gh release upload $VERSION dashboard/dashboard.xml
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-main.yaml

@@ -71,6 +71,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
       - uses: pre-commit/[email protected]
   test-unit:
     name: Test Unit Python ${{ matrix.python-version }}

.github/workflows/mike.yaml

@@ -45,7 +45,7 @@ jobs:
           sudo apt install gnome-keyring
           BRANCH=$(echo $GITHUB_REF | cut -d / -f 3)
           echo $BRANCH
-          pip3 install poetry=="1.5.1"
+          curl -sSL https://install.python-poetry.org | python3 -
           poetry install
           poetry run pip install 'setuptools==65.6.3'
           poetry run mike deploy -p $BRANCH

.github/workflows/release-notes.yaml

@@ -10,6 +10,6 @@ jobs:
     permissions:
       contents: write
       packages: write
-    uses: splunk/addonfactory-github-workflows/.github/workflows/reusable-release-notes.yaml@v1.5.1
+    uses: splunk/addonfactory-github-workflows/.github/workflows/reusable-release-notes.yaml@v1.7.0
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -15,27 +15,28 @@
 #
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.6.0
     hooks:
     -   id: check-merge-conflict
     -   id: debug-statements
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v3.17.0
     hooks:
     -   id: pyupgrade
         args:
         - --py3-plus
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.8.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     -   id: isort
         args: ["--profile", "black"]
 -    repo: https://github.com/pre-commit/mirrors-mypy
-     rev: v0.931
+     rev: v1.11.2
      hooks:
      -  id: mypy
-        additional_dependencies: [types-all]
+        exclude: (^ui_tests|^test*|^docs)
+        additional_dependencies: [types-requests, types-PyYAML]

CHANGELOG.md

@@ -6,6 +6,15 @@
 
 ### Fixed
 
+## [1.12.0]
+
+### Changed
+- add metrics dashboard
+- add support for IPv6 polling and traps for kubernetes deployment
+- add support for IPv6 polling and traps for docker deployment
+- add nodeSelector and podAntiAffinity to sim chart
+- add support for new IP format in dashboard
+
 ## [1.11.0]
 
 ### Changed

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

@@ -4,9 +4,9 @@ dependencies:
   version: 13.18.5
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 19.6.2
+  version: 20.2.0
 - name: mibserver
   repository: https://pysnmp.github.io/mibs/charts/
-  version: 1.15.11
-digest: sha256:bf06c372ef537ce231d60cc88f571997c6be554e0a2ae0ead95d262183d6aabe
-generated: "2024-07-24T13:03:51.800592+02:00"
+  version: 1.15.13
+digest: sha256:dedfae30b39e9b78a83f8e1822666095f79ba2b9b112b04f7a11a2a318674713
+generated: "2024-10-14T10:28:52.408747265Z"

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

@@ -14,19 +14,19 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.11.0
+version: 1.12.0-beta.6
 # 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.11.0"
+appVersion: "1.12.0-beta.6"
 #
 dependencies:
   - name: mongodb
     version: ~13.18.0
     repository: https://charts.bitnami.com/bitnami
   - name: redis
-    version: ~19.6.0
+    version: ~20.2.0
     repository: https://charts.bitnami.com/bitnami
   - name: mibserver
     version: ~1.15

charts/splunk-connect-for-snmp/templates/sim/deployment.yaml

@@ -60,6 +60,29 @@ spec:
             - name: config
               mountPath: "/config"
               readOnly: true
+      {{- with .Values.sim.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if eq .Values.sim.podAntiAffinity "hard" }}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: "kubernetes.io/hostname"
+              labelSelector:
+                matchLabels:
+                    {{- include "splunk-connect-for-snmp.sim.selectorLabels" . | nindent 22 }}
+      {{- else if eq .Values.sim.podAntiAffinity "soft" }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchLabels:
+                    {{- include "splunk-connect-for-snmp.sim.selectorLabels" . | nindent 22 }}
+      {{- end }}
       volumes:
          - name: config
            configMap:

charts/splunk-connect-for-snmp/templates/traps/deployment.yaml

@@ -59,6 +59,8 @@ spec:
               value: "http://{{ printf "%s-%s" .Release.Name "mibserver" }}/standard.txt"
             - name: LOG_LEVEL
               value: {{ .Values.traps.logLevel | default "INFO" }}
+            - name: PYSNMP_DEBUG
+              value: {{ .Values.pysnmpDebug | default "" | quote }}
             {{- if .Values.splunk.protocol }}
             - name: SPLUNK_HEC_SCHEME
               value: {{ .Values.splunk.protocol | default "https" | quote }}
@@ -82,10 +84,21 @@ spec:
                   secretKeyRef:
                     name: {{ include "splunk-connect-for-snmp.name" . }}-splunk
                     key: hec_token
+            - name: IPv6_ENABLED
+              {{- if has "IPv6" .Values.traps.ipFamilies}}
+              value: "true"
+              {{ else }}
+              value: "false"
+              {{- end }}
           ports:
             - name: snmp-udp
               containerPort: 2162
               protocol: UDP
+            {{- if has "IPv6" .Values.traps.ipFamilies}}
+            - name: snmp-udp6
+              containerPort: 2163
+              protocol: UDP
+            {{- end }}
           volumeMounts:
             - name: config
               mountPath: "/app/config"

charts/splunk-connect-for-snmp/templates/traps/service.yaml

@@ -8,6 +8,7 @@ metadata:
   annotations:
   {{- if .Values.traps.service.usemetallb }}
     metallb.universe.tf/allow-shared-ip: {{ .Values.traps.service.metallbsharingkey | default "splunk-connect" | quote }}
+    metallb.universe.tf/loadBalancerIPs: {{ .Values.traps.loadBalancerIP }}
   {{- end }}
   {{- if .Values.traps.service.annotations }}
 {{ toYaml .Values.traps.service.annotations | indent 4 }}
@@ -20,7 +21,8 @@ spec:
   type: {{ .Values.traps.service.type }}
   externalTrafficPolicy: {{ .Values.traps.service.externalTrafficPolicy | default "Local" }}
   {{- if .Values.traps.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.traps.loadBalancerIP }}
+  ipFamilyPolicy: {{ .Values.traps.ipFamilyPolicy }}
+  ipFamilies: {{ .Values.traps.ipFamilies | toYaml | nindent 2 }}
   {{- end }}
   ports:
     - port: {{ .Values.traps.service.port }}
@@ -30,6 +32,15 @@ spec:
       targetPort: 2162
       protocol: UDP
       name: snmp-udp
+    {{- if has "IPv6" .Values.traps.ipFamilies}}
+    - port: {{ .Values.traps.service.ipv6Port | default 2163}}
+      {{- if and .Values.traps.service.nodePort (eq .Values.traps.service.type "NodePort")}}
+      nodePort: {{ .Values.traps.service.ipv6NodePort | default 30003 }}
+      {{- end }}
+      targetPort: 2163
+      protocol: UDP
+      name: snmp-udp6
+    {{- end }}
   selector:
     {{- include "splunk-connect-for-snmp.traps.selectorLabels" . | nindent 4 }}
 {{- end -}}

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

@@ -111,6 +111,8 @@ Common labels
   value: {{ .Values.worker.udpConnectionTimeout | default "3" | quote }}
 - name: MAX_OID_TO_PROCESS
   value: {{ .Values.poller.maxOidToProcess | default "70" | quote }}
+- name: PYSNMP_DEBUG
+  value: {{ .Values.pysnmpDebug | default "" | quote }}
 - name: PROFILES_RELOAD_DELAY
   value: {{ .Values.worker.profilesReloadDelay | default "60" | quote }}
 - name: MIB_SOURCES

charts/splunk-connect-for-snmp/values.schema.json

@@ -37,6 +37,9 @@
     "imagePullSecrets": {
       "type": "array"
     },
+    "pysnmpDebug": {
+      "type": "string"
+    },
     "UI": {
       "type": "object",
       "additionalProperties": false,
@@ -244,6 +247,15 @@
               "type": "boolean"
             }
           }
+        },
+        "podAnnotations": {
+          "type": "object"
+        },
+        "podAntiAffinity": {
+          "type": "string"
+        },
+        "nodeSelector": {
+          "type": "object"
         }
       }
     },
@@ -716,12 +728,24 @@
             },
             "nodePort": {
               "type": "integer"
+            },
+            "ipv6Port": {
+              "type": "integer"
+            },
+            "ipv6NodePort": {
+              "type": "integer"
             }
           }
         },
         "loadBalancerIP": {
           "type": "string"
         },
+        "ipFamilyPolicy": {
+          "type": "string"
+        },
+        "ipFamilies": {
+          "type": "array"
+        },
         "resources": {
           "type": "object",
           "additionalProperties": false,

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

@@ -126,6 +126,10 @@ sim:
   autoscaling:
     enabled: false
 
+  podAnnotations: { }
+  podAntiAffinity: soft
+  nodeSelector: { }
+
 ################################################################################
 # SC4SNMP components settings
 ################################################################################
@@ -425,13 +429,19 @@ traps:
     # on a multi-node it's better to set this as NodePort and configure traps.service.nodePort
     type: LoadBalancer
     port: 162
+   # ipv6Port: 2163
+
     # nodePort will be set only when type of service is a NodePort
     #nodePort: 30000
+    #ipv6NodePort: 30003
 
   #loadBalancerIP must be set to the IP address in the metallb pool.
   #It is required when service type is set to LoadBalancer.
   #loadBalancerIP: 18.117.100.37
   loadBalancerIP: ""
+  ipFamilyPolicy: SingleStack
+  ipFamilies:
+   - IPv4
 
   resources: {}
     # limits: