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

Documentation: Add Grafana dashboard to etcd monitoring mixin #9789

Merged
merged 1 commit into from
May 30, 2018

Conversation

brancz
Copy link
Contributor

@brancz brancz commented May 30, 2018

This PR adds the Grafana dashboard to the etcd monitoring mixin, initially added in #9640. It also formats the jsonnet code to the standard form.

Additionally I added datasource and job templating to the dashboard and re-generated the rendered dashboard json in Documentation/op-guide with:

jsonnet -S -e "std.manifestJsonEx((import 'mixin.libsonnet').grafanaDashboards, '    ')" > ../op-guide/grafana.json

We may want to add this to CI at some point, but I hear @tomwilkie is building a general mixin-tool, so I'd prefer to just postpone anything regarding CI until that all-in-one tool is ready.

@tomwilkie @metalmatze @gyuho

@codecov-io
Copy link

Codecov Report

Merging #9789 into master will decrease coverage by 0.14%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #9789      +/-   ##
=========================================
- Coverage   64.04%   63.9%   -0.15%     
=========================================
  Files         376     376              
  Lines       35236   35236              
=========================================
- Hits        22568   22517      -51     
- Misses      11068   11116      +48     
- Partials     1600    1603       +3
Impacted Files Coverage Δ
etcdserver/api/v3rpc/util.go 43.47% <0%> (-26.09%) ⬇️
pkg/adt/interval_tree.go 81.38% <0%> (-8.71%) ⬇️
pkg/tlsutil/tlsutil.go 86.2% <0%> (-6.9%) ⬇️
clientv3/namespace/watch.go 72.72% <0%> (-6.07%) ⬇️
etcdserver/api/v3rpc/watch.go 73.75% <0%> (-3.99%) ⬇️
mvcc/watcher.go 96.29% <0%> (-3.71%) ⬇️
etcdserver/v3_server.go 62.67% <0%> (-1.44%) ⬇️
proxy/grpcproxy/watch.go 86.33% <0%> (-1.25%) ⬇️
etcdserver/api/v2http/client.go 84.3% <0%> (-1.21%) ⬇️
proxy/grpcproxy/lease.go 79.63% <0%> (-0.91%) ⬇️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e2a6489...778bfe1. Read the comment docs.

@@ -6,226 +6,1302 @@
prometheusAlerts+:: {
groups+: [
{
name: "etcd",
name: 'etcd',
rules: [
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks great, just a nit/question. I thought it was JSON standard to use double quotes for strings. Just curious why the choice of single, is this the preference for Prometheus configs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It’s actually jsonnet convention, I just use the official jsonnet formatting, I have 0 hard feelings for any style things, just doing the best practice offered by the tooling.

The rendered json does use double quotes.

Copy link
Contributor

Choose a reason for hiding this comment

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

@brancz thanks for explaining, I figured I was missing something.

Copy link
Contributor

@gyuho gyuho left a comment

Choose a reason for hiding this comment

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

lgtm. thanks @brancz !

@gyuho gyuho merged commit d2d8c57 into etcd-io:master May 30, 2018
@brancz brancz deleted the mixin-dashboard branch May 30, 2018 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants