Skip to content

[19.0-beta] Configure MCP server Prometheus/metric-storage connection - #2192

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:19.0-betafrom
openshift-cherrypick-robot:cherry-pick-2165-to-19.0-beta
Oct 23, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:19.0-betafrom
openshift-cherrypick-robot:cherry-pick-2165-to-19.0-beta

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #2165

/assign lpiwowar

On RHOSO versions where metric-storage is not registered in the
Keystone catalog, the observabilityclient running inside the rhos-mcps
sidecar cannot auto-discover Aetos/Prometheus and metric commands
fail.

Detect a telemetry MetricStorage CR in the OpenStackClient's namespace
during MCP reconciliation and, when found, render its connection
details (host/port, and CA cert path when Prometheus TLS is enabled)
into the openstack.prometheus section of the rendered MCP config.yaml.
When no MetricStorage is found, the section is omitted so the MCP
server can report a clear "not configured" error instead of pointing
at a nonexistent host.

This mirrors the approach taken in lightspeed-operator commit
57acabc40fdf3695b42abcd85110c58e908454b4, reusing the existing
telemetry-operator MetricStorage watch, RBAC, and lookup already used
by the OpenStackClient controller for the CLI pod's Prometheus env
vars.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 23, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Central YAML (base), Organization UI (inherited)
  • Review profile: CHILL
  • Plan: Enterprise
  • Run ID: 6cdab7c0-cd55-4807-b740-73b7c67185b9

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@stuggi stuggi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci

openshift-ci Bot commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot
openshift-merge-bot Bot merged commit 916746b into openstack-k8s-operators:19.0-beta Oct 23, 2026
4 checks passed
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.

4 participants