diff --git a/snmp/changelog.d/24107.fixed b/snmp/changelog.d/24107.fixed new file mode 100644 index 0000000000000..796f9fcd6c148 --- /dev/null +++ b/snmp/changelog.d/24107.fixed @@ -0,0 +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. diff --git a/snmp/datadog_checks/snmp/data/default_profiles/cisco-firepower-asa.yaml b/snmp/datadog_checks/snmp/data/default_profiles/cisco-firepower-asa.yaml index 6f73cf9adbb32..18928b9250fa9 100644 --- a/snmp/datadog_checks/snmp/data/default_profiles/cisco-firepower-asa.yaml +++ b/snmp/datadog_checks/snmp/data/default_profiles/cisco-firepower-asa.yaml @@ -39,14 +39,21 @@ metrics: tag: cpu - MIB: CISCO-ENHANCED-MEMPOOL-MIB metric_type: gauge - symbol: - name: memory.used - OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.18.1.1 # cempMemPoolHCUsed.1.1 - - MIB: CISCO-ENHANCED-MEMPOOL-MIB - metric_type: gauge - symbol: - name: memory.free - OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.20.1.1 # cempMemPoolHCFree.1.1 + table: + OID: 1.3.6.1.4.1.9.9.221.1.1.1 + name: cempMemPoolTable + symbols: + - OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.18 + name: memory.used + - OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.20 + name: memory.free + metric_tags: + - tag: mem_pool_name + symbol: + OID: 1.3.6.1.4.1.9.9.221.1.1.1.1.3 + name: cempMemPoolName + - tag: mem_pool_index + index: 1 - MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB symbol: OID: 1.3.6.1.4.1.9.9.392.1.4.1.2.0 diff --git a/snmp/tests/compose/data/cisco-firepower-asa.snmprec b/snmp/tests/compose/data/cisco-firepower-asa.snmprec index f4e47f0d6dd4d..8f5966cf72e7b 100644 --- a/snmp/tests/compose/data/cisco-firepower-asa.snmprec +++ b/snmp/tests/compose/data/cisco-firepower-asa.snmprec @@ -244,7 +244,7 @@ 1.3.6.1.4.1.9.9.109.1.4.1.1.13.33481.29654.61594|70|4963720931156138597 1.3.6.1.4.1.9.9.221.1.1.1.1.1.1.1|2|22 1.3.6.1.4.1.9.9.221.1.1.1.1.2.1.1|2|12 -1.3.6.1.4.1.9.9.221.1.1.1.1.3.1.1|4x|717561696e746c79206275742062757420717561696e746c79207a6f6d626965732074686569722074686569722064726976696e67 +1.3.6.1.4.1.9.9.221.1.1.1.1.3.1.1|4x|53797374656d206d656d6f7279 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 1.3.6.1.4.1.9.9.221.1.1.1.1.5.1.1|2|7 1.3.6.1.4.1.9.9.221.1.1.1.1.6.1.1|2|1 diff --git a/snmp/tests/test_e2e_core_profiles/test_profile_cisco_firepower_asa.py b/snmp/tests/test_e2e_core_profiles/test_profile_cisco_firepower_asa.py index e2bab601fad83..9e943f107e750 100644 --- a/snmp/tests/test_e2e_core_profiles/test_profile_cisco_firepower_asa.py +++ b/snmp/tests/test_e2e_core_profiles/test_profile_cisco_firepower_asa.py @@ -48,9 +48,13 @@ def test_e2e_profile_cisco_firepower_asa(dd_agent_check): aggregator.assert_metric('snmp.crasNumSessions', metric_type=aggregator.GAUGE, tags=common_tags) aggregator.assert_metric('snmp.crasNumSetupFailInsufResources', metric_type=aggregator.COUNT, tags=common_tags) aggregator.assert_metric('snmp.crasNumUsers', metric_type=aggregator.GAUGE, tags=common_tags) - aggregator.assert_metric('snmp.memory.free', metric_type=aggregator.GAUGE, tags=common_tags) - aggregator.assert_metric('snmp.memory.usage', metric_type=aggregator.GAUGE, tags=common_tags) - aggregator.assert_metric('snmp.memory.used', metric_type=aggregator.GAUGE, tags=common_tags) + mem_tag_rows = [ + ['mem_pool_index:1', 'mem_pool_name:System memory'], + ] + for tag_row in mem_tag_rows: + aggregator.assert_metric('snmp.memory.free', metric_type=aggregator.GAUGE, tags=common_tags + tag_row) + aggregator.assert_metric('snmp.memory.used', metric_type=aggregator.GAUGE, tags=common_tags + tag_row) + aggregator.assert_metric('snmp.memory.usage', metric_type=aggregator.GAUGE, tags=common_tags + tag_row) tag_rows = [ ['cpu:34646'], ['cpu:7885'],