Skip to content

scylla: add container-based config discovery support - #24498

Merged
vitkyrka merged 4 commits into
masterfrom
agent/scylla-config-discovery
Jul 14, 2026
Merged

scylla: add container-based config discovery support#24498
vitkyrka merged 4 commits into
masterfrom
agent/scylla-config-discovery

Conversation

@vitkyrka

@vitkyrka vitkyrka commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

Adds container-based config discovery support to scylla.

We only support the OpenMetrics version and not the legacy implementation.

Port selection rationale: Port 9180 is Scylla's documented Prometheus metrics port (Scylla Monitoring Stack Interfaces).

Container log noise from non-metrics candidates: port_hints only lists 9180, but the discovery framework also generates a fallback candidate for every other port the container exposes (per candidate_ports()), including the internal storage RPC port 7000. Probing that port with a plain HTTP GET makes Scylla's own RPC layer log a benign ERROR ... server connection dropped: connection is closed once it rejects the unrecognized protocol magic. test_e2e_discovery_all_candidates uses a customized log-pattern list that excludes only that specific benign substring via a negative lookahead, so a real crash or error from any candidate is still caught.

Motivation

DSCVR-605.

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.
  • 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 a discovery strategy targeting the openmetrics_endpoint on port 9180
(scylla's Prometheus metrics port), generates auto_conf.yaml with
ad_identifiers=[scylla], wires get_e2e_discovery_metadata() into the E2E
fixture, and adds test_e2e_discovery/test_e2e_discovery_all_candidates
tests to validate discovered configs against the real scylla-db container.

Environment: Datadog workspace

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@vitkyrka vitkyrka added the qa/skip-qa Automatically skip this PR for the next QA label Jul 10, 2026 — with ddtool CLI
@dd-octo-sts dd-octo-sts Bot added documentation integration/scylla and removed qa/skip-qa Automatically skip this PR for the next QA labels Jul 10, 2026
Environment: Datadog workspace

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@datadog-datadog-prod-us1-2

datadog-datadog-prod-us1-2 Bot commented Jul 10, 2026

Copy link
Copy Markdown

Tests  Code Coverage

🎉 All green!

🧪 All tests passed
❄️ No new flaky tests detected

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

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

Anchor the benign-error exclusion to the specific "rpc - client <addr>: server
connection dropped: connection is closed" log shape instead of a bare trailing
substring match, per Codex review feedback, so an unrelated error line that
happens to contain the same trailing text isn't silently excluded too.

Environment: Datadog workspace

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@vitkyrka vitkyrka added the qa/skip-qa Automatically skip this PR for the next QA label Jul 10, 2026 — with ddtool CLI
@dd-octo-sts

dd-octo-sts Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Validation Report

All 21 validations passed.

Show details
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
qa-label Validate the pull request declares whether it needs QA for the next Agent release
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

@vitkyrka
vitkyrka added this pull request to the merge queue Jul 14, 2026
Merged via the queue into master with commit 366c2a2 Jul 14, 2026
82 of 91 checks passed
@vitkyrka
vitkyrka deleted the agent/scylla-config-discovery branch July 14, 2026 13:47
@dd-octo-sts dd-octo-sts Bot added this to the 7.83.0 milestone Jul 14, 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.

2 participants