Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Update Prometheus Operator #757

Merged
merged 6 commits into from
Aug 6, 2020
Merged

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Aug 3, 2020

No description provided.

@surajssd surajssd force-pushed the surajssd/update-prometheus-operator-new branch from 1458bbd to fce491f Compare August 4, 2020 07:06
@surajssd surajssd force-pushed the surajssd/update-prometheus-operator-new branch 4 times, most recently from cd349af to 2aeac56 Compare August 5, 2020 09:43
@surajssd surajssd marked this pull request as ready for review August 5, 2020 10:24
@surajssd surajssd force-pushed the surajssd/update-prometheus-operator-new branch 3 times, most recently from a096768 to 0372f74 Compare August 5, 2020 12:32
@invidian
Copy link
Member

invidian commented Aug 5, 2020

@surajssd ping me when this is ready for reviewing :)

@surajssd
Copy link
Member Author

surajssd commented Aug 5, 2020

@invidian the PR is ready for review, I just saw weird behaviour on AKS that's it. Otherwise the PR is okay to review.

invidian
invidian previously approved these changes Aug 5, 2020
Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

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

LGTM

@surajssd
Copy link
Member Author

surajssd commented Aug 5, 2020

@invidian I verified the Grafana dashboards. Only there is one problem that Kubernetes / API Server dashboard does not show up on Grafana UI but the logs say it is loaded without issues. Have you seen such issue before?

@invidian
Copy link
Member

invidian commented Aug 5, 2020

@invidian I verified the Grafana dashboards. Only there is one problem that Kubernetes / API Server dashboard does not show up on Grafana UI but the logs say it is loaded without issues. Have you seen such issue before?

Hm, no, not really. Does it work fine if you install via helm binary?

@surajssd
Copy link
Member Author

surajssd commented Aug 5, 2020

@invidian I have verified and it works with helm.

@surajssd surajssd force-pushed the surajssd/update-prometheus-operator-new branch from 8dbfe80 to 3e2d8ff Compare August 5, 2020 14:56
@surajssd
Copy link
Member Author

surajssd commented Aug 5, 2020

I think I have fixed all the issues that were pending. Now this PR is good for final review.

@surajssd
Copy link
Member Author

surajssd commented Aug 5, 2020

Found the issue, we have two files both called apiserver.json. One comes from the prometheus-operator and another comes from the contour.

$ find ./ -name apiserver.json
./assets/components/contour/dashboards/apiserver.json
$ grep apiserver.json assets/components/prometheus-operator/manifests/
assets/components/prometheus-operator/manifests/templates/grafana/dashboards-1.14/apiserver.yaml
22:  apiserver.json: |-

I have made changes to the contour dashboard in the last commit.

@surajssd surajssd requested a review from invidian August 5, 2020 16:49
@surajssd surajssd requested a review from invidian August 6, 2020 06:39
invidian
invidian previously approved these changes Aug 6, 2020
Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

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

LGTM, awesome work @surajssd!

knrt10
knrt10 previously approved these changes Aug 6, 2020
Copy link
Member

@knrt10 knrt10 left a comment

Choose a reason for hiding this comment

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

Look great @surajssd .

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
This is change deviating from upstream so that we can get around the
issue of long PVC names.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
Return when the test that wants error, errors out. This means the test
has passed and should not be proceeded further.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
CRDs that don't have annotation `helm.sh/hook: crd-install` cause the
helm to install them multiple times thus failing.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
Remove the old outdated queries and update it with new metrics.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
This file is renamed so that it does not conflict with the kubernetes
apiserver dashboard.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
@surajssd surajssd dismissed stale reviews from knrt10 and invidian via 4b9f218 August 6, 2020 09:26
@surajssd surajssd force-pushed the surajssd/update-prometheus-operator-new branch from 3e2d8ff to 4b9f218 Compare August 6, 2020 09:26
@surajssd surajssd merged commit c0c9d16 into master Aug 6, 2020
@surajssd surajssd deleted the surajssd/update-prometheus-operator-new branch August 6, 2020 12:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants