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

[stable/grafana] Support multiple types of dashboard provisioning #15770

Merged
merged 3 commits into from
Jul 24, 2019
Merged

[stable/grafana] Support multiple types of dashboard provisioning #15770

merged 3 commits into from
Jul 24, 2019

Conversation

irasnyd
Copy link
Contributor

@irasnyd irasnyd commented Jul 22, 2019

What this PR does / why we need it:

Support both the "standard" method of dashboard provisioning and the "sidecar" method of dashboard provisioning within this Helm chart, at the same time.

The Grafana chart currently supports both methods of automated dashboard provisioning, however both methods are not supported at the same time. This is a limitation of the Helm chart, which has been lifted by this commit.

This PR was created so that I can use the stable/prometheus-operator Helm chart, version 6.0.0 to deploy Grafana with Kubernetes monitoring dashboards. In addition to the dashboards which are part of stable/prometheus-operator, I wish to have additional dashboards from the Official Grafana Dashboard Hub provisioned automatically. This commit lifts the Helm chart's restriction on doing both of these two types of dashboard provisioning at the same time.

Which issue this PR fixes

No issue was created.

Special notes for your reviewer:

The automatic Grafana dashboard provisioning has been broken since stable/grafana version 3.5.6. Please see Issue #15725 for further information. I have tested this change by using stable/grafana 3.7.0 with my proposed fix in #15725 (comment) and the stable/prometheus-operator chart version 6.0.0.

I have mentioned all maintainers listed in Chart.yaml, per the instructions in the PR template:
@zanhsieh
@rtluckie
@maorfr

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [stable/chart])

@helm-bot helm-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Jul 22, 2019
@k8s-ci-robot k8s-ci-robot requested a review from maorfr July 22, 2019 23:53
@helm-bot helm-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 22, 2019
@k8s-ci-robot k8s-ci-robot requested a review from zanhsieh July 22, 2019 23:53
@k8s-ci-robot
Copy link
Contributor

Hi @irasnyd. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 22, 2019
@maorfr
Copy link
Member

maorfr commented Jul 23, 2019

/ok-to-test
/assign @zanhsieh

can you ptal?

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 23, 2019
stable/grafana/Chart.yaml Outdated Show resolved Hide resolved
@obeyler
Copy link
Contributor

obeyler commented Jul 23, 2019

@irasnd may you can include your suggestion #15725 (comment) inside the same PR ?

@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). and removed Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Jul 23, 2019
@irasnyd
Copy link
Contributor Author

irasnyd commented Jul 23, 2019

@irasnd may you can include your suggestion #15725 (comment) inside the same PR ?

Ok, I have added another commit which adds this fix.

Ira W. Snyder added 3 commits July 23, 2019 09:46
Support both the "standard" method of dashboard provisioning and the
"sidecar" method of dashboard provisioning within this Helm chart, at
the same time.

The Grafana chart currently supports both methods of automated dashboard
provisioning, however both methods are not supported at the same time.
This is a limitation of the Helm chart, which has been lifted by this
commit.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
Dashboard provisioning has been broken since stable/grafana 3.5.6. See
Issue #15725. This commit fixes dashobard provisioning.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
As requested by PR review comments.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
@zanhsieh
Copy link
Collaborator

/test all

@zanhsieh
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: irasnyd, zanhsieh

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2019
@k8s-ci-robot k8s-ci-robot merged commit 0771fc7 into helm:master Jul 24, 2019
@obeyler
Copy link
Contributor

obeyler commented Jul 25, 2019

Ok, I have added another commit which adds this fix.

Thanks !

:-D

ThoTischner pushed a commit to bitsbeats/charts that referenced this pull request Aug 13, 2019
…lm#15770)

* Support multiple types of dashboard provisioning

Support both the "standard" method of dashboard provisioning and the
"sidecar" method of dashboard provisioning within this Helm chart, at
the same time.

The Grafana chart currently supports both methods of automated dashboard
provisioning, however both methods are not supported at the same time.
This is a limitation of the Helm chart, which has been lifted by this
commit.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Fix dashboard provisioning

