Skip to content

Conversation

sasagarw
Copy link
Contributor

Description

This PR:

  • Updates the prometheus alert to include a namespace label.
  • Needs to be backported till release-5.1 since we updated the alerts to be complaint with Monitoring Team from 5.1 onwards.

/cc @periklis
/assign @igor-karpukhin

Links

@sasagarw
Copy link
Contributor Author

/retest

1 similar comment
@sasagarw
Copy link
Contributor Author

/retest

Copy link
Contributor

@periklis periklis left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: periklis, sasagarw

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2021
@openshift-merge-robot openshift-merge-robot merged commit 7cac534 into openshift:master Oct 20, 2021
@sasagarw
Copy link
Contributor Author

/cherry-pick release-5.2
/cherry-pick release-5.1

@openshift-cherrypick-robot

@sasagarw: new pull request created: #809

In response to this:

/cherry-pick release-5.2
/cherry-pick release-5.1

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.

@sasagarw
Copy link
Contributor Author

/cherry-pick release-5.1

@openshift-cherrypick-robot

@sasagarw: #808 failed to apply on top of branch "release-5.1":

Applying: added namespace label to prometheus alert
Using index info to reconstruct a base tree...
M	files/prometheus_alerts.yml
M	test/files/prometheus-unit-tests/test.yml
Falling back to patching base and 3-way merge...
Auto-merging test/files/prometheus-unit-tests/test.yml
CONFLICT (content): Merge conflict in test/files/prometheus-unit-tests/test.yml
Auto-merging files/prometheus_alerts.yml
CONFLICT (content): Merge conflict in files/prometheus_alerts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 added namespace label to prometheus alert
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-5.1

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants