Skip to content

Commit 91c7262

Browse files
ian28223claude
andcommitted
SNMP: improve Cisco ASAv memory coverage in cisco-firepower-asa profile
Replace hardcoded scalar OIDs targeting a single memory pool with a full table walk of cempMemPoolTable. Each pool is tagged with mem_pool_index and mem_pool_name via cempMemPoolName. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 7352f76 commit 91c7262

4 files changed

Lines changed: 24 additions & 12 deletions

File tree

snmp/changelog.d/24107.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix Cisco ASAv memory coverage in cisco-firepower-asa SNMP profile by replacing hardcoded single-pool scalar OIDs with a full table walk of cempMemPoolTable tagged by pool name.

snmp/datadog_checks/snmp/data/default_profiles/cisco-firepower-asa.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,21 @@ metrics:
3939
tag: cpu
4040
- MIB: CISCO-ENHANCED-MEMPOOL-MIB
4141
metric_type: gauge
42-
symbol:
43-
name: memory.used
44-
OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.18.1.1 # cempMemPoolHCUsed.1.1
45-
- MIB: CISCO-ENHANCED-MEMPOOL-MIB
46-
metric_type: gauge
47-
symbol:
48-
name: memory.free
49-
OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.20.1.1 # cempMemPoolHCFree.1.1
42+
table:
43+
OID: 1.3.6.1.4.1.9.9.221.1.1.1
44+
name: cempMemPoolTable
45+
symbols:
46+
- OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.18
47+
name: memory.used
48+
- OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.20
49+
name: memory.free
50+
metric_tags:
51+
- tag: mem_pool_name
52+
symbol:
53+
OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.3
54+
name: cempMemPoolName
55+
- tag: mem_pool_index
56+
index: 1
5057
- MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB
5158
symbol:
5259
OID: 1.3.6.1.4.1.9.9.392.1.4.1.2.0

snmp/tests/compose/data/cisco-firepower-asa.snmprec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
1.3.6.1.4.1.9.9.109.1.4.1.1.13.33481.29654.61594|70|4963720931156138597
245245
1.3.6.1.4.1.9.9.221.1.1.1.1.1.1.1|2|22
246246
1.3.6.1.4.1.9.9.221.1.1.1.1.2.1.1|2|12
247-
1.3.6.1.4.1.9.9.221.1.1.1.1.3.1.1|4x|717561696e746c79206275742062757420717561696e746c79207a6f6d626965732074686569722074686569722064726976696e67
247+
1.3.6.1.4.1.9.9.221.1.1.1.1.3.1.1|4x|53797374656d206d656d6f7279
248248
1.3.6.1.4.1.9.9.221.1.1.1.1.4.1.1|6|1.3.6.1.3.101.206.92
249249
1.3.6.1.4.1.9.9.221.1.1.1.1.5.1.1|2|7
250250
1.3.6.1.4.1.9.9.221.1.1.1.1.6.1.1|2|1

snmp/tests/test_e2e_core_profiles/test_profile_cisco_firepower_asa.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ def test_e2e_profile_cisco_firepower_asa(dd_agent_check):
4848
aggregator.assert_metric('snmp.crasNumSessions', metric_type=aggregator.GAUGE, tags=common_tags)
4949
aggregator.assert_metric('snmp.crasNumSetupFailInsufResources', metric_type=aggregator.COUNT, tags=common_tags)
5050
aggregator.assert_metric('snmp.crasNumUsers', metric_type=aggregator.GAUGE, tags=common_tags)
51-
aggregator.assert_metric('snmp.memory.free', metric_type=aggregator.GAUGE, tags=common_tags)
52-
aggregator.assert_metric('snmp.memory.usage', metric_type=aggregator.GAUGE, tags=common_tags)
53-
aggregator.assert_metric('snmp.memory.used', metric_type=aggregator.GAUGE, tags=common_tags)
51+
mem_tag_rows = [
52+
['mem_pool_index:1', 'mem_pool_name:System memory'],
53+
]
54+
for tag_row in mem_tag_rows:
55+
aggregator.assert_metric('snmp.memory.free', metric_type=aggregator.GAUGE, tags=common_tags + tag_row)
56+
aggregator.assert_metric('snmp.memory.used', metric_type=aggregator.GAUGE, tags=common_tags + tag_row)
57+
aggregator.assert_metric('snmp.memory.usage', metric_type=aggregator.GAUGE, tags=common_tags + tag_row)
5458
tag_rows = [
5559
['cpu:34646'],
5660
['cpu:7885'],

0 commit comments

Comments
 (0)