openstack/kolla-ansible
Code Issues Proposed changes

Merge "Apply bool filter to all enable_prometheus_* variables"

Browse Source
This commit is contained in:
Zuul
2020-10-12 14:02:24 +00:00
committed by Gerrit Code Review
parent 4fe4820b1f 6985e9a67c
commit 42d0b89361
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/prometheus/defaults/main.yml
View File

@@ -5,13 +5,13 @@ prometheus_services:
prometheus-server: prometheus-server:
container_name: prometheus_server container_name: prometheus_server
group: prometheus group: prometheus
enabled: "{{ enable_prometheus_server }}" enabled: "{{ enable_prometheus_server | bool }}"
image: "{{ prometheus_server_image_full }}" image: "{{ prometheus_server_image_full }}"
volumes: "{{ prometheus_server_default_volumes + prometheus_server_extra_volumes }}" volumes: "{{ prometheus_server_default_volumes + prometheus_server_extra_volumes }}"
dimensions: "{{ prometheus_server_dimensions }}" dimensions: "{{ prometheus_server_dimensions }}"
haproxy: haproxy:
prometheus_server: prometheus_server:
enabled: "{{ enable_prometheus_server }}" enabled: "{{ enable_prometheus_server | bool }}"
mode: "http" mode: "http"
external: false external: false
port: "{{ prometheus_port }}" port: "{{ prometheus_port }}"
@@ -60,14 +60,14 @@ prometheus_services:
dimensions: "{{ prometheus_alertmanager_dimensions }}" dimensions: "{{ prometheus_alertmanager_dimensions }}"
haproxy: haproxy:
prometheus_alertmanager: prometheus_alertmanager:
enabled: "{{ enable_prometheus_alertmanager }}" enabled: "{{ enable_prometheus_alertmanager | bool }}"
mode: "http" mode: "http"
external: false external: false
port: "{{ prometheus_alertmanager_port }}" port: "{{ prometheus_alertmanager_port }}"
auth_user: "{{ prometheus_alertmanager_user }}" auth_user: "{{ prometheus_alertmanager_user }}"
auth_pass: "{{ prometheus_alertmanager_password }}" auth_pass: "{{ prometheus_alertmanager_password }}"
prometheus_alertmanager_external: prometheus_alertmanager_external:
enabled: "{{ enable_prometheus_alertmanager }}" enabled: "{{ enable_prometheus_alertmanager | bool }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ prometheus_alertmanager_port }}" port: "{{ prometheus_alertmanager_port }}"

2
ansible/roles/prometheus/templates/prometheus-server.json.j2
View File

@@ -13,7 +13,7 @@
"preserve_properties": true, "preserve_properties": true,
"optional": true "optional": true
} }
{% if enable_prometheus_alertmanager %} {% if enable_prometheus_alertmanager | bool %}
,{ ,{
"source": "{{ container_config_directory }}/*.rules", "source": "{{ container_config_directory }}/*.rules",
"dest": "/etc/prometheus/", "dest": "/etc/prometheus/",