diff options
| author | Kristian Lyngstol <kly@kly.no> | 2016-11-18 18:54:10 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly.no> | 2016-11-18 18:54:10 +0100 |
| commit | c38af8933072bb2b9606cd6490e1a802ab4c4187 (patch) | |
| tree | adf4e5cb65ed1dc5852c7c29e77eb6b1e09e12e3 /build | |
| parent | 06591202ce5549a949343f0f5f8959771a1b5657 (diff) | |
Tweak various graphite/grafana integrations
s3 is currently disabled as it's bugged.
Diffstat (limited to 'build')
| -rw-r--r-- | build/storage-schemas.conf | 4 | ||||
| -rw-r--r-- | build/test/gondul-grafana-test.Dockerfile | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/build/storage-schemas.conf b/build/storage-schemas.conf index 695ec0e..551f753 100644 --- a/build/storage-schemas.conf +++ b/build/storage-schemas.conf @@ -11,6 +11,10 @@ pattern = ^carbon\. retentions = 60:90d +[grafana] +pattern = ^grafana\. +retentions = 10s:1d, 1m:20d + [ping] pattern = ^ping\. retentions = 1s:1d, 1m:20d diff --git a/build/test/gondul-grafana-test.Dockerfile b/build/test/gondul-grafana-test.Dockerfile index 00345b6..33c69b4 100644 --- a/build/test/gondul-grafana-test.Dockerfile +++ b/build/test/gondul-grafana-test.Dockerfile @@ -1,2 +1,8 @@ FROM grafana/grafana:4.0.0-beta1 ENV GF_SERVER_ROOT_URL http://nms-dev.gathering.org/grafana/ +ENV GF_METRICS_GRAPHITE_ADDRESS graphite:2003 +ENV GF_METRICS_GRAPHITE_PREFIX grafana.%(instance_name)s. +ENV GF_EXTERNAL_IMAGE_STORAGE_PROVIDER internal +ENV GF_EXTERNAL_IMAGE_STORAGE_S3_BUCKET_URL http://grafana.situla.bitbit.net/ +ENV GF_EXTERNAL_IMAGE_STORAGE_S3_ACCESS_KEY 8KMMX9F3VZZ6MAZOGFF6 +ENV GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY dTuAqxPGE5SFbtEmJxoZ9Y3AHINOZ5ju0IPfoqfA |