Skip to content
Snippets Groups Projects
Commit f77c67fa authored by Kien Nguyen's avatar Kien Nguyen
Browse files

[Vitrage] Add Prometheus datasource configuration

Vitrage supports new Prometheus configuration now [1].
Kolla should allow user to configure this configuration
file.

[1] https://review.openstack.org/#/c/630514/

Change-Id: I84072d90b0342c6d460ee733ba646a5fb787faa9
parent 4a127d4b
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
vitrage_conf: "{{ vitrage_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" vitrage_conf: "{{ vitrage_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ vitrage_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ vitrage_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
vitrage_graph_container: "{{ check_vitrage_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" vitrage_graph_container: "{{ check_vitrage_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
vitrage_prometheus_conf: "{{ vitrage_prometheus_conf.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
...@@ -73,6 +74,7 @@ ...@@ -73,6 +74,7 @@
or vitrage_conf.changed | bool or vitrage_conf.changed | bool
or policy_overwriting.changed | bool or policy_overwriting.changed | bool
or vitrage_graph_container.changed | bool or vitrage_graph_container.changed | bool
or vitrage_prometheus_conf.changed | bool
- name: Restart vitrage-ml container - name: Restart vitrage-ml container
vars: vars:
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
template: template:
src: "{{ item.key }}.json.j2" src: "{{ item.key }}.json.j2"
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0770" mode: "0660"
become: true become: true
register: vitrage_config_jsons register: vitrage_config_jsons
when: when:
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
- "{{ node_config_directory }}/config/vitrage/{{ item.key }}.conf" - "{{ node_config_directory }}/config/vitrage/{{ item.key }}.conf"
- "{{ node_config_directory }}/config/vitrage/{{ inventory_hostname }}/vitrage.conf" - "{{ node_config_directory }}/config/vitrage/{{ inventory_hostname }}/vitrage.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/vitrage.conf" dest: "{{ node_config_directory }}/{{ item.key }}/vitrage.conf"
mode: "0770" mode: "0660"
become: true become: true
register: vitrage_confs register: vitrage_confs
when: when:
...@@ -75,18 +75,34 @@ ...@@ -75,18 +75,34 @@
template: template:
src: "wsgi-vitrage.conf.j2" src: "wsgi-vitrage.conf.j2"
dest: "{{ node_config_directory }}/{{ item }}/wsgi-vitrage.conf" dest: "{{ node_config_directory }}/{{ item }}/wsgi-vitrage.conf"
mode: "0770" mode: "0660"
become: true become: true
with_items: with_items:
- "vitrage-api" - "vitrage-api"
notify: notify:
- Restart vitrage-api container - Restart vitrage-api container
- name: Copying over prometheus_conf.yml file for service
vars:
service: "{{ vitrage_services['vitrage-graph'] }}"
template:
src: "{{ node_custom_config }}/vitrage/prometheus_conf.yaml"
dest: "{{ node_config_directory }}/vitrage-graph/prometheus_conf.yaml"
mode: "0660"
become: true
register: vitrage_prometheus_conf
when:
- enable_vitrage_prometheus_datasource | bool
- inventory_hostname in groups[service.group]
- service.enabled | bool
notify:
- Restart vitrage-graph container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
src: "{{ vitrage_policy_file_path }}" src: "{{ vitrage_policy_file_path }}"
dest: "{{ node_config_directory }}/{{ item.key }}/{{ vitrage_policy_file }}" dest: "{{ node_config_directory }}/{{ item.key }}/{{ vitrage_policy_file }}"
mode: "0770" mode: "0660"
become: true become: true
register: vitrage_policy_overwriting register: vitrage_policy_overwriting
when: when:
......
...@@ -14,3 +14,11 @@ ...@@ -14,3 +14,11 @@
when: when:
- container_facts['vitrage_api'] is not defined - container_facts['vitrage_api'] is not defined
- inventory_hostname in groups['vitrage-api'] - inventory_hostname in groups['vitrage-api']
- name: Checking custom prometheus_conf.yaml exists
local_action: stat_path="{{ node_custom_config }}/vitrage/prometheus_conf.yaml"
register: result
run_once: true
failed_when: not result.stat.exists
when:
- enable_vitrage_prometheus_datasource | bool
...@@ -6,7 +6,13 @@ ...@@ -6,7 +6,13 @@
"dest": "/etc/vitrage/vitrage.conf", "dest": "/etc/vitrage/vitrage.conf",
"owner": "vitrage", "owner": "vitrage",
"perm": "0644" "perm": "0644"
}{% if vitrage_policy_file is defined %}, }{% if enable_vitrage_prometheus_datasource | bool %},
{
"source": "{{ container_config_directory }}/prometheus_conf.yaml",
"dest": "/etc/vitrage/prometheus_conf.yaml",
"owner": "vitrage",
"perm": "0644"
}{% endif %}{% if vitrage_policy_file is defined %},
{ {
"source": "{{ container_config_directory }}/{{ vitrage_policy_file }}", "source": "{{ container_config_directory }}/{{ vitrage_policy_file }}",
"dest": "/etc/vitrage/{{ vitrage_policy_file }}", "dest": "/etc/vitrage/{{ vitrage_policy_file }}",
......
...@@ -82,3 +82,8 @@ trace_sqlalchemy = true ...@@ -82,3 +82,8 @@ trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }} hmac_keys = {{ osprofiler_secret }}
connection_string = {{ osprofiler_backend_connection_string }} connection_string = {{ osprofiler_backend_connection_string }}
{% endif %} {% endif %}
{% if enable_vitrage_prometheus_datasource | bool %}
[prometheus]
config_file = /etc/vitrage/prometheus_conf.yaml
{% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment