Updated Alertmanager arguments

docker-flow · Jan 14, 2018 · feb9731 · feb9731
1 parent 038053d
commit feb9731
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ FROM prom/prometheus:v2.0.0
 
 ENV GLOBAL_SCRAPE_INTERVAL=10s \
     ARG_CONFIG_FILE=/etc/prometheus/prometheus.yml \
-    ARG_STORAGE_LOCAL_PATH=/prometheus \
+    ARG_STORAGE_TSDB_PATH=/prometheus \
     ARG_WEB_CONSOLE_LIBRARIES=/usr/share/prometheus/console_libraries \
     ARG_WEB_CONSOLE_TEMPLATES=/usr/share/prometheus/consoles \
     CONFIGS_DIR="/run/secrets"

diff --git a/docs/auto-scaling.md b/docs/auto-scaling.md
@@ -145,7 +145,7 @@ The full definition of the stack that we just deployed can be found in [docker-f
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/docs/config.md b/docs/config.md
@@ -22,7 +22,7 @@ prometheus --web.route-prefix=/monitor --web.external-url=http://localhost/monit
 
 ```
 ARG_CONFIG_FILE=/etc/prometheus/prometheus.yml
-ARG_STORAGE_LOCAL_PATH=/prometheus
+ARG_STORAGE_TSDB_PATH=/prometheus
 ARG_WEB_CONSOLE_LIBRARIES=/usr/share/prometheus/console_libraries
 ARG_WEB_CONSOLE_TEMPLATES=/usr/share/prometheus/consoles
 ```

diff --git a/stack.yml b/stack.yml
@@ -37,7 +37,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/stacks/alert-manager-slack.yml b/stacks/alert-manager-slack.yml
@@ -10,7 +10,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
 networks:
   monitor:

diff --git a/stacks/docker-flow-monitor-aws.yml b/stacks/docker-flow-monitor-aws.yml
@@ -5,7 +5,6 @@ services:
   monitor:
     image: vfarcic/docker-flow-monitor
     environment:
-      - ARG_STORAGE_TSDB_PATH=/prometheus
       - LISTENER_ADDRESS=swarm-listener
       - GLOBAL_SCRAPE_INTERVAL=${SCRAPE_INTERVAL:-10s}
       - ARG_WEB_ROUTE-PREFIX=/monitor
@@ -37,7 +36,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/stacks/docker-flow-monitor-scaler.yml b/stacks/docker-flow-monitor-scaler.yml
@@ -32,7 +32,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/stacks/docker-flow-monitor-slack-9093.yml b/stacks/docker-flow-monitor-slack-9093.yml
@@ -34,7 +34,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/stacks/docker-flow-monitor-slack.yml b/stacks/docker-flow-monitor-slack.yml
@@ -32,7 +32,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener

diff --git a/stacks/docker-flow-monitor-user.yml b/stacks/docker-flow-monitor-user.yml
@@ -34,7 +34,7 @@ services:
       - monitor
     secrets:
       - alert_manager_config
-    command: -config.file=/run/secrets/alert_manager_config -storage.path=/alertmanager
+    command: --config.file=/run/secrets/alert_manager_config --storage.path=/alertmanager
 
   swarm-listener:
     image: vfarcic/docker-flow-swarm-listener