Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GEP-19] Adapt monitoring configuration #307

Merged
merged 2 commits into from
May 23, 2024
Merged

[GEP-19] Adapt monitoring configuration #307

merged 2 commits into from
May 23, 2024

Conversation

rfranzke
Copy link
Member

@rfranzke rfranzke commented May 6, 2024

How to categorize this PR?

/area monitoring
/kind enhancement

What this PR does / why we need it:
gardener/gardener#9695 changes the contract of how extension can provide monitoring configuration, see https://github.com/gardener/gardener/pull/9695/files#diff-93972179f36fa195b948f0f4979acab75697f99f3c51ab889994d9d8ba9f170b. This PR adapts this extension accordingly. It also cleans up no longer needed configuration (if found).

Which issue(s) this PR fixes:
Part of gardener/gardener#9065

Special notes for your reviewer:
/cc @ScheererJ

Release note:

This extension is now using the new way of providing monitoring configuration (ref [GEP-19](https://github.com/gardener/gardener/blob/master/docs/proposals/19-migrating-observability-stack-to-operators.md)) in case a shoot cluster's Prometheus has been migrated to management via `prometheus-operator`.

@rfranzke rfranzke requested review from a team as code owners May 6, 2024 14:31
@rfranzke rfranzke mentioned this pull request May 6, 2024
Closed
46 tasks
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 6, 2024
@gardener-robot gardener-robot added needs/review Needs review area/monitoring Monitoring (including availability monitoring and alerting) related kind/enhancement Enhancement, improvement, extension size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) labels May 6, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label May 6, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label May 6, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 7, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 7, 2024
@rfranzke
Copy link
Member Author

/cc @ScheererJ

ScheererJ
ScheererJ requested changes May 23, 2024
View reviewed changes
Copy link
Member

@ScheererJ ScheererJ left a comment

Choose a reason for hiding this comment

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

Thanks for adapting the extension to GEP-19. Please update the dashboard files so that nobody gets ugly error messages.

pkg/controller/actuator_reconcile.go Outdated Show resolved Hide resolved
test/e2e/common_test.go Outdated Show resolved Hide resolved
charts/internal/cilium-monitoring/templates/configmap-dashboards.yaml Show resolved Hide resolved
@gardener-robot gardener-robot added the needs/changes Needs (more) changes label May 23, 2024
@gardener-robot gardener-robot added size/l Size of pull request is large (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else and removed size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) labels May 23, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label May 23, 2024
@rfranzke rfranzke requested a review from ScheererJ May 23, 2024 12:42
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label May 23, 2024
@ScheererJ
Copy link
Member

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/changes Needs (more) changes needs/review Needs review needs/second-opinion Needs second review by someone else labels May 23, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label May 23, 2024
@ScheererJ ScheererJ merged commit 6c7ddad into gardener:master May 23, 2024
8 checks passed
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label May 23, 2024
@rfranzke rfranzke deleted the gep19 branch May 23, 2024 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ScheererJ ScheererJ ScheererJ approved these changes

Assignees
No one assigned
Labels
area/monitoring Monitoring (including availability monitoring and alerting) related kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/l Size of pull request is large (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rfranzke @ScheererJ @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3 @gardener-robot