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

Bug 1986981: Alert Config update - Patch to PR#1310 #1317

Merged
merged 3 commits into from Aug 21, 2021
Merged

Bug 1986981: Alert Config update - Patch to PR#1310 #1317

merged 3 commits into from Aug 21, 2021

Conversation

raptorsun
Copy link
Contributor

@raptorsun raptorsun commented Aug 10, 2021 •
edited

This PR includes 2 amendments to PR#1310:

  1. This PR patches Thanos-related alerts to warning severity and triggering time window to 1h. In PR#1310 I have introduced a bug in the patching function that does not take empty alert/record name as an all-matching wildcard. 😅
  2. remove patch for "expr" field in rules KubePersistentVolumeFillingUp, NodeFilesystemFilesFillingUp, and NodeFilesystemSpaceFillingUp, leaving it to upstream
  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 10, 2021

@raptorsun: This pull request references Bugzilla bug 1986981, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

Bug 1986981: Alert Config update - Patch to PR#1310

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2021
@openshift-ci openshift-ci bot requested a review from juzhao August 10, 2021 13:23
@dgrisonnet
Copy link
Member

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 10, 2021

@raptorsun: This pull request references Bugzilla bug 1986981, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

Bug 1986981: Alert Config update - Patch to PR#1310

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.

@raptorsun
Copy link
Contributor Author

/retest

@paulfantom
Copy link
Contributor

jsonnet/patch-rules.libsonnet was moved to https://github.com/openshift/cluster-monitoring-operator/blob/master/jsonnet/utils/sanitize-rules.libsonnet

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2021
@dgrisonnet
Copy link
Member

Holding until comments in the precedent PR are addressed: #1310 (review)

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2021
@raptorsun
Copy link
Contributor Author

jsonnet/patch-rules.libsonnet was moved to https://github.com/openshift/cluster-monitoring-operator/blob/master/jsonnet/utils/sanitize-rules.libsonnet

Thanks, now aligned to new master head.

@raptorsun
Copy link
Contributor Author

Need to merge this PR to fix the test ci/prow/versions

@raptorsun
Copy link
Contributor Author

/retest

1 similar comment
@raptorsun
Copy link
Contributor Author

/retest

@raptorsun
remove patch for expr field in rules KubePersistentVolumeFillingUp, N…
29cded2 
…odeFilesystemFilesFillingUp and NodeFilesystemSpaceFillingUp, leaving it to upstream
@raptorsun
Copy link
Contributor Author

The last commit about distinguishing rules under same name using index is moved to another PR.
This PR now contains only changes in alert configuration.

dgrisonnet
dgrisonnet reviewed Aug 20, 2021
View reviewed changes
jsonnet/utils/sanitize-rules.libsonnet Outdated
@@ -342,7 +256,8 @@ local patchOrExcludeRule(rule, ruleSet, operation) =
if std.length(ruleSet) == 0 then
[rule]
else if ('alert' in rule) then
local matchedRules = std.filter(function(ruleItem) ('alert' in ruleItem) && (ruleItem.alert == rule.alert), ruleSet);
// empty alert name is matching-all
Copy link
Member

Choose a reason for hiding this comment

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

we shouldn't need to update the patchOrExcludeRule function if we only stick to updating the severities so would you mind reverted the changes you made to it in #1310?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

of course, this will be restored to previous version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

restored now :)

dgrisonnet
dgrisonnet approved these changes Aug 20, 2021
View reviewed changes
Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

Awesome, looks good from my side, thank you @raptorsun for keeping up with my requests.

/lgtm
/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, raptorsun

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:
  • OWNERS [dgrisonnet,raptorsun]

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

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 21, 2021 •
edited

@raptorsun: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/prow/versions 1b228da link /test versions
ci/prow/e2e-aws-single-node 1b228da link /test e2e-aws-single-node

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit ec61f05 into openshift:master Aug 21, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 21, 2021

@raptorsun: All pull requests linked via external trackers have merged:

Bugzilla bug 1986981 has been moved to the MODIFIED state.

In response to this:

Bug 1986981: Alert Config update - Patch to PR#1310

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
Reviewers

@dgrisonnet dgrisonnet dgrisonnet approved these changes

@fpetkovski fpetkovski Awaiting requested review from fpetkovski

@paulfantom paulfantom Awaiting requested review from paulfantom

@juzhao juzhao Awaiting requested review from juzhao

Assignees

@dgrisonnet dgrisonnet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@raptorsun @dgrisonnet @paulfantom @openshift-bot @openshift-merge-robot