dashboards are working now

This commit is contained in:
seba 2018-06-17 13:20:33 +02:00
parent 50da5b4f55
commit 32fd4d40d7
2 changed files with 28 additions and 10 deletions

View File

@ -82,8 +82,8 @@ docker exec -it -u 0 grafana /var/lib/grafana/ds/add_dashboards.sh
## NOW LET'S SECURE GRAFANA ## NOW LET'S SECURE GRAFANA
# CHECKING OUT ORIGINAL FILE # CHECKING OUT ORIGINAL FILE
echo -e "checking out original docker-compose.yml" #echo -e "checking out original docker-compose.yml"
git checkout docker-compose.yml #git checkout docker-compose.yml
## STOPPING and REMOVING GRAFANA CONTAINER ## STOPPING and REMOVING GRAFANA CONTAINER
echo -e "stopping & removing grafana container" echo -e "stopping & removing grafana container"
@ -95,3 +95,5 @@ docker rm $container_id
echo -e "changing http to https" echo -e "changing http to https"
sed -i 's/GF_SERVER_PROTOCOL: "http"/GF_SERVER_PROTOCOL: "https"/g' docker-compose.yml sed -i 's/GF_SERVER_PROTOCOL: "http"/GF_SERVER_PROTOCOL: "https"/g' docker-compose.yml
docker-compose up -d grafana docker-compose up -d grafana
echo -e "reverting: changing https to http"
sed -i 's/GF_SERVER_PROTOCOL: "https"/GF_SERVER_PROTOCOL: "http"/g' docker-compose.yml

View File

@ -89,23 +89,39 @@ services:
- private - private
environment: environment:
DOGSNAME: "GULA,BODKA" DOGSNAME: "GULA,BODKA"
command:
- "--collectors.enabled=textfile"
- "--collector.textfile.directory=/var/lib/node_exporter/textfile_collector/"
expose: expose:
- 9100 - 9100
ports: ports:
- 9101:9100 - 9101:9100
cadvisor: cadvisor:
image: google/cadvisor image: google/cadvisor:v0.28.3
container_name: cadvisor
volumes: volumes:
- /:/rootfs:ro - /:/rootfs:ro
- /var/run:/var/run:rw - /var/run:/var/run:rw
- /sys:/sys:ro - /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro - /var/lib/docker/:/var/lib/docker:ro
ports: #- /cgroup:/cgroup:ro #doesn't work on MacOS only for Linux
- 18080:8080 restart: unless-stopped
expose:
- 8080
networks: networks:
- private - private
- public - public
restart: unless-stopped labels:
org.label-schema.group: "monitoring"
alertmanager:
image: prom/alertmanager
container_name: alertmanager
ports:
- 9093:9093
volumes:
- ./alertmanager/:/etc/alertmanager/
networks:
- private
restart: unless-stopped
command:
- '--config.file=/etc/alertmanager/config.yml'
- '--storage.path=/alertmanager'