[monitoring] Clean up monitoring configuration in preparation for grafana cloud migration#4149
Merged
[monitoring] Clean up monitoring configuration in preparation for grafana cloud migration#4149
Conversation
maru-ava
force-pushed
the
ci-grafana-cloud
branch
3 times, most recently
from
fbaf095 to
0ef4d40
Compare
maru-ava
force-pushed
the
ci-grafana-cloud
branch
9 times, most recently
from
4fe235f to
74e3cfe
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR migrates the monitoring infrastructure from a self-hosted solution to Grafana Cloud, replacing the previous "poc" endpoints with Grafana Cloud's managed services.
- Updates all hardcoded URLs from self-hosted monitoring instances to Grafana Cloud endpoints
- Adds URL configuration support for both Prometheus and Loki collectors
- Updates secret management to include URLs alongside credentials
Reviewed Changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| tests/reexecute/c/README.md | Updates Grafana URLs and dashboard IDs in documentation |
| tests/fixture/tmpnet/yaml/promtail-daemonset.yaml | Adds Loki URL configuration and updates secret name |
| tests/fixture/tmpnet/yaml/prometheus-agent.yaml | Adds Prometheus URL configuration and updates secret name |
| tests/fixture/tmpnet/network.go | Updates Grafana URI and dashboard ID constants |
| tests/fixture/tmpnet/monitor_processes.go | Refactors collector configuration to include URLs and removes hardcoded endpoints |
| tests/fixture/tmpnet/monitor_kube.go | Updates Kubernetes secret creation to include URL configuration |
| tests/fixture/tmpnet/check_monitoring.go | Removes URL validation and adds Prometheus path suffix for Grafana Cloud |
| tests/fixture/tmpnet/README.md | Updates documentation with new URL requirements and endpoints |
| tests/e2e/README.md | Updates documentation with new configuration requirements |
| scripts/configure-local-metrics-collection.sh | Updates Grafana link generation |
| .github/workflows/*.yml | Updates all workflow files to use new URL-based configuration |
| .github/actions/run-monitored-tmpnet-cmd/action.yml | Adds URL inputs and updates default dashboard ID |
Comments suppressed due to low confidence (1)
tests/fixture/tmpnet/monitor_processes.go:464
- Error message is missing 'env' prefix for consistency with other error messages in the same function. Should be 'env var not set' to match the pattern used for other environment variables.
return "", "", "", fmt.Errorf("%s env var not set", passwordEnvVar)
8d9afbc to
d8ffaf6
Compare
maru-ava
force-pushed
the
ci-grafana-cloud
branch
from
fc942d2 to
5f3f924
Compare
maru-ava
force-pushed
the
ci-grafana-cloud
branch
2 times, most recently
from
cd25944 to
fd4fc62
Compare
Contributor
Author
|
CI is passing. Need to add the open source dashboards back to grafana and update the metrics link to the main dashboard. |
maru-ava
force-pushed
the
ci-grafana-cloud
branch
from
1f0f0cf to
73b2079
Compare
- Also switch to require configuring collection endpoints. No need to expose this internal detail.
maru-ava
force-pushed
the
ci-grafana-cloud
branch
from
73b2079 to
1d79208
Compare
maru-ava
force-pushed
the
ci-grafana-cloud
branch
from
1d79208 to
bbaa163
Compare
maru-ava
changed the title
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.
Why this should be merged
Our current monitoring stack was only ever intended to be a stop-gap until a managed alternative became available. Grafana Cloud is that alternative. This PR cleans up the configuration of monitoring (endpoints and urls) to simplify the pending migration.
How this was tested
CI
Need to be documented in RELEASES.md?
N/A