Merge pull request #95 from ernestas-poskus/features/bump_alert_manag…

…er_to_0_18_0 Bump alert manager to 0.18.0
ernestas-poskus · Aug 28, 2019 · 0d22c87 · 0d22c87
2 parents 3c9b455 + 4904025
commit 0d22c87
Show file tree

Hide file tree

Showing 4 changed files with 16 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.18.1'
 
 # Alert manager
-prometheus_alert_manager_version: '0.16.2'
+prometheus_alert_manager_version: '0.18.0'
 
 # Pushgateway
 prometheus_push_gateway_version: '0.9.1'

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -31,7 +31,7 @@ prometheus_platform_architecture: 'linux-amd64'
 prometheus_node_exporter_version: '0.18.1'
 
 # Alert manager
-prometheus_alert_manager_version: '0.16.2'
+prometheus_alert_manager_version: '0.18.0'
 
 # Pushgateway
 prometheus_push_gateway_version: '0.9.1'
@@ -418,10 +418,16 @@ prometheus_alert_manager_web__external_url:
 # Used for generating relative and absolute links back to Alertmanager itself.
 # If the URL has a path portion, it will be used to prefix all HTTP endpoints served by Alertmanager.
 # If omitted, relevant URL components will be derived automatically.
+prometheus_alert_manager_web__get_concurrency:
+# Maximum number of GET requests processed
+# concurrently. If negative or zero, the limit is
+# GOMAXPROC or 8, whichever is larger.
 prometheus_alert_manager_web__listen_address: ':9093'
 # Address to listen on for the web:interface and API. (default ":9093")
 prometheus_alert_manager_web__route_prefix:
 # Prefix for the internal routes of web endpoints. Defaults to path of -web.external-url.
+prometheus_alert_manager_web__timeout: 0
+# Timeout for HTTP requests. If negative or zero,no timeout is set.
 
 # Pushgateway
 # https://github.com/prometheus/pushgateway

diff --git a/docs/alert_manager.md b/docs/alert_manager.md
@@ -92,8 +92,14 @@ prometheus_alert_manager_web__external_url:
 # Used for generating relative and absolute links back to Alertmanager itself.
 # If the URL has a path portion, it will be used to prefix all HTTP endpoints served by Alertmanager.
 # If omitted, relevant URL components will be derived automatically.
+prometheus_alert_manager_web__get_concurrency:
+# Maximum number of GET requests processed
+# concurrently. If negative or zero, the limit is
+# GOMAXPROC or 8, whichever is larger.
 prometheus_alert_manager_web__listen_address: ':9093'
 # Address to listen on for the web:interface and API. (default ":9093")
 prometheus_alert_manager_web__route_prefix:
 # Prefix for the internal routes of web endpoints. Defaults to path of -web.external-url.
+prometheus_alert_manager_web__timeout: 0
+# Timeout for HTTP requests. If negative or zero,no timeout is set.
 ```
diff --git a/vars/alertmanager.yml b/vars/alertmanager.yml
@@ -24,5 +24,7 @@ prometheus_alert_manager_service_config:
   - ['log.level', "{{ prometheus_alert_manager_log__level }}"]
   - ['storage.path', "{{ prometheus_alert_manager_storage__path }}"]
   - ['web.external-url', "{{ prometheus_alert_manager_web__external_url }}"]
+  - ['web.get-concurrency', "{{ prometheus_alert_manager_web__get_concurrency }}"]
   - ['web.listen-address', "{{ prometheus_alert_manager_web__listen_address }}"]
   - ['web.route-prefix', "{{ prometheus_alert_manager_web__route_prefix }}"]
+  - ['web.timeout', "{{ prometheus_alert_manager_web__timeout }}"]