salt,charts: Grafana sidecar picks up dashboards in all namespaces #3620

jbertran · 2021-11-30T14:29:45Z

Component: salt,charts

Context: Allowing solutions to expose dashboards that get picked up by metalk8s' Grafana deployment.

Closes: #3618

bert-e · 2021-11-30T14:29:48Z

Hello jbertran,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-11-30T14:29:53Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/3618-pick-up-dashboards-from-all-namespaces into
development/2.11
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-11-30T14:29:54Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

charts/kube-prometheus-stack/charts/grafana/values.yaml

bert-e · 2021-12-03T14:47:40Z

History mismatch

Merge commit #96cb4e6849a0e93e274d727a76d583af3501cb9e on the integration branch
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces is merging a branch which is neither the current
branch improvement/3618-pick-up-dashboards-from-all-namespaces nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/3618-pick-up-dashboards-from-all-namespaces and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

salt/metalk8s/addons/prometheus-operator/deployed/chart.sls

jbertran · 2021-12-03T14:58:32Z

/reset

bert-e · 2021-12-03T14:58:38Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-12-03T14:58:44Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/3618-pick-up-dashboards-from-all-namespaces into
development/2.11
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-12-03T14:58:45Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

NicolasT

Chart needs to be re-rendered with the 'right' command (see other comment).

bert-e · 2021-12-03T16:06:19Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

bert-e · 2021-12-03T16:38:44Z

History mismatch

Merge commit #88030820f89ecbdeeefce932b0ad12142c479d54 on the integration branch
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces is merging a branch which is neither the current
branch improvement/3618-pick-up-dashboards-from-all-namespaces nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/3618-pick-up-dashboards-from-all-namespaces and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

charts/kube-prometheus-stack/charts/grafana/values.yaml

Issue handled but Teddy's comment remains

NicolasT

Couple of other things:

Needs CHANGELOG entry
Likely needs some small documentation in the dev guide
May benefit from a test?

jbertran · 2021-12-06T14:12:43Z

Couple of other things:

Needs CHANGELOG entry

Likely needs some small documentation in the dev guide

May benefit from a test?

Changelog, docs update: done.
Tests: since the effect of this change is local to a generated chart.sls where the diff does not depend on Jinja to be rendered, I don't know what to test here.

tests/post/steps/test_monitoring.py

Seems fixed :)

jbertran · 2022-01-05T09:23:37Z

/approve

bert-e · 2022-01-05T09:23:41Z

History mismatch

Merge commit #88030820f89ecbdeeefce932b0ad12142c479d54 on the integration branch
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces is merging a branch which is neither the current
branch improvement/3618-pick-up-dashboards-from-all-namespaces nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/3618-pick-up-dashboards-from-all-namespaces and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

jbertran · 2022-01-05T09:23:54Z

/reset

bert-e · 2022-01-05T09:23:59Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

bert-e · 2022-01-05T09:24:06Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/3618-pick-up-dashboards-from-all-namespaces into
development/2.11
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

bert-e · 2022-01-05T11:14:39Z

Conflict

There is a conflict between your branch improvement/3618-pick-up-dashboards-from-all-namespaces and the
destination branch development/2.11.

Please resolve the conflict on the feature branch (improvement/3618-pick-up-dashboards-from-all-namespaces).

git fetch && \
git checkout origin/improvement/3618-pick-up-dashboards-from-all-namespaces && \
git merge origin/development/2.11

Resolve merge conflicts and commit

git push origin HEAD:improvement/3618-pick-up-dashboards-from-all-namespaces

The following options are set: approve

Configure k8s-sidecar in Grafana deployment: * to search in `ALL` namespaces * to place dashboards in folders according to `metalk8s.scality.com/grafana-folder-name` annotation * to create Grafana folders from dashboard directory structure Re-render chart to salt state using ``` ./charts/render.py prometheus-operator \ charts/kube-prometheus-stack.yaml \ charts/kube-prometheus-stack/ \ --namespace metalk8s-monitoring \ --service-config grafana \ metalk8s-grafana-config \ metalk8s/addons/prometheus-operator/config/grafana.yaml \ metalk8s-monitoring \ --service-config prometheus \ metalk8s-prometheus-config \ metalk8s/addons/prometheus-operator/config/prometheus.yaml \ metalk8s-monitoring \ --service-config alertmanager \ metalk8s-alertmanager-config \ metalk8s/addons/prometheus-operator/config/alertmanager.yaml \ metalk8s-monitoring \ --service-config dex \ metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ --drop-prometheus-rules charts/drop-prometheus-rules.yaml \ --patch 'PrometheusRule,metalk8s-monitoring,prometheus-operator-kubernetes-system-kubelet,spec:groups:0:rules:1:for,"5m"' \ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls ``` Fixes: #3618

Grafana is expected to: * Add dashboards as we add ConfigMaps with the right label to any namespace, in folders according to the `metalk8s.scality.com/grafana-folder-name` annotation * Delete dashboards if the corresponding ConfigMaps are deleted.

bert-e · 2022-01-05T12:58:25Z

History mismatch

Merge commit #55b586e7361183f4ad9ea02b1a207f7af7fafcad on the integration branch
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces is merging a branch which is neither the current
branch improvement/3618-pick-up-dashboards-from-all-namespaces nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/3618-pick-up-dashboards-from-all-namespaces and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

jbertran · 2022-01-05T12:59:20Z

