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.

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

Fix Prometheus alerts using oldstyle label selector #6167

Merged
merged 3 commits into from
Nov 19, 2020

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Nov 17, 2020

What this PR does / why we need it:
When moving to the operator, we also switched around the labels. This made the Prometheus alerts misfire. To keep the newly fixed rules compatible with the old Helm chart, I adjusted the chart to also provide the new labels.

Fixes #6152.

Does this PR introduce a user-facing change?:

Fix Prometheus alerts misfiring about absent KKP components

@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 17, 2020
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xrstf

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

The pull request process is described here

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2020
@xrstf xrstf changed the title WIP - Fix Prometheus alerts using oldstyle label selector Fix Prometheus alerts using oldstyle label selector Nov 17, 2020
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 17, 2020
@xrstf
Copy link
Contributor Author

xrstf commented Nov 17, 2020

/cherrypick release/v2.15

@kubermatic-bot
Copy link
Contributor

@xrstf: once the present PR merges, I will cherry-pick it on top of release/v2.15 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@youssefazrak
Copy link
Contributor

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 67bd100a853e9b00f2a06ed9f9cfb49340cc198e

@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2020
@youssefazrak
Copy link
Contributor

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 596f3951d5e3aa6a096e798bb9f74c04ea7bc974

@youssefazrak
Copy link
Contributor

/retest

@kubermatic-bot kubermatic-bot merged commit 59cb7e7 into kubermatic:master Nov 19, 2020
@kubermatic-bot
Copy link
Contributor

@xrstf: #6167 failed to apply on top of branch "release/v2.15":

Applying: Fix Prometheus alerts using oldstyle label selector
Using index info to reconstruct a base tree...
M	charts/monitoring/prometheus/Chart.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/monitoring/prometheus/Chart.yaml
CONFLICT (content): Merge conflict in charts/monitoring/prometheus/Chart.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Prometheus alerts using oldstyle label selector
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Monitoring: Broken Alerts KubermaticAPIDown KubermaticControllerManagerDown
3 participants