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

pkg/server: get rules/alerts from thanos #5941

Merged
merged 2 commits into from Jul 22, 2020

Conversation

simonpasquier
Copy link
Contributor

It's a rebase of #5881 on top of master because the previous PR had conflicts. Since @s-urbaniak isn't available, I'm taking over the change.

This enables user workload alerting rules to be shown in the admin perspective.
As discussed in the arch call it is favorable to implement some filtering knobs first in the UI.
Additionally this requires thanos-io/thanos#2834 to be pulled in downstream first.

/cc @openshift/openshift-team-monitoring

@kyoto
Copy link
Member

kyoto commented Jul 10, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2020
@simonpasquier
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 10, 2020
@simonpasquier
Copy link
Contributor Author

We need a new version of Thanos in github.com/openshift/thanos that includes thanos-io/thanos#2888

@simonpasquier
Copy link
Contributor Author

Waiting on openshift/thanos#32 to merge.

@simonpasquier
Copy link
Contributor Author

/unhold
/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2020
@kyoto
Copy link
Member

kyoto commented Jul 14, 2020

/approve

@kyoto
Copy link
Member

kyoto commented Jul 14, 2020

/assign @spadgett

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

pkg/server/server.go Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2020
@simonpasquier
Copy link
Contributor Author

/retest

Copy link

@lilic lilic 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2020
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

Thanks 👍

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 17, 2020
@simonpasquier
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@spadgett
Copy link
Member

spadgett commented Jul 17, 2020

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 17, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 20, 2020
@simonpasquier
Copy link
Contributor Author

I've rebased on top of master and the failure is gone. Not sure if it's related.

@spadgett
Copy link
Member

spadgett commented Jul 20, 2020

It looks like the nav test failure is a flake we introduced in #5911 and is unrelated to the PR. I've seen it on a different PR:

https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_console/4831/pull-ci-openshift-console-master-e2e-gcp-console/1284211805777825792

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold cancel

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jul 20, 2020
@spadgett
Copy link
Member

/lgtm cancel
Needs rebase :/

@openshift-ci-robot openshift-ci-robot removed lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 20, 2020
s-urbaniak and others added 2 commits July 20, 2020 17:38
The console backend doesn't need to access the prometheus-k8s service
anymore. All requests are done against the Thanos querier service
instead.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Copy link
Contributor Author

change rebased

@kyoto
Copy link
Member

kyoto commented Jul 20, 2020

/retest

Copy link
Member

@spadgett spadgett 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kyoto, lilic, simonpasquier, spadgett

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 21, 2020
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit ee4d282 into openshift:master Jul 22, 2020
@simonpasquier simonpasquier deleted the pr/5881 branch July 22, 2020 06:47
@spadgett spadgett added this to the v4.6 milestone Jul 28, 2020
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. component/backend Related to backend lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants