Merge pull request #102 from ernestas-poskus/features/bump_push_gatew…

…ay_to_1_0_0 Bump push gateway to 1.0.0
ernestas-poskus · Oct 22, 2019 · 766ff75 · 766ff75
2 parents 775781d + 564952e
commit 766ff75
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ prometheus_node_exporter_version: '0.18.1'
 prometheus_alert_manager_version: '0.18.0'
 
 # Pushgateway
-prometheus_push_gateway_version: '0.9.1'
+prometheus_push_gateway_version: '1.0.0'
 
 # SNMP exporter
 prometheus_snmp_exporter_version: '0.15.0'

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -34,7 +34,7 @@ prometheus_node_exporter_version: '0.18.1'
 prometheus_alert_manager_version: '0.18.0'
 
 # Pushgateway
-prometheus_push_gateway_version: '0.9.1'
+prometheus_push_gateway_version: '1.0.0'
 
 # SNMP exporter
 prometheus_snmp_exporter_version: '0.15.0'
@@ -457,6 +457,9 @@ prometheus_push_gateway_web__telemetry_path: '/metrics'
 # Path under which to expose metrics. (default "/metrics")
 prometheus_push_gateway_web__external_url:
 # The URL under which Pushgateway is externally reachable.
+prometheus_push_gateway____enabled_flags: []
+#  - 'web.enable-admin-api' # disabled by default
+#  - 'web.enable-lifecycle' # disabled by default
 
 # Snmp exporter
 # https://github.com/prometheus/snmp_exporter

diff --git a/docs/push_gateway.md b/docs/push_gateway.md
@@ -20,4 +20,7 @@ prometheus_push_gateway_web__telemetry_path: '/metrics'
 # Path under which to expose metrics. (default "/metrics")
 prometheus_push_gateway_web__external_url:
 # The URL under which Pushgateway is externally reachable.
+prometheus_push_gateway____enabled_flags: []
+#  - 'web.enable-admin-api' # disabled by default
+#  - 'web.enable-lifecycle' # disabled by default
 ```
diff --git a/templates/push_gateway.service.j2 b/templates/push_gateway.service.j2
@@ -6,7 +6,7 @@ After=network.target
 Wants=network.target
 
 [Service]
-ExecStart={{ prometheus_install_dir }}/{{ prometheus_push_gateway_archive }}/pushgateway {% for config in prometheus_push_gateway_service_config if config[1] is not none %}--{{ config[0] }}={{ config[1] }} {% endfor %}
+ExecStart={{ prometheus_install_dir }}/{{ prometheus_push_gateway_archive }}/pushgateway {% for config in prometheus_push_gateway_service_config if config[1] is not none %}--{{ config[0] }}={{ config[1] }} {% endfor %} {% for enabled_bool in prometheus_push_gateway____enabled_flags %}--{{ enabled_bool }} {% endfor %}
 
 Restart=always
 RestartSec=20