Skip to content

SNMP: add Catalyst 9200 and Catalyst 1300 sysobjectids to cisco-catalyst#23759

Closed
ian28223 wants to merge 2 commits into
masterfrom
ian.bucad/cisco-catalyst-1300-9200-sysobjectids
Closed

SNMP: add Catalyst 9200 and Catalyst 1300 sysobjectids to cisco-catalyst#23759
ian28223 wants to merge 2 commits into
masterfrom
ian.bucad/cisco-catalyst-1300-9200-sysobjectids

Conversation

@ian28223
Copy link
Copy Markdown
Contributor

@ian28223 ian28223 commented May 20, 2026

What does this PR do?

Adds three sysobjectids to the cisco-catalyst SNMP profile so newer Catalyst devices match it instead of falling onto the generic cisco profile:

  • 1.3.6.1.4.1.9.1.3079 — ciscoC9200CX12P2X2G (Catalyst 9200)
  • 1.3.6.1.4.1.9.1.3233 — ciscoC130024P4G (Catalyst 1300 24P-4G)
  • 1.3.6.1.4.1.9.1.3236 — ciscoSwitch1300 (Catalyst 1300)

Motivation

Follow-up to the customer escalation AGENT-15682. The user's cisco_switch_1300 devices currently match the generic cisco profile because their sysobjectids aren't in the cisco-catalyst list. Routing them to cisco-catalyst gives them the richer Catalyst metrics and metadata (including the existing chassis serial sources in that profile).

This PR contains only the sysobjectid additions — isolated from the broader serial_number fallback work in #23498 so the test impact of each change can be observed independently.

Review checklist (to be filled by reviewers)

  • 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

Adds the following devices so they match the cisco-catalyst profile
instead of falling onto the generic cisco profile:

- 1.3.6.1.4.1.9.1.3079 — ciscoC9200CX12P2X2G (Catalyst 9200)
- 1.3.6.1.4.1.9.1.3233 — ciscoC130024P4G (Catalyst 1300 24P-4G)
- 1.3.6.1.4.1.9.1.3236 — ciscoSwitch1300 (Catalyst 1300)

Refs AGENT-15682.
@dd-octo-sts
Copy link
Copy Markdown
Contributor

dd-octo-sts Bot commented May 20, 2026

Validation Report

All 20 validations passed.

Show details
Validation Description Status
agent-reqs Verify check versions match the Agent requirements file
ci Validate CI configuration and Codecov 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

ian28223 added a commit that referenced this pull request May 20, 2026
Drops the Catalyst 9200 / 1300 sysobjectid entries (3079, 3233, 3236)
from this branch; they ship in #23759 instead so the metadata fallback
work here can be evaluated against CI in isolation.
@ian28223 ian28223 marked this pull request as ready for review May 20, 2026 01:56
@ian28223 ian28223 requested review from a team as code owners May 20, 2026 01:56
@ian28223 ian28223 requested review from Pierre-L42 and removed request for a team May 20, 2026 01:56
@ian28223 ian28223 marked this pull request as draft May 20, 2026 01:56
@datadog-prod-us1-4
Copy link
Copy Markdown
Contributor

datadog-prod-us1-4 Bot commented May 20, 2026

Pipelines  Tests

Fix all issues with BitsAI

⚠️ Warnings

🚦 3 Pipeline jobs failed

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

🛟 This job is unlikely to succeed on retry. Please review your pipeline configuration. 28 tests failed due to missing candidates for 'snmp.ifNumber' and 'snmp.hrSystemUptime'.

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

🛟 This job is unlikely to succeed on retry. Please review your pipeline configuration. AssertionError: Needed at least 1 candidates for 'snmp.device.reachable', got 0. Expected tags such as agent_host:runnervm9vjqi and device_id:default:172.18.0.1 were found as None.

PR | test / check   View in Datadog   GitHub Actions

🧪 20 Tests failed in 1 job

PR | run   GitHub Actions

test_e2e_cisco_legacy_wlc from test_e2e_core.py   View in Datadog (Fix with Cursor)
Needed at least 1 candidates for &#39;snmp.device.reachable&#39;, got 0
Expected:
        MetricStub(name=&#39;snmp.device.reachable&#39;, type=0, value=1, tags=[&#39;agent_host:runnervm9vjqi&#39;, &#39;device_hostname:DDOGWLC&#39;, &#39;device_id:default:172.18.0.2&#39;, &#39;device_ip:172.18.0.2&#39;, &#39;device_namespace:default&#39;, &#39;device_vendor:cisco&#39;, &#39;snmp_device:172.18.0.2&#39;, &#39;snmp_host:DDOGWLC&#39;, &#39;snmp_profile:cisco-legacy-wlc&#39;], hostname=None, device=None, flush_first_value=None)
Difference to closest:
        Expected tag agent_host:runnervm9vjqi
        Found agent_host:None
        Expected tag device_hostname:DDOGWLC
        Found device_hostname:None
        Expected tag device_id:default:172.18.0.2
        Found device_id:None
...
test_e2e_cisco_nexus from test_e2e_core.py   View in Datadog (Fix with Cursor)
Needed at least 1 candidates for &#39;snmp.device.reachable&#39;, got 0
Expected:
        MetricStub(name=&#39;snmp.device.reachable&#39;, type=0, value=1, tags=[&#39;agent_host:runnervm9vjqi&#39;, &#39;device_hostname:Nexus-eu1.companyname.managed&#39;, &#39;device_id:default:172.18.0.2&#39;, &#39;device_ip:172.18.0.2&#39;, &#39;device_namespace:default&#39;, &#39;device_vendor:cisco&#39;, &#39;snmp_device:172.18.0.2&#39;, &#39;snmp_host:Nexus-eu1.companyname.managed&#39;, &#39;snmp_profile:cisco-nexus&#39;], hostname=None, device=None, flush_first_value=None)
Difference to closest:
        Expected tag agent_host:runnervm9vjqi
        Found agent_host:None
        Expected tag device_hostname:Nexus-eu1.companyname.managed
        Found device_hostname:None
        Expected tag device_id:default:172.18.0.2
        Found device_id:None
...

View all 20 test failures

ℹ️ Info

No other issues found (see more)

❄️ No new flaky tests detected

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 95.38%

Useful? React with 👍 / 👎

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

@codecov
Copy link
Copy Markdown

codecov Bot commented May 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.06%. Comparing base (36bd36a) to head (375f1e6).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ian28223
Copy link
Copy Markdown
Contributor Author

Reverting to a single PR (#23498) since the isolated CI run showed the same failure pattern — confirming the failures are environmental, not from this PR's changes.

@ian28223 ian28223 closed this May 20, 2026
@ian28223 ian28223 deleted the ian.bucad/cisco-catalyst-1300-9200-sysobjectids branch May 20, 2026 03:20
ian28223 added a commit that referenced this pull request May 20, 2026
ian28223 added a commit that referenced this pull request Jun 2, 2026
Drops the Catalyst 9200 / 1300 sysobjectid entries (3079, 3233, 3236)
from this branch; they ship in #23759 instead so the metadata fallback
work here can be evaluated against CI in isolation.
ian28223 added a commit that referenced this pull request Jun 2, 2026
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