diff --git a/makefile b/makefile index 6e123d0..9d13030 100644 --- a/makefile +++ b/makefile @@ -229,8 +229,6 @@ deploy-grafana: pull set -a ;\ . ./swarm/.env ;\ set +a ;\ - echo "Removing old immutable configs..." ;\ - docker config rm grafana_grafana_prometheus_datasource 2>/dev/null || true ;\ docker stack deploy --compose-file ./swarm/grafana.yml grafana ;\ } deploy-prometheus: pull @@ -239,8 +237,6 @@ deploy-prometheus: pull set -a ;\ . ./swarm/.env ;\ set +a ;\ - echo "Removing old immutable config..." ;\ - docker config rm prometheus_prometheus_config 2>/dev/null || true ;\ docker stack deploy --compose-file ./swarm/prometheus.yml prometheus ;\ } deploy-nodepad: pull diff --git a/swarm/grafana.yml b/swarm/grafana.yml index b3e679e..7281665 100644 --- a/swarm/grafana.yml +++ b/swarm/grafana.yml @@ -1,10 +1,6 @@ volumes: grafana_data: {} -configs: - grafana_prometheus_datasource: - file: ./grafana/provisioning/datasources/prometheus.yml - networks: traefik-public: external: true @@ -23,9 +19,7 @@ services: - /var/data/grafana/grafana.ini:/etc/grafana/grafana.ini:ro - /var/data/grafana/provisioning:/etc/grafana/provisioning:ro - /var/data/grafana/dashboards:/var/lib/grafana/dashboards:ro - configs: - - source: grafana_prometheus_datasource - target: /etc/grafana/provisioning/datasources/prometheus.yml + - ./grafana/provisioning/datasources/prometheus.yml:/etc/grafana/provisioning/datasources/prometheus.yml:ro networks: - traefik-public deploy: diff --git a/swarm/prometheus.yml b/swarm/prometheus.yml index ac2d40d..a6c245a 100644 --- a/swarm/prometheus.yml +++ b/swarm/prometheus.yml @@ -1,10 +1,6 @@ volumes: prometheus_data: {} -configs: - prometheus_config: - file: ./prometheus/prometheus.yml - networks: traefik-public: external: true @@ -22,9 +18,7 @@ services: volumes: - prometheus_data:/prometheus - /var/data/prometheus/rules:/etc/prometheus/rules:ro - configs: - - source: prometheus_config - target: /etc/prometheus/prometheus.yml + - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro networks: - traefik-public deploy: