Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Reconcile AlertManagerConfig in UWM from platform Prometheus #1527

Merged
merged 5 commits into from
Jan 17, 2022
Merged

Reconcile AlertManagerConfig in UWM from platform Prometheus #1527

merged 5 commits into from
Jan 17, 2022

Conversation

philipgough
Copy link
Contributor

@philipgough philipgough commented Jan 4, 2022 •
edited
Loading

Related to openshift/enhancements#937 - this changes allows alerts created in user space when UWM is enabled to be routed via AlertManagerConfig to platform alertmanager

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 4, 2022
@philipgough philipgough marked this pull request as draft January 4, 2022 11:22
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 4, 2022
@philipgough philipgough marked this pull request as ready for review January 11, 2022 11:30
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 11, 2022
@philipgough
Copy link
Contributor Author

/skip

simonpasquier
simonpasquier reviewed Jan 11, 2022
View reviewed changes
pkg/client/client.go Outdated Show resolved Hide resolved
pkg/client/client.go Outdated Show resolved Hide resolved
@philipgough
test:e2e: Add helpers to facilitate testing webhook receiver
48dd101
@philipgough
e2e:framework: Expose prometheus-operator alphav1 types utils in fram…
87a4dac 
…ework
@philipgough
test:e2e Assert AlertManagerConfig from user space is reconciled
fa046fe 
Tests leveraging the Platform Alertmanager.
Where no additional Alertmanager is deployed and the user alerts are
forwarded to the existing Platform Alertmanager.
@philipgough
docs: Add changelog entry
2efb751
@philipgough
Copy link
Contributor Author

/retest-required

@philipgough
Copy link
Contributor Author

/skip

@philipgough
Copy link
Contributor Author

/retest-required

1 similar comment
@philipgough
Copy link
Contributor Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2022

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

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-single-node 2efb751 link false /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.

@juzhao
Copy link
Contributor

juzhao commented Jan 14, 2022

testing passed:
/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 14, 2022
simonpasquier
simonpasquier reviewed Jan 14, 2022
View reviewed changes
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PhilipGough, 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 [PhilipGough,simonpasquier]

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

@simonpasquier
Copy link
Contributor

/label docs-approved
/label px-approved

Adding missing labels since https://issues.redhat.com/browse/MON-880 have been ack'ed already.

@openshift-ci openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Jan 17, 2022
@openshift-merge-robot openshift-merge-robot merged commit d259fa5 into openshift:master Jan 17, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@simonpasquier simonpasquier simonpasquier left review comments

@slashpai slashpai Awaiting requested review from slashpai

Assignees

@simonpasquier simonpasquier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@philipgough @juzhao @simonpasquier @openshift-merge-robot