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

docs/release: add step to update dashboards to grafana.com #14312

Merged
merged 1 commit into from
Dec 11, 2020

Conversation

aanm
Copy link
Member

@aanm aanm commented Dec 8, 2020

Signed-off-by: André Martins andre@cilium.io

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Dec 8, 2020
@aanm aanm requested a review from joestringer December 8, 2020 21:26
@aanm aanm requested review from a team as code owners December 8, 2020 21:26
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Dec 8, 2020
Comment on lines +61 to +63
- [ ] Update Grafana dashboards (only for vX.Y.0)
- Install the dashboards available in ``./examples/kubernetes/addons/prometheus``
and use them to upload them to Grafana.com.
Copy link
Member

Choose a reason for hiding this comment

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

Does "Install" mean follow the directions in the README.md in that directory to create prometheus+grafana in your cluster? And then there's an upload button from the UI?

Copy link
Member

Choose a reason for hiding this comment

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

Seems like somewhere in the overall development process we should also be doing a make -C examples/kubernetes/addons/prometheus, since that's currently showing a diff for me:

diff --git a/examples/kubernetes/addons/prometheus/monitoring-example.yaml b/examples/kubernetes/addons/prometheus/monitoring-example.yaml
index 7e5541543a78..fd33286bbfd7 100644
--- a/examples/kubernetes/addons/prometheus/monitoring-example.yaml
+++ b/examples/kubernetes/addons/prometheus/monitoring-example.yaml
@@ -4475,7 +4475,7 @@ data:
               "expr": "avg(rate(cilium_nodes_all_events_received_total{k8s_app=\"cilium\"}[1m])) by (pod, event_type, source) * 60",
               "format": "time_series",
               "intervalFactor": 1,
-              "legendFormat": "{{event_type}} {{source}}",
+              "legendFormat": "{{eventType}} {{source}}",
               "refId": "B"
             }
           ],

Copy link
Member Author

Choose a reason for hiding this comment

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

Does "Install" mean follow the directions in the README.md in that directory to create prometheus+grafana in your cluster? And then there's an upload button from the UI?

@joestringer, no, there's an "share" button that exports as a json file for which we need to upload it to grafana.com manually.

Copy link
Member

Choose a reason for hiding this comment

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

Is that the same as examples/kubernetes/addons/prometheus/files/grafana-dashboards/*.json, or different?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's different because it will create some fields that can be variable, i.e. the prometheus URL, where in our jsons they seem to be statically configured to use the prometheus instance that is created in the monitoring-example.yaml

Copy link
Member

Choose a reason for hiding this comment

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

OK thanks for clarifying.

I think that the comment as-is is enough to provide a reminder to do something, but as evidenced by my line of questioning above I'm not sure if it's obvious enough how to actually do it. It's a pity it requires some manual UI interaction to get the proper format out :(

That said, we can probably figure it out when it comes down to the actual release. No doubt we'll go through this step during v1.10 and we can always revise whether there's more detail we need to add to the description here.

@aanm aanm requested a review from joestringer December 9, 2020 09:53
@jrajahalme jrajahalme merged commit f8a18d1 into cilium:master Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants