diff options
| author | Paweł Dybiec <pawel.to.malpa@gmail.com> | 2019-04-17 17:25:02 +0200 |
|---|---|---|
| committer | Paweł Dybiec <pawel.to.malpa@gmail.com> | 2019-04-17 17:25:02 +0200 |
| commit | 9a0f37e71fd21140f21d5e49a3130ab3299dd9ef (patch) | |
| tree | 81ded878379e246f827b29b287359fa9a1b236bd | |
| parent | Change tabs, shorten bootstrapping (diff) | |
Inlined grafana config
| -rw-r--r-- | composer/grafana/docker-compose.yml | 38 | ||||
| -rw-r--r-- | composer/monitoring/prometheus/prometheus.yml (renamed from composer/grafana/prometheus/prometheus.yml) | 0 | ||||
| -rw-r--r-- | docker.yml | 37 |
3 files changed, 36 insertions, 39 deletions
diff --git a/composer/grafana/docker-compose.yml b/composer/grafana/docker-compose.yml deleted file mode 100644 index 02d2555..0000000 --- a/composer/grafana/docker-compose.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: '2' -volumes: - grafana-storage: - external: - name: grafana_storage -services: - grafana: - image: grafana/grafana - ports: - - "127.0.0.1:5002:3000" - environment: - - GF_SERVER_ROOT_URL=http://grafana.dybiec.info - - GF_SECURITY_ADMIN_PASSWORD=very_secret - volumes: - - "grafana-storage:/var/lib/grafana" - restart: always - prometheus: - expose: - - 9090 - ports: - - "127.0.0.1:5003:9090" - image: prom/prometheus - extra_hosts: - - "dockerhost:172.17.0.1" - volumes: - - "./prometheus:/etc/prometheus/" - restart: always - cadvisor: - image: google/cadvisor - expose: - - 8080 - volumes: - - "/:/rootfs:ro" - - "/var/run:/var/run:ro" - - "/sys:/sys:ro" - - "/var/lib/docker:/var/lib/docker:ro" - - "/dev/disk:/dev/disk:ro" - diff --git a/composer/grafana/prometheus/prometheus.yml b/composer/monitoring/prometheus/prometheus.yml index 2903091..2903091 100644 --- a/composer/grafana/prometheus/prometheus.yml +++ b/composer/monitoring/prometheus/prometheus.yml diff --git a/docker.yml b/docker.yml index d1d08b1..642fdc6 100644 --- a/docker.yml +++ b/docker.yml @@ -18,7 +18,42 @@ project_src: composer/gitea - name: grafana docker_service: - project_src: composer/grafana + project_name: grafana + definition: + version: '2' + volumes: + grafana-storage: + external: + name: grafana_storage + services: + grafana: + image: grafana/grafana + ports: + - "127.0.0.1:5002:3000" + environment: + - GF_SERVER_ROOT_URL=http://grafana.dybiec.info + - GF_SECURITY_ADMIN_PASSWORD=very_secret + volumes: + - "grafana-storage:/var/lib/grafana" + restart: always + prometheus: + image: prom/prometheus + expose: [9090] + extra_hosts: + - "dockerhost:172.17.0.1" + volumes: + - "~/composer/monitoring/prometheus:/etc/prometheus/:ro" + restart: always + cadvisor: + image: google/cadvisor + expose: [8080] + volumes: + - "/:/rootfs:ro" + - "/var/run:/var/run:ro" + - "/sys:/sys:ro" + - "/var/lib/docker:/var/lib/docker:ro" + - "/dev/disk:/dev/disk:ro" + restart: always - name: registry docker_service: project_src: composer/registry |