Skip to content

Commit 62784f2

Browse files
feat: Introduces multi_bulk_walk_cmd to walk multiple OID trees simultaneously with independent lexicographic mode control per varbind.
1 parent 693f241 commit 62784f2

File tree

97 files changed

+2481
-503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2481
-503
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ Common labels
129129
value: {{ .Values.poller.maxOidToProcess | default "70" | quote }}
130130
- name: MAX_REPETITIONS
131131
value: {{ .Values.poller.maxRepetitions | default "10" | quote }}
132-
- name: MAX_SNMP_BULK_WALK_CONCURRENCY
133-
value: {{ .Values.poller.maxSnmpBulkWalkConcurrency | default "5" | quote }}
134132
- name: PYSNMP_DEBUG
135133
value: {{ .Values.pysnmpDebug | default "" | quote }}
136134
- name: PROFILES_RELOAD_DELAY

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,6 @@
368368
"maxRepetitions": {
369369
"type": "integer"
370370
},
371-
"maxSnmpBulkWalkConcurrency": {
372-
"type": "integer"
373-
},
374371
"usernameSecrets": {
375372
"type": "array"
376373
},

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,6 @@ poller:
252252
# If this number is too high it can cause issues with SNMP response especially for old SNMP devices.
253253
maxRepetitions: 10
254254

255-
# The maximum number of concurrent SNMP bulk walks (bulk_walk_cmd) that can be executed at the same time.
256-
# Setting this control determines the number of OIDsubtrees are walked in parallel and helps prevent overwhelming the target device or network.
257-
# Default is 5.
258-
maxSnmpBulkWalkConcurrency: 5
259-
260255
# list of kubernetes secrets name that will be used for polling
261256
# https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/poller-configuration/#define-usernamesecrets
262257
usernameSecrets: []

docker_compose/.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ WORKER_DISABLE_MONGO_DEBUG_LOGGING=true
5555
UDP_CONNECTION_TIMEOUT=3
5656
MAX_OID_TO_PROCESS=70
5757
MAX_REPETITIONS=10
58-
MAX_SNMP_BULK_WALK_CONCURRENCY=5
5958

6059
# Worker Poller
6160
WORKER_POLLER_CONCURRENCY=4

docker_compose/docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ x-workers_general_setup: &workers_general_setup
3838
UDP_CONNECTION_TIMEOUT: ${UDP_CONNECTION_TIMEOUT:-3}
3939
MAX_OID_TO_PROCESS: ${MAX_OID_TO_PROCESS:-70}
4040
MAX_REPETITIONS: ${MAX_REPETITIONS:-10}
41-
MAX_SNMP_BULK_WALK_CONCURRENCY: ${MAX_SNMP_BULK_WALK_CONCURRENCY:-5}
4241
PROFILES_RELOAD_DELAY: ${PROFILES_RELOAD_DELAY:-60}
4342

4443
x-ipv6: &ipv6

docs/dockercompose/6-env-file-configuration.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ Inside the directory with the docker compose files, there is a `.env`. Variables
7777
| `WORKER_LOG_LEVEL` | Logging level of the workers, possible options: DEBUG, INFO, WARNING, ERROR, CRITICAL, or FATAL |
7878
| `UDP_CONNECTION_TIMEOUT` | Timeout in seconds for SNMP operations |
7979
| `MAX_OID_TO_PROCESS` | Sometimes SNMP Agent cannot accept more than X OIDs per once, so if the error "TooBig" is visible in logs, decrease the number of MAX_OID_TO_PROCESS |
80-
| `MAX_SNMP_BULK_WALK_CONCURRENCY` | The maximum number of concurrent SNMP bulk walks (bulk_walk_cmd) that can be executed at the same time. Default is 5. Setting this control determines the number of OID subtrees are walked in parallel and helps prevent overwhelming the target device or network. |
81-
|
8280
| `MAX_REPETITIONS` | The amount of requested next oids in response for each of varbinds in one request sent |
8381

8482
### Worker Poller

docs/microk8s/configuration/poller-configuration.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,6 @@ When IPv6 is enabled and device is dual stack, the hostname resolution will try
4242
The log level for poller can be set by changing the value for the key `logLevel`. The allowed values are: `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL` or `FATAL`.
4343
The default value is `INFO`.
4444

45-
### Define maxSnmpBulkWalkConcurrency
46-
The maximum number of concurrent SNMP bulk walks (bulk_walk_cmd) that can be executed at the same time.
47-
Default is 5.
48-
49-
`maxSnmpBulkWalkConcurrency` Setting this control determines the number of OID subtrees are walked in parallel and helps prevent overwhelming the target device or network.
50-
51-
For example:
52-
53-
The configured variables:
54-
```yaml
55-
poller:
56-
maxSnmpBulkWalkConcurrency: 2
57-
```
58-
5945
### Define maxRepetitions
6046
The maxRepetitions is a parameter used in SNMP GetBulk call. It is responsible for controlling the
6147
amount of variables in one request.

rendered/manifests/tests/splunk-connect-for-snmp/templates/inventory/job.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ spec:
2828
env:
2929
- name: CONFIG_PATH
3030
value: /app/config/config.yaml
31-
- name: REDIS_URL
32-
value: redis://release-name-redis-master:6379/1
31+
- name: REDIS_HOST
32+
value: release-name-redis
33+
- name: REDIS_PORT
34+
value: "6379"
35+
- name: REDIS_DB
36+
value: "1"
37+
- name: CELERY_DB
38+
value: "0"
3339
- name: INVENTORY_PATH
3440
value: /app/inventory/inventory.csv
35-
- name: CELERY_BROKER_URL
36-
value: redis://release-name-redis-master:6379/0
3741
- name: MONGO_URI
3842
value: mongodb://release-name-mongodb:27017
3943
- name: MIB_SOURCES
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
# Source: splunk-connect-for-snmp/templates/redis/redis-config.yaml
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: release-name-redis-config
7+
namespace: default
8+
labels:
9+
app: release-name-redis
10+
data:
11+
redis.conf: |
12+
# Data directory
13+
dir /data
14+
15+
# Persistence - RDB
16+
save 900 1
17+
save 300 10
18+
save 60 10000
19+
20+
# Persistence - AOF
21+
appendonly yes
22+
appendfsync everysec
23+
24+
# Logging
25+
loglevel notice
26+
27+
# Memory
28+
maxmemory-policy noeviction
29+
30+
# Network
31+
bind 0.0.0.0
32+
protected-mode no
33+
port 6379
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
# Source: splunk-connect-for-snmp/templates/redis/redis-standalone-service.yaml
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: release-name-redis
7+
namespace: default
8+
spec:
9+
type: ClusterIP
10+
ports:
11+
- port: 6379
12+
targetPort: 6379
13+
name: redis
14+
selector:
15+
app: release-name-redis

0 commit comments

Comments
 (0)