Dashboard provisioning has been broken since stable/grafana 3.5.6. See
Issue helm#15725. This commit fixes dashobard provisioning.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Update chart version

As requested by PR review comments.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
landorg pushed a commit to landorg/charts that referenced this pull request Aug 19, 2019
…lm#15770)

* Support multiple types of dashboard provisioning

Support both the "standard" method of dashboard provisioning and the
"sidecar" method of dashboard provisioning within this Helm chart, at
the same time.

The Grafana chart currently supports both methods of automated dashboard
provisioning, however both methods are not supported at the same time.
This is a limitation of the Helm chart, which has been lifted by this
commit.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Fix dashboard provisioning

Dashboard provisioning has been broken since stable/grafana 3.5.6. See
Issue helm#15725. This commit fixes dashobard provisioning.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Update chart version

As requested by PR review comments.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
Signed-off-by: Roland Gritzer <gritzer.roland@gmail.com>
kengou pushed a commit to kengou/charts that referenced this pull request Sep 18, 2019
…lm#15770)

* Support multiple types of dashboard provisioning

Support both the "standard" method of dashboard provisioning and the
"sidecar" method of dashboard provisioning within this Helm chart, at
the same time.

The Grafana chart currently supports both methods of automated dashboard
provisioning, however both methods are not supported at the same time.
This is a limitation of the Helm chart, which has been lifted by this
commit.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Fix dashboard provisioning

Dashboard provisioning has been broken since stable/grafana 3.5.6. See
Issue helm#15725. This commit fixes dashobard provisioning.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Update chart version

As requested by PR review comments.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
ramkumarvs pushed a commit to yugabyte/charts-helm-fork that referenced this pull request Sep 30, 2019
…lm#15770)

* Support multiple types of dashboard provisioning

Support both the "standard" method of dashboard provisioning and the
"sidecar" method of dashboard provisioning within this Helm chart, at
the same time.

The Grafana chart currently supports both methods of automated dashboard
provisioning, however both methods are not supported at the same time.
This is a limitation of the Helm chart, which has been lifted by this
commit.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Fix dashboard provisioning

Dashboard provisioning has been broken since stable/grafana 3.5.6. See
Issue helm#15725. This commit fixes dashobard provisioning.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>

* Update chart version

As requested by PR review comments.

Signed-off-by: Ira W. Snyder <isnyder@lco.global>
skuxy added a commit to skuxy/charts that referenced this pull request Nov 27, 2019
provisioners optional

Signed-off-by: Borna Skukan <skuxay@gmail.com>
skuxy added a commit to skuxy/charts that referenced this pull request Nov 27, 2019
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>
k8s-ci-robot pushed a commit that referenced this pull request Dec 6, 2019
…19177)

* Trying to alleviate change introduced in #15770 by making multiple
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Further version bump

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Making default behaviour same as before

Signed-off-by: Borna Skukan <skuxay@gmail.com>
WyriHaximus pushed a commit to WyriHaximus-labs/charts that referenced this pull request Dec 14, 2019
…elm#19177)

* Trying to alleviate change introduced in helm#15770 by making multiple
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Further version bump

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Making default behaviour same as before

Signed-off-by: Borna Skukan <skuxay@gmail.com>
dargolith pushed a commit to dargolith/charts that referenced this pull request Jan 10, 2020
…elm#19177)

* Trying to alleviate change introduced in helm#15770 by making multiple
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Further version bump

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Making default behaviour same as before

Signed-off-by: Borna Skukan <skuxay@gmail.com>
arturrez pushed a commit to arturrez/stable-charts that referenced this pull request Jan 28, 2020
…elm#19177)

* Trying to alleviate change introduced in helm#15770 by making multiple
provisioners optional. Also bumped version and added entry to README.

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Further version bump

Signed-off-by: Borna Skukan <skuxay@gmail.com>

* Making default behaviour same as before

Signed-off-by: Borna Skukan <skuxay@gmail.com>
Signed-off-by: Artur <artur@upbound.io>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants