update versions
This commit is contained in:
parent
3caac51ca1
commit
5fd0c34189
|
@ -4,9 +4,7 @@ Prometheus-Grafana
|
||||||
A monitoring solution for Docker hosts and containers with [Prometheus](https://prometheus.io/), [Grafana](http://grafana.org/), [cAdvisor](https://github.com/google/cadvisor),
|
A monitoring solution for Docker hosts and containers with [Prometheus](https://prometheus.io/), [Grafana](http://grafana.org/), [cAdvisor](https://github.com/google/cadvisor),
|
||||||
[NodeExporter](https://github.com/prometheus/node_exporter) and alerting with [AlertManager](https://github.com/prometheus/alertmanager).
|
[NodeExporter](https://github.com/prometheus/node_exporter) and alerting with [AlertManager](https://github.com/prometheus/alertmanager).
|
||||||
|
|
||||||
This is a forked repository. So, you may want to visit the original repo at [stefanprodan
|
This is a forked repository. So, you may want to visit the original repo at [stefanprodan/dockprom](https://github.com/stefanprodan/dockprom)
|
||||||
/
|
|
||||||
dockprom](https://github.com/stefanprodan/dockprom)
|
|
||||||
|
|
||||||
Additional info: [Docker - Prometheus and Grafana](https://bogotobogo.com/DevOps/Docker/Docker_Prometheus_Grafana.php)
|
Additional info: [Docker - Prometheus and Grafana](https://bogotobogo.com/DevOps/Docker/Docker_Prometheus_Grafana.php)
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ volumes:
|
||||||
services:
|
services:
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:v2.17.1
|
image: prom/prometheus:v2.24.1
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
volumes:
|
volumes:
|
||||||
- ./prometheus:/etc/prometheus
|
- ./prometheus:/etc/prometheus
|
||||||
|
@ -32,7 +32,7 @@ services:
|
||||||
org.label-schema.group: "monitoring"
|
org.label-schema.group: "monitoring"
|
||||||
|
|
||||||
alertmanager:
|
alertmanager:
|
||||||
image: prom/alertmanager:v0.20.0
|
image: prom/alertmanager:v0.21.0
|
||||||
container_name: alertmanager
|
container_name: alertmanager
|
||||||
volumes:
|
volumes:
|
||||||
- ./alertmanager:/etc/alertmanager
|
- ./alertmanager:/etc/alertmanager
|
||||||
|
@ -48,7 +48,7 @@ services:
|
||||||
org.label-schema.group: "monitoring"
|
org.label-schema.group: "monitoring"
|
||||||
|
|
||||||
nodeexporter:
|
nodeexporter:
|
||||||
image: prom/node-exporter:v0.18.1
|
image: prom/node-exporter:v1.0.1
|
||||||
container_name: nodeexporter
|
container_name: nodeexporter
|
||||||
volumes:
|
volumes:
|
||||||
- /proc:/host/proc:ro
|
- /proc:/host/proc:ro
|
||||||
|
@ -68,24 +68,32 @@ services:
|
||||||
org.label-schema.group: "monitoring"
|
org.label-schema.group: "monitoring"
|
||||||
|
|
||||||
cadvisor:
|
cadvisor:
|
||||||
image: gcr.io/google-containers/cadvisor:v0.34.0
|
image: gcr.io/cadvisor/cadvisor:latest
|
||||||
container_name: cadvisor
|
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
|
||||||
#- /cgroup:/cgroup:ro #doesn't work on MacOS only for Linux
|
- /sys/fs/cgroup:/cgroup:ro
|
||||||
|
- /dev/disk/:/dev/disk:ro
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
devices:
|
||||||
|
- /dev/kmsg:/dev/kmsg
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
expose:
|
expose:
|
||||||
- 8080
|
- 8080
|
||||||
networks:
|
networks:
|
||||||
- monitor-net
|
- monitor-net
|
||||||
labels:
|
labels:
|
||||||
org.label-schema.group: "monitoring"
|
org.label-schema.group: "monitoring"
|
||||||
|
command:
|
||||||
|
- '-housekeeping_interval=10s'
|
||||||
|
- '-docker_only=true'
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:6.7.2
|
image: grafana/grafana:7.3.7
|
||||||
container_name: grafana
|
container_name: grafana
|
||||||
volumes:
|
volumes:
|
||||||
- grafana_data:/var/lib/grafana
|
- grafana_data:/var/lib/grafana
|
||||||
|
|
|
@ -14,22 +14,22 @@ rule_files:
|
||||||
# A scrape configuration containing exactly one endpoint to scrape.
|
# A scrape configuration containing exactly one endpoint to scrape.
|
||||||
scrape_configs:
|
scrape_configs:
|
||||||
- job_name: 'nodeexporter'
|
- job_name: 'nodeexporter'
|
||||||
scrape_interval: 5s
|
scrape_interval: 15s
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['nodeexporter:9100']
|
- targets: ['nodeexporter:9100']
|
||||||
|
|
||||||
- job_name: 'cadvisor'
|
- job_name: 'cadvisor'
|
||||||
scrape_interval: 5s
|
scrape_interval: 15s
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['cadvisor:8080']
|
- targets: ['cadvisor:8080']
|
||||||
|
|
||||||
- job_name: 'prometheus'
|
- job_name: 'prometheus'
|
||||||
scrape_interval: 10s
|
scrape_interval: 15s
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['localhost:9090']
|
- targets: ['localhost:9090']
|
||||||
|
|
||||||
- job_name: 'pushgateway'
|
- job_name: 'pushgateway'
|
||||||
scrape_interval: 10s
|
scrape_interval: 15s
|
||||||
honor_labels: true
|
honor_labels: true
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['pushgateway:9091']
|
- targets: ['pushgateway:9091']
|
||||||
|
|
Loading…
Reference in New Issue