Merged
Conversation
javierdelapuente
approved these changes
Mar 25, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates observability assets so Grafana dashboards are delivered from the cos_custom directory (addressing the paas-charm change that made the previous COS dir lookup unusable), and adds integration coverage to ensure dashboards are actually present on the grafana-dashboard relation.
Changes:
- Add integration tests that verify
grafana-dashboardrelation data includes non-empty dashboard templates (planner + webhook-gateway). - Add a
any-charmGrafana-dashboard consumer fixture used by the new tests. - Remove the planner charm’s
get_cos_diroverride and add the planner Grafana dashboard undercos_custom/grafana_dashboards.
Reviewed changes
Copilot reviewed 4 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| charms/tests/integration/test_webhook_gateway.py | Adds an integration test asserting the webhook-gateway publishes dashboard templates over the grafana-dashboard relation. |
| charms/tests/integration/test_planner.py | Adds an integration test asserting planner publishes dashboards and that the content includes planner-specific metrics. |
| charms/tests/integration/conftest.py | Adds a fixture deploying any-charm as a Grafana-dashboard consumer for relation inspection. |
| charms/planner-operator/src/charm.py | Removes the get_cos_dir override (previously used to locate COS assets). |
| charms/planner-operator/cos_custom/grafana_dashboards/go.json | Introduces the planner Grafana dashboard in the cos_custom directory. |
| charms/planner-operator/src/cos/prometheus_alert_rules/.gitkeep | Keeps the alert rules directory tracked (empty placeholder). |
| charms/planner-operator/src/cos/loki_alert_rules/.gitkeep | Keeps the alert rules directory tracked (empty placeholder). |
setuptools-scm 10.0.2 is incompatible with charmcraft's pinned pip 24.1.1 when building from source, causing "paths must be inside source tree" errors. Use charm-binary-python-packages to install pydantic and pydantic-core from wheels instead.
This reverts commit d1a2f52.
Use --only-binary=pluggy in requirements.txt to prevent pip from building pluggy from source, avoiding the setuptools-scm >= 10 incompatibility with charmcraft's pinned pip 24.1.1. See pypa/setuptools-scm#1302
juju show-unit displays the remote application's data under application-data. We were checking from the provider side and seeing the consumer's empty data. Check from the consumer side instead.
cbartz
requested review from
florentianayuwono,
weiiwang01,
yanksyoon and
yhaliaw
as code owners
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Move the dashboards to
cos_custom.Rationale
A recent change in paas-charm made
get_cos_dirunusable. We spotted it because the dashboard was gone.Checklist
CONTRIBUTING.mdhas been updated upon changes to the contribution/development process (e.g. changes to the way tests are run)