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

Build conduit-specific Grafana Docker image #679

Merged
merged 1 commit into from
Apr 5, 2018
Merged

Conversation

siggy
Copy link
Member

@siggy siggy commented Apr 4, 2018

Using a vanilla Grafana Docker image as part of conduit install
avoided maintaining a conduit-specific Grafana Docker image, but made
packaging dashboard json files cumbersome.

Roll our own Grafana Docker image, that includes conduit-specific
dashboard json files. This significantly decreases the conduit install
output size, and enables dashboard integration in the docker-compose
environment.

Fixes #567
Part of #420

Signed-off-by: Andrew Seigner siggy@buoyant.io

@siggy siggy self-assigned this Apr 4, 2018
@siggy siggy requested review from klingerf and rmars April 4, 2018 22:32
@siggy siggy added the review label Apr 4, 2018
Copy link
Member

@olix0r olix0r left a comment

Choose a reason for hiding this comment

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

looks great! one minor comment

@@ -0,0 +1,11 @@
apiVersion: 1
Copy link
Member

Choose a reason for hiding this comment

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

Is this only used for development?

Can you add a comment to this file describing what it's for, preferably with a reference to some source of truth for its format? (Guessing it's http://docs.grafana.org/v5.0/administration/provisioning/#dashboards)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, only for development. I've added a comment and referenced the Grafana docs.

Using a vanilla Grafana Docker image as part of `conduit install`
avoided maintaining a conduit-specific Grafana Docker image, but made
packaging dashboard json files cumbersome.

Roll our own Grafana Docker image, that includes conduit-specific
dashboard json files. This significantly decreases the `conduit install`
output size, and enables dashboard integration in the docker-compose
environment.

Fixes #567
Part of #420

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
@siggy siggy force-pushed the siggy/roll-your-grafana branch from 575253a to d82211f Compare April 5, 2018 20:48
Copy link
Contributor

@klingerf klingerf left a comment

Choose a reason for hiding this comment

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

⭐️ Huge improvement!

@siggy siggy merged commit 9508e11 into master Apr 5, 2018
@siggy siggy deleted the siggy/roll-your-grafana branch April 5, 2018 21:20
@siggy siggy removed the review label Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants