Merge pull request #87 from ernestas-poskus/bump/alert_manager_to_0_16_2

Bump alert manager to 0.16.2
ernestas-poskus · May 2, 2019 · 09f7c62 · 09f7c62
2 parents 1d1571e + ad6beeb
commit 09f7c62
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ prometheus_platform_architecture: 'linux-amd64'
 prometheus_node_exporter_version: '0.17.0'
 
 # Alert manager
-prometheus_alert_manager_version: '0.15.3'
+prometheus_alert_manager_version: '0.16.2'
 
 # Pushgateway
 prometheus_push_gateway_version: '0.8.0'

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -31,7 +31,7 @@ prometheus_platform_architecture: 'linux-amd64'
 prometheus_node_exporter_version: '0.17.0'
 
 # Alert manager
-prometheus_alert_manager_version: '0.15.3'
+prometheus_alert_manager_version: '0.16.2'
 
 # Pushgateway
 prometheus_push_gateway_version: '0.8.0'
@@ -379,6 +379,8 @@ prometheus_alert_manager_config__file: "{{ prometheus_alert_manager_config_dir }
 # Alertmanager configuration file name. (default "alertmanager.yml")
 prometheus_alert_manager_data__retention: '120h0m0s'
 # How long to keep data for. (default 120h0m0s)
+prometheus_alert_manager_log__format: 'logfmt'
+# Output format of log messages. One of: [logfmt,json]
 prometheus_alert_manager_log__level: 'info'
 # Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]. (default info)
 prometheus_alert_manager_storage__path: "{{ prometheus_alert_manager_data_dir }}"

diff --git a/docs/alert_manager.md b/docs/alert_manager.md
@@ -80,6 +80,8 @@ prometheus_alert_manager_config__file: "{{ prometheus_alert_manager_config_dir }
 # Alertmanager configuration file name. (default "alertmanager.yml")
 prometheus_alert_manager_data__retention: '120h0m0s'
 # How long to keep data for. (default 120h0m0s)
+prometheus_alert_manager_log__format: 'logfmt'
+# Output format of log messages. One of: [logfmt,json]
 prometheus_alert_manager_log__level: 'info'
 # Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]. (default info)
 prometheus_alert_manager_storage__path: "{{ prometheus_alert_manager_data_dir }}"

diff --git a/vars/alertmanager.yml b/vars/alertmanager.yml
@@ -17,6 +17,7 @@ prometheus_alert_manager_service_config:
   - ['cluster.tcp-timeout', "{{ prometheus_alert_manager_cluster__tcp_timeout }}"]
   - ['config.file', "{{ prometheus_alert_manager_config__file }}"]
   - ['data.retention', "{{ prometheus_alert_manager_data__retention }}"]
+  - ['log.format', "{{ prometheus_alert_manager_log__format }}"]
   - ['log.level', "{{ prometheus_alert_manager_log__level }}"]
   - ['storage.path', "{{ prometheus_alert_manager_storage__path }}"]
   - ['web.external-url', "{{ prometheus_alert_manager_web__external_url }}"]