fixed datasrouce in dashboard

Signed-off-by: Brian Christner <brian.christner@gmail.com>
This commit is contained in:
Brian Christner 2018-03-11 22:32:12 +01:00
parent 912d8378b6
commit 700ff45b8c
No known key found for this signature in database
GPG key ID: ECA21DC2A2758F38
6 changed files with 184 additions and 11 deletions

103
docker-compose.yml.new Normal file
View file

@ -0,0 +1,103 @@
version: '3.1'
volumes:
prometheus_data: {}
grafana_data: {}
networks:
front-tier:
back-tier:
services:
prometheus:
image: prom/prometheus:v2.0.0
volumes:
- ./prometheus/:/etc/prometheus/
- prometheus_data:/prometheus
command:
- '--config.file=/etc/prometheus/prometheus.yml'
- '--storage.tsdb.path=/prometheus'
- '--web.console.libraries=/usr/share/prometheus/console_libraries'
- '--web.console.templates=/usr/share/prometheus/consoles'
ports:
- 9090:9090
links:
- cadvisor:cadvisor
- alertmanager:alertmanager
depends_on:
- cadvisor
networks:
- back-tier
restart: always
deploy:
placement:
constraints:
- node.hostname == ${HOSTNAME}
node-exporter:
image: prom/node-exporter
volumes:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
- /:/rootfs:ro
command:
- '--path.procfs=/host/proc'
- '--path.sysfs=/host/sys'
- --collector.filesystem.ignored-mount-points
- "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
ports:
- 9100:9100
networks:
- back-tier
restart: always
deploy:
mode: global
alertmanager:
image: prom/alertmanager
ports:
- 9093:9093
volumes:
- "./alertmanager/:/etc/alertmanager/"
networks:
- back-tier
restart: always
command:
- '--config.file=/etc/alertmanager/config.yml'
- '--storage.path=/alertmanager'
deploy:
placement:
constraints:
- node.hostname == ${HOSTNAME}
cadvisor:
image: google/cadvisor
volumes:
- /:/rootfs:ro
- /var/run:/var/run:rw
- /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro
ports:
- 8080:8080
networks:
- back-tier
restart: always
deploy:
mode: global
grafana:
image: grafana/grafana
depends_on:
- prometheus
ports:
- 3000:3000
volumes:
- grafana_data:/var/lib/grafana
env_file:
- config.monitoring
networks:
- back-tier
- front-tier
restart: always

70
docker-compose.yml.orig Normal file
View file

@ -0,0 +1,70 @@
version: "2"
volumes:
prometheus_data: {}
grafana_data: {}
networks:
front-tier:
driver: bridge
back-tier:
driver: bridge
services:
prometheus:
image: prom/prometheus
container_name: prometheus
volumes:
- ./prometheus/:/etc/prometheus/
- prometheus_data:/prometheus
command:
- '-config.file=/etc/prometheus/prometheus.yml'
- '-storage.local.path=/prometheus'
- '-alertmanager.url=http://alertmanager:9093'
expose:
- 9090
ports:
- 9090:9090
links:
- alertmanager:alertmanager
- metrics:metrics
networks:
- back-tier
alertmanager:
image: prom/alertmanager
ports:
- 9093:9093
volumes:
- ./alertmanager/:/etc/alertmanager/
networks:
- back-tier
command:
- '-config.file=/etc/alertmanager/config.yml'
- '-storage.path=/alertmanager'
grafana:
image: grafana/grafana
depends_on:
- prometheus
ports:
- 3000:3000
volumes:
- grafana_data:/var/lib/grafana
env_file:
- config.monitoring
networks:
- back-tier
- front-tier
metrics:
tty: true
stdin_open: true
expose:
- 9171
image: infinityworks/github-exporter:latest
environment:
- REPOS=freeCodeCamp/freeCodeCamp,docker/docker
- GITHUB_TOKEN=675b6e450c397991e76d71014ac1d8ba3ad58c0e
networks:
- back-tier

View file

@ -1,7 +1,7 @@
apiVersion: 1
providers:
- name: 'Prometheus'
- name: 'prometheus'
orgId: 1
folder: ''
type: file

View file

@ -1,7 +1,7 @@
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"name": "prometheus",
"label": "Prometheus",
"description": "Standard Prometheus datasource",
"type": "datasource",
@ -85,7 +85,7 @@
"stars": "#1F78C1"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"editable": true,
"error": false,
"fill": 1,
@ -169,7 +169,7 @@
"Open Issues": "#C15C17"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"editable": true,
"error": false,
"fill": 4,
@ -248,7 +248,7 @@
"Forks": "#F9BA8F"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"editable": true,
"error": false,
"fill": 1,
@ -339,7 +339,7 @@
"stars": "#E5A8E2"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"decimals": 3,
"editable": true,
"error": false,
@ -426,7 +426,7 @@
"Open Issues": "#BF1B00"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"editable": true,
"error": false,
"fill": 3,
@ -505,7 +505,7 @@
"Forks": "#F9BA8F"
},
"bars": false,
"datasource": "${DS_PROMETHEUS}",
"datasource": "prometheus",
"decimals": 3,
"editable": true,
"error": false,

View file

@ -3,14 +3,14 @@ apiVersion: 1
# list of datasources that should be deleted from the database
deleteDatasources:
- name: Prometheus
- name: prometheus
orgId: 1
# list of datasources to insert/update depending
# whats available in the database
datasources:
# <string, required> name of the datasource. Required
- name: Prometheus
- name: prometheus
# <string, required> datasource type. Required
type: prometheus
# <string, required> access mode. direct or proxy. Required

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 59 KiB