[snmp] Add Cisco Catalyst 1200 and 1300/1300X profiles (serial via ENTITY-MIB .67109120)#23929
[snmp] Add Cisco Catalyst 1200 and 1300/1300X profiles (serial via ENTITY-MIB .67109120)#23929FlorianVeaux wants to merge 2 commits into
Conversation
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f9ea026c16
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| @@ -0,0 +1,64 @@ | |||
| # Cisco Catalyst 1200 Series Smart Switches | |||
There was a problem hiding this comment.
Add a changelog entry for the Catalyst profiles
This commit adds shipped default profiles under datadog_checks/snmp, but the only changelog entry in the diff describes an unrelated Aruba ClearPass metric-type change. Per the repository instructions, shipped Agent changes need a matching changelog entry, so the Catalyst 1200/1300 support would be released without release notes while carrying an unrelated breaking-change note under this PR number.
Useful? React with 👍 / 👎.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
f825af6 to
0cd648d
Compare
Validation Report
Run Passed validations (20)
|
What does this PR do?
Adds two new SNMP profiles for Cisco's SMB-OS Catalyst switches and sources their
serial_numberfrom the chassis entry inENTITY-MIB:cisco-catalyst-1200.yaml— Catalyst 1200 Series (ciscoProducts3210–3225)cisco-catalyst-1300.yaml— Catalyst 1300 / 1300X Series (ciscoProducts3226–3253and3410–3417)These devices run the Cisco SMB switch OS (the same firmware family as
cisco-sb/ CBS / SG-SF), not IOS/IOS-XE, so the profiles are modeled oncisco-sb.yaml(extend_base+_generic-if, vendorcisco, CISCOSB CPU metric). On that OS the chassis serial and software rev live at the fixedENTITY-MIBindexentPhysicalSerialNum.67109120/entPhysicalSoftwareRev.67109120(documented by Cisco), which is what these profiles read.sysObjectIDs are the named
ciscoC1200*/ciscoC1300*/ciscoC1300X*assignments from the officialcisco/cisco-mibsv2/CISCO-PRODUCTS-MIB.my. They are listed explicitly (no9.1.*wildcard) because1.3.6.1.4.1.9.1.*is shared with mainstream IOS-XE Catalysts that must not match these profiles; the genericciscoprofile keeps its9.1.*wildcard and our more-specific OIDs win, so there is no sysObjectID conflict.Testing
cisco-catalyst-1200.snmprec/cisco-catalyst-1300.snmprec.test_e2e_core_metadata_cisco_catalyst_1200/_1300, asserting the fullnetwork_devices_metadatapayload (profile match,serial_numberfrom.67109120,version,vendor: cisco,device_type: switch). Both pass locally..snmprecfixtures (sort -V | uniq) so thedatadog/docker-library:snmpcontainer passes its boot-time sort check and the SNMP e2e suite can start.Motivation
Customer escalation AGENT-15682: missing
serial_numberon Cisco Catalyst SMB-OS devices. This supersedes the hardcoded-entPhysicalIndexfallback-chain approach proposed in #23498 (which will not be merged) with dedicated, sysObjectID-scoped profiles that read the documented fixed chassis index. CBS250/350 are intentionally out of scope (their SMB sysObjectIDs share families with the Sx250/350/350X line and can't be cleanly isolated).Review checklist (to be filled by the reviewer)
qa/skip-qalabel if the PR doesn't need to be tested during QA.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged