Skip to content

AGENT-15682 Catalyst SMB SNMP profiles#23921

Closed
FlorianVeaux wants to merge 1 commit into
masterfrom
dd/agent-15682-catalyst-snmp-profiles
Closed

AGENT-15682 Catalyst SMB SNMP profiles#23921
FlorianVeaux wants to merge 1 commit into
masterfrom
dd/agent-15682-catalyst-snmp-profiles

Conversation

@FlorianVeaux
Copy link
Copy Markdown
Member

What does this PR do?

Adds dedicated SNMP default profiles for Cisco Catalyst 1200 and Cisco Catalyst 1300/1300X SMB-OS switches. The profiles are scoped to explicit ciscoProducts sysObjectIDs and collect chassis serial metadata from the documented ENTITY-MIB SMB chassis index 67109120.

Motivation

AGENT-15682 surfaced that Cisco Catalyst SMB-OS devices were missing serial_number metadata. This supersedes the hardcoded ENTITY-MIB fallback approach proposed in #23498 by keeping the existing Catalyst and Cisco SMB profiles unchanged, adding standalone SMB-OS profiles with explicit OIDs, and avoiding conflicts with the generic Cisco 9.1.* wildcard profile.

Changes

  • Added the cisco-catalyst-1200 default SNMP profile with Catalyst 1200 ciscoProducts sysObjectIDs.
  • Added the cisco-catalyst-1300 default SNMP profile with Catalyst 1300 and 1300X ciscoProducts sysObjectIDs.
  • Added snmpsim fixtures for Catalyst 1200 and Catalyst 1300 devices.
  • Added Go core-loader e2e metadata coverage for profile selection, vendor, device type, version, and serial_number from entPhysicalSerialNum.67109120.

Testing/Validation

  • ddev validate models snmp
  • ddev validate metadata snmp
  • ddev meta snmp validate-profile -d snmp/datadog_checks/snmp/data/default_profiles -f snmp/datadog_checks/snmp/data/default_profiles/cisco-catalyst-1200.yaml
  • ddev meta snmp validate-profile -d snmp/datadog_checks/snmp/data/default_profiles -f snmp/datadog_checks/snmp/data/default_profiles/cisco-catalyst-1300.yaml
  • ddev validate all snmp
  • ddev test -fs snmp
  • Duplicate sysObjectID scan confirmed no duplicate explicit sysObjectIDs for the new profiles. The cisco.yaml 9.1.* wildcard remains non-conflicting.
  • Attempted ddev env test snmp py3.13-false -- -k "cisco_catalyst_1200 or cisco_catalyst_1300" after pre-seeding snmpsim data; the local sandbox could not start the compose environment because Podman/podman-compose lacked --wait under Python 3.13 and then failed network creation due missing CNI plugins. The e2e tests are included for CI/runtime validation.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add qa/required if this PR needs QA validation, or qa/skip-qa if it does not. Exactly one of the two is required. Proposed: qa/skip-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

PR by Bits - View session in Datadog

Comment @DataDog to request changes

@datadog-official
Copy link
Copy Markdown
Contributor

datadog-official Bot commented Jun 3, 2026

View session in Datadog

Bits Dev status: ✅ Done

Comment @DataDog to request changes

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

I can only run on private repositories.

@datadog-official
Copy link
Copy Markdown
Contributor

datadog-official Bot commented Jun 3, 2026

Code Coverage  Pipelines  Tests

Fix all issues with BitsAI

🛑 Gate Violations

🎯 1 Code Coverage issue detected

A Total coverage percentage gate may be blocking this PR.

Overall coverage for service snmp: 26.22% (threshold: 30.00%)

⚠️ Warnings

🚦 6 Pipeline jobs failed

Check PR | run / Check PR changelog   View in Datadog   GitHub Actions

See error Package "snmp" has changes that require a changelog. Please run `ddev release changelog new` to add it.

PR | test / check   View in Datadog   GitHub Actions

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

See error Connection error: failed to resolve 'ddintegrations.blob.core.windows.net'.

View all 6 failed jobs.

🧪 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

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 18.30% (-69.18%)

Useful? React with 👍 / 👎

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

@dd-octo-sts
Copy link
Copy Markdown
Contributor

dd-octo-sts Bot commented Jun 3, 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