Skip to content

[snmp] Add Cisco Catalyst 1200 and 1300/1300X profiles (serial via ENTITY-MIB .67109120)#23929

Closed
FlorianVeaux wants to merge 2 commits into
masterfrom
flo/snmp-catalyst-1200-1300-profiles
Closed

[snmp] Add Cisco Catalyst 1200 and 1300/1300X profiles (serial via ENTITY-MIB .67109120)#23929
FlorianVeaux wants to merge 2 commits into
masterfrom
flo/snmp-catalyst-1200-1300-profiles

Conversation

@FlorianVeaux
Copy link
Copy Markdown
Member

@FlorianVeaux FlorianVeaux commented Jun 4, 2026

What does this PR do?

Adds two new SNMP profiles for Cisco's SMB-OS Catalyst switches and sources their serial_number from the chassis entry in ENTITY-MIB:

  • cisco-catalyst-1200.yaml — Catalyst 1200 Series (ciscoProducts 32103225)
  • cisco-catalyst-1300.yaml — Catalyst 1300 / 1300X Series (ciscoProducts 32263253 and 34103417)

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 on cisco-sb.yaml (extend _base + _generic-if, vendor cisco, CISCOSB CPU metric). On that OS the chassis serial and software rev live at the fixed ENTITY-MIB index entPhysicalSerialNum.67109120 / entPhysicalSoftwareRev.67109120 (documented by Cisco), which is what these profiles read.

sysObjectIDs are the named ciscoC1200* / ciscoC1300* / ciscoC1300X* assignments from the official cisco/cisco-mibs v2/CISCO-PRODUCTS-MIB.my. They are listed explicitly (no 9.1.* wildcard) because 1.3.6.1.4.1.9.1.* is shared with mainstream IOS-XE Catalysts that must not match these profiles; the generic cisco profile keeps its 9.1.* wildcard and our more-specific OIDs win, so there is no sysObjectID conflict.

Testing

  • New snmprec fixtures cisco-catalyst-1200.snmprec / cisco-catalyst-1300.snmprec.
  • New Go core-loader e2e metadata tests test_e2e_core_metadata_cisco_catalyst_1200 / _1300, asserting the full network_devices_metadata payload (profile match, serial_number from .67109120, version, vendor: cisco, device_type: switch). Both pass locally.
  • Also sorts/dedupes 8 pre-existing .snmprec fixtures (sort -V | uniq) so the datadog/docker-library:snmp container passes its boot-time sort check and the SNMP e2e suite can start.

Motivation

Customer escalation AGENT-15682: missing serial_number on Cisco Catalyst SMB-OS devices. This supersedes the hardcoded-entPhysicalIndex fallback-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)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

@datadog-datadog-prod-us1
Copy link
Copy Markdown
Contributor

datadog-datadog-prod-us1 Bot commented Jun 4, 2026

Pipelines  Tests

Fix all issues with BitsAI

⚠️ Warnings

🚦 2 Pipeline jobs failed

PR | test / test (linux, ubuntu-22.04, snmp, SNMP (py3.13-true), py3.13-true) / SNMP (py3.13-true)-py3.13-true   View in Datadog   GitHub Actions

See error Connection error when trying to reach 'ddintegrations.blob.core.windows.net': failed to resolve host.

Validate repository | Run Validations / Validate   View in Datadog   GitHub Actions

See error PR #23929 is missing a QA decision label. It must declare whether its changes require QA validation by setting 'qa/required' or 'qa/skip-qa'.

🧪 20 Tests failed in 1 job

PR | run   GitHub Actions

test_bulk_table from test_check.py   View in Datadog (Fix with Cursor)
HTTPSConnectionPool(host=&#39;ddintegrations.blob.core.windows.net&#39;, port=443): Max retries exceeded with url: /snmp/cisco-3850.snmprec (Caused by NameResolutionError(&#34;HTTPSConnection(host=&#39;ddintegrations.blob.core.windows.net&#39;, port=443): Failed to resolve &#39;ddintegrations.blob.core.windows.net&#39; ([Errno -2] Name or service not known)&#34;))
test_cast_metrics from test_check.py   View in Datadog (Fix with Cursor)
HTTPSConnectionPool(host=&#39;ddintegrations.blob.core.windows.net&#39;, port=443): Max retries exceeded with url: /snmp/cisco-3850.snmprec (Caused by NameResolutionError(&#34;HTTPSConnection(host=&#39;ddintegrations.blob.core.windows.net&#39;, port=443): Failed to resolve &#39;ddintegrations.blob.core.windows.net&#39; ([Errno -2] Name or service not known)&#34;))

View all 20 test failures

ℹ️ Info

No other issues found (see more)

❄️ No new flaky tests detected

Useful? React with 👍 / 👎

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 0cd648d | Docs | Datadog PR Page | Give us feedback!

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge 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 👍 / 👎.

FlorianVeaux and others added 2 commits June 4, 2026 10:40
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@FlorianVeaux FlorianVeaux force-pushed the flo/snmp-catalyst-1200-1300-profiles branch from f825af6 to 0cd648d Compare June 4, 2026 08:40
@dd-octo-sts
Copy link
Copy Markdown
Contributor

dd-octo-sts Bot commented Jun 4, 2026

Validation Report

Validation Description Status
qa-label Validate the pull request declares whether it needs QA for the next Agent release

Run ddev validate all changed --fix to attempt to auto-fix supported validations.

Passed validations (20)
Validation Description Status
agent-reqs Verify check versions match the Agent requirements file
ci Validate CI configuration and code coverage settings
codeowners Validate every integration has a CODEOWNERS entry
config Validate default configuration files against spec.yaml
dep Verify dependency pins are consistent and Agent-compatible
http Validate integrations use the HTTP wrapper correctly
imports Validate check imports do not use deprecated modules
integration-style Validate check code style conventions
jmx-metrics Validate JMX metrics definition files and config
labeler Validate PR labeler config matches integration directories
legacy-signature Validate no integration uses the legacy Agent check signature
license-headers Validate Python files have proper license headers
licenses Validate third-party license attribution list
metadata Validate metadata.csv metric definitions
models Validate configuration data models match spec.yaml
openmetrics Validate OpenMetrics integrations disable the metric limit
package Validate Python package metadata and naming
readmes Validate README files have required sections
saved-views Validate saved view JSON file structure and fields
version Validate version consistency between package and changelog

View full run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant