-
Notifications
You must be signed in to change notification settings - Fork 16.8k
[stable/grafana] Support multiple types of dashboard provisioning #15770
Conversation
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 Once the patch is verified, the new status will be reflected by the 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. |
/ok-to-test can you ptal? |
@irasnd may you can include your suggestion #15725 (comment) inside the same PR ? |
Ok, I have added another commit which adds this fix. |
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>
/test all |
/lgtm |
[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 |
Thanks ! :-D |
…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>
…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>
…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>
…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>
provisioners optional Signed-off-by: Borna Skukan <skuxay@gmail.com>
provisioners optional. Also bumped version and added entry to README. Signed-off-by: Borna Skukan <skuxay@gmail.com>
…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>
…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>
…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>
…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>
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 ofstable/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 usingstable/grafana
3.7.0 with my proposed fix in #15725 (comment) and thestable/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.]
[stable/chart]
)