/reset

bert-e · 2022-01-05T12:59:26Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

bert-e · 2022-01-05T12:59:32Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/3618-pick-up-dashboards-from-all-namespaces into
development/2.11
w/123.0/improvement/3618-pick-up-dashboards-from-all-namespaces will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

bert-e · 2022-01-05T12:59:35Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

bert-e · 2022-01-06T10:08:16Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.11
✔️ development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2022-01-07T12:10:13Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.11
✔️ development/123.0

The following branches have NOT changed:

development/2.0
development/2.1
development/2.10
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye jbertran.

gdemonet reviewed Dec 3, 2021

View reviewed changes

charts/kube-prometheus-stack/charts/grafana/values.yaml Outdated Show resolved Hide resolved

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from 96cb4e6 to 0d8c05a Compare December 3, 2021 14:47

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from 0d8c05a to 60163c4 Compare December 3, 2021 14:52

jbertran requested review from a team, francoisferrand and lavigne958 December 3, 2021 14:52

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch 2 times, most recently from 5613597 to 8803082 Compare December 3, 2021 14:54

jbertran commented Dec 3, 2021

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/chart.sls Outdated Show resolved Hide resolved

jbertran marked this pull request as ready for review December 3, 2021 14:58

NicolasT previously requested changes Dec 3, 2021

View reviewed changes

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from 8803082 to a2cd78c Compare December 3, 2021 16:38

jbertran requested a review from NicolasT December 3, 2021 16:40

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from a2cd78c to 7d8fb3e Compare December 3, 2021 16:53

TeddyAndrieux previously requested changes Dec 3, 2021

View reviewed changes

charts/kube-prometheus-stack/charts/grafana/values.yaml Outdated Show resolved Hide resolved

NicolasT reviewed Dec 6, 2021

View reviewed changes

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch 2 times, most recently from 39a27db to d20a53e Compare December 6, 2021 14:10

jbertran requested a review from gdemonet December 22, 2021 16:24

gdemonet approved these changes Dec 23, 2021

View reviewed changes

gdemonet suggested changes Dec 23, 2021

View reviewed changes

tests/post/steps/test_monitoring.py Show resolved Hide resolved

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from ab3d17b to d73f9fd Compare December 28, 2021 11:22

jbertran requested a review from gdemonet December 28, 2021 11:22

gdemonet previously approved these changes Jan 4, 2022

View reviewed changes

lavigne958 previously approved these changes Jan 5, 2022

View reviewed changes

Jordi Bertran de Balanda added 2 commits January 5, 2022 13:58

jbertran dismissed stale reviews from lavigne958 and gdemonet via 5b5575f January 5, 2022 12:58

jbertran force-pushed the improvement/3618-pick-up-dashboards-from-all-namespaces branch from d73f9fd to 5b5575f Compare January 5, 2022 12:58

lavigne958 approved these changes Jan 5, 2022

View reviewed changes

gdemonet approved these changes Jan 6, 2022

View reviewed changes

bert-e merged commit 284ea2f into development/2.11 Jan 7, 2022

bert-e deleted the improvement/3618-pick-up-dashboards-from-all-namespaces branch January 7, 2022 12:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

salt,charts: Grafana sidecar picks up dashboards in all namespaces #3620

salt,charts: Grafana sidecar picks up dashboards in all namespaces #3620

jbertran commented Nov 30, 2021 •

edited

Loading

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Dec 3, 2021

jbertran commented Dec 3, 2021

bert-e commented Dec 3, 2021

bert-e commented Dec 3, 2021

bert-e commented Dec 3, 2021

NicolasT left a comment

bert-e commented Dec 3, 2021

bert-e commented Dec 3, 2021

NicolasT left a comment

jbertran commented Dec 6, 2021 •

edited

Loading

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 5, 2022

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 5, 2022

bert-e commented Jan 6, 2022

bert-e commented Jan 7, 2022

salt,charts: Grafana sidecar picks up dashboards in all namespaces #3620

salt,charts: Grafana sidecar picks up dashboards in all namespaces #3620

Conversation

jbertran commented Nov 30, 2021 • edited Loading

bert-e commented Nov 30, 2021

Hello jbertran,

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

bert-e commented Dec 3, 2021

History mismatch

jbertran commented Dec 3, 2021

bert-e commented Dec 3, 2021

Reset complete

bert-e commented Dec 3, 2021

Integration data created

bert-e commented Dec 3, 2021

Waiting for approval

NicolasT left a comment

Choose a reason for hiding this comment

bert-e commented Dec 3, 2021

Waiting for approval

bert-e commented Dec 3, 2021

History mismatch

NicolasT left a comment

Choose a reason for hiding this comment

jbertran commented Dec 6, 2021 • edited Loading

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

History mismatch

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

Reset complete

bert-e commented Jan 5, 2022

Integration data created

bert-e commented Jan 5, 2022

Conflict

bert-e commented Jan 5, 2022

History mismatch

jbertran commented Jan 5, 2022

bert-e commented Jan 5, 2022

Reset complete

bert-e commented Jan 5, 2022

Integration data created

bert-e commented Jan 5, 2022

Waiting for approval

bert-e commented Jan 6, 2022

In the queue

bert-e commented Jan 7, 2022

jbertran commented Nov 30, 2021 •

edited

Loading

jbertran commented Dec 6, 2021 •

edited

Loading