Ubuntu Docker Images

Merge ~valentinviennot/ubuntu-docker-images:update-grafana-readme into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge

  1. Git
  2. lp:~valentinviennot/ubuntu-docker-images
  3. update-grafana-readme
  4. Merge into edge
Proposed by Valentin Viennot
Status: Merged
Merged at revision: adf39eb9d525c6efd0e533de53ea90ae205a5ed4
Proposed branch: ~valentinviennot/ubuntu-docker-images:update-grafana-readme
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge
Diff against target: 52 lines (+7/-12)
1 file modified
README.md (+7/-12)
Reviewer Review Type Date Requested Status
Lucas Kanashiro Approve
Sergio Durigan Junior Pending
Review via email: mp+394054@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

LGTM, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 3c0ab78..1bf0ecd 100644
3--- a/README.md
4+++ b/README.md
5@@ -2,7 +2,7 @@
6
7 ## About Grafana
8
9-Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics.
10+Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics. Read more on the [Grafana website](https://grafana.com/docs/).
11
12 ## Tags
13
14@@ -17,24 +17,19 @@ Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Ela
15 ### Docker CLI
16
17 ```sh
18-$ docker run --name grafana -p 3000:3000 -d -e TZ=Europe/London squeakywheel/grafana:edge
19+$ docker run -d --name grafana -p 30000:3000 -e TZ=Europe/London squeakywheel/grafana:edge
20 ```
21
22-Access your Grafana instance at `localhost:3000`.
23-
24-Since containers are ephemeral, you may want to use persistent data rather than initializing a new database for each newly launched container. To do this, you can use docker volumes:
25-
26-```sh
27-$ docker run --name grafana -p 3000:3000 -e TZ=Europe/London -d -v /path/to/persisted/data:/var/lib/grafana squeakywheel/grafana:edge
28-```
29+Access your Grafana instance at `localhost:30000`.
30
31 #### Parameters
32
33 | Parameter | Description |
34 |---|---|
35 | `-e TZ=UTC` | Timezone. |
36-| `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard`. |
37-| `-p 3000:3000` | Expose Grafana on `localhost:3000` |
38+| `-p 30000:3000` | Expose Grafana on `localhost:30000`. |
39+| `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)). |
40+| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a voulme instead of initializing a new database for each newly launched container. |
41
42 #### Debugging
43
44@@ -54,7 +49,7 @@ With microk8s running, enable the `dns` and `storage` add-ons:
45 $ microk8s enable dns storage
46 ```
47
48-Create a configmap for the provisioning configuration files (check the upstream documentation [here](https://grafana.com/docs/grafana/latest/administration/provisioning/) on how to provision a dashboard):
49+Create a configmap for the provisioning configuration files (check the [Grafana documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/) on how to provision a dashboard):
50
51 ```sh
52 $ microk8s kubectl create configmap grafana-config --from-file=grafana-datasource=config/datasource.yml --from-file=grafana-dashboard-definition=config/dashboard.yml --from-file=grafana-dashboard=config/system-stats-dashboard.json

Subscribers

People subscribed via source and target branches