Update Cisco model metadata regex (#15908)

* Update Cisco model metadata regex * Fix test * Add example
DataDog · Sep 26, 2023 · 51cba57 · 51cba57
1 parent 725749c
commit 51cba57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/snmp/CHANGELOG.md b/snmp/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Remove unsupported metric in riverbed-interceptor.yaml ([#15678](https://github.com/DataDog/integrations-core/pull/15678))
 * Delete unnecessary extend for ubiquiti profiles ([#15643](https://github.com/DataDog/integrations-core/pull/15643))
 * Add comment for fanSpeedSensorStatus ([#15804](https://github.com/DataDog/integrations-core/pull/15804))
+* Update Cisco model metadata regex ([#15908](https://github.com/DataDog/integrations-core/pull/15908))
 
 ## 6.2.3 / 2023-09-13
 

diff --git a/snmp/datadog_checks/snmp/data/default_profiles/_cisco-metadata.yaml b/snmp/datadog_checks/snmp/data/default_profiles/_cisco-metadata.yaml
@@ -20,12 +20,13 @@ metadata:
         symbol:
           OID: 1.3.6.1.2.1.1.1.0
           name: sysDescr
-          extract_value: '\sSoftware\s+\(([-a-zA-Z0-9_]+)\)'
+          extract_value: '\sSoftware\s+\(([-a-zA-Z0-9_ ]+)\)'
           # Example:
           #   - Cisco IOS Software, IOS-XE Software, Catalyst L3 Switch Software (CAT3K_CAA-UNIVERSALK9-M), Version 03.06.06E RELEASE SOFTWARE (fc1) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Sat 17-Dec-
           #   - Cisco Internetwork Operating System Software ..IOS (tm) C2600 Software (C2600-I-M), Version 12.0(3)T3,  RELEASE SOFTWARE (fc1)..Copyright (c) 1986-1999 by cisco Systems, Inc...
           #   - Cisco NX-OS(tm) m9100, Software (m9100-s2ek9-mz), Version 4.1(1c), RELEASE SOFTWARE Copyright (c) 2002-2008 by Cisco Systems, Inc. Compiled 11/24/2008 18:00:00
           #   - Cisco IOS XR Software (Cisco ASR9K Series), Version 4.2.3[Default] Copyright (c) 2013 by Cisco Systems, Inc.
+          #   - Cisco NX-OS(tm) Nexus9000 C9364C, Software (NXOS 32-bit), Version 9.3(9), RELEASE SOFTWARE Copyright (c) 2002-2022 by Cisco Systems, Inc. Compiled 2/4/2022 7:00:00
           # Credit: Some examples are from: https://github.com/mtoshi/sysdescrparser/blob/master/samples/sample_data.json
 
       os_name:

diff --git a/snmp/tests/test_e2e_core_metadata.py b/snmp/tests/test_e2e_core_metadata.py
@@ -1088,6 +1088,7 @@ def test_e2e_core_metadata_cisco_asr_9001(dd_agent_check):
             u'snmp_device:' + device_ip,
         ],
         u'ip_address': device_ip,
+        u'model': 'Cisco ASR9K Series',
         u'os_name': u'IOSXR',
         u'profile': u'cisco-asr',
         u'status': 1,