Bug 1926598: pkg/rules: fix deduplication of equal alerts with different labels

[s-urbaniak]

This is a cherry-pick of thanos-io#3960

/cc @openshift/openshift-team-monitoring

[openshift-ci-robot]

@s-urbaniak: This pull request references Bugzilla bug 1944309, which is invalid:

• expected the bug to target the "4.8.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1944309: pkg/rules: fix deduplication of equal alerts with different labels

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.

[s-urbaniak]

/bugzilla refresh

[openshift-ci-robot]

@s-urbaniak: This pull request references Bugzilla bug 1926598, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.8.0) matches configured target release for branch (4.8.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @lihongyan1

In response to this:

/bugzilla refresh

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-robot]

@s-urbaniak: This pull request references Bugzilla bug 1926598, 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.8.0) matches configured target release for branch (4.8.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 @lihongyan1

In response to this:

Bug 1926598: pkg/rules: fix deduplication of equal alerts with different labels

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.

[s-urbaniak]

/cherry-pick 4.7

[openshift-cherrypick-robot]

@s-urbaniak: once the present PR merges, I will cherry-pick it on top of 4.7 in a new PR and assign it to you.

In response to this:

/cherry-pick 4.7

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.

[s-urbaniak]

/cherry-pick release-4.7

[openshift-cherrypick-robot]

@s-urbaniak: once the present PR merges, I will cherry-pick it on top of release-4.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.7

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.

[s-urbaniak]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@s-urbaniak: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.6

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.

[simonpasquier]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: s-urbaniak, simonpasquier

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 [s-urbaniak,simonpasquier]

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

[openshift-ci-robot]

@s-urbaniak: All pull requests linked via external trackers have merged:

• openshift/thanos#51
• thanos-io/thanos#3960

Bugzilla bug 1926598 has been moved to the MODIFIED state.

In response to this:

Bug 1926598: pkg/rules: fix deduplication of equal alerts with different labels

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-cherrypick-robot]

@s-urbaniak: cannot checkout 4.7: error checking out 4.7: exit status 1. output: error: pathspec '4.7' did not match any file(s) known to git

In response to this:

/cherry-pick 4.7

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-cherrypick-robot]

@s-urbaniak: new pull request created: #52

In response to this:

/cherry-pick release-4.7

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-cherrypick-robot]

@s-urbaniak: #51 failed to apply on top of branch "release-4.6":

Applying: pkg/rules: fix deduplication of equal alerts with different labels
Using index info to reconstruct a base tree...
M	pkg/rules/rules.go
M	pkg/rules/rules_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/rules/rules_test.go
CONFLICT (content): Merge conflict in pkg/rules/rules_test.go
Auto-merging pkg/rules/rules.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/rules: fix deduplication of equal alerts with different labels
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:

/cherry-pick release-4.6

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.