From edb0d72ad88d0ceb60180e55ff403eab9f20c0f8 Mon Sep 17 00:00:00 2001 From: siavashsardari Date: Tue, 10 Nov 2020 10:25:48 +0330 Subject: [PATCH] Add event_pipeline support Change-Id: Ica34b308378974a2b5501e85b2a8040ad457f4cb Closes-Bug: 1903395 --- defaults/main.yml | 2 ++ vars/main.yml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 56db5eaa..c5fba03e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -269,6 +269,7 @@ ceilometer_required_secrets: # service git repository. ceilometer_data_meters_default_file_path: "/etc/openstack_deploy/ceilometer/meters.yaml" ceilometer_event_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/event_definitions.yaml" +ceilometer_event_pipeline_default_file_path: "/etc/openstack_deploy/ceilometer/event_pipeline.yaml" ceilometer_gnocchi_resources_default_file_path: "/etc/openstack_deploy/ceilometer/gnocchi_resources.yaml" ceilometer_loadbalancer_v2_meter_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/loadbalancer_v2_meter_definitions.yaml" ceilometer_osprofiler_event_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/osprofiler_event_definitions.yaml" @@ -279,6 +280,7 @@ ceilometer_polling_default_file_path: "/etc/openstack_deploy/ceilometer/polling. ceilometer_ceilometer_conf_overrides: {} ceilometer_data_meters_yaml_overrides: {} ceilometer_event_definitions_yaml_overrides: {} +ceilometer_event_pipeline_yaml_overrides: {} ceilometer_gnocchi_resources_yaml_overrides: {} ceilometer_loadbalancer_v2_meter_definitions_yaml_overrides: {} ceilometer_osprofiler_event_definitions_yaml_overrides: {} diff --git a/vars/main.yml b/vars/main.yml index ec59e607..6c30cbb5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -16,6 +16,7 @@ # These vars find a file on the deployment node, if it exists - otherwise the result is empty. ceilometer_data_meters_user_content: "{{ lookup('file', ceilometer_data_meters_default_file_path, errors='ignore') }}" ceilometer_event_definitions_user_content: "{{ lookup('file', ceilometer_event_definitions_default_file_path, errors='ignore') }}" +ceilometer_event_pipeline_user_content: "{{ lookup('file', ceilometer_event_pipeline_default_file_path, errors='ignore') }}" ceilometer_gnocchi_resources_user_content: "{{ lookup('file', ceilometer_gnocchi_resources_default_file_path, errors='ignore') }}" ceilometer_loadbalancer_v2_meter_definitions_user_content: "{{ lookup('file', ceilometer_loadbalancer_v2_meter_definitions_default_file_path, errors='ignore') }}" ceilometer_osprofiler_event_definitions_user_content: "{{ lookup('file', ceilometer_osprofiler_event_definitions_default_file_path, errors='ignore') }}" @@ -70,6 +71,12 @@ ceilometer_core_files: config_type: "yaml" list_extend: false content: "{{ ceilometer_event_definitions_user_content }}" + - tmp_f: "{{ (ceilometer_event_pipeline_user_content | length > 0) | ternary(false, '/tmp/event_pipeline.yaml') }}" + source_f: "{{ ceilometer_lib_dir }}/ceilometer/pipeline/data/event_pipeline.yaml" + config_overrides: "{{ ceilometer_event_pipeline_yaml_overrides }}" + config_type: "yaml" + list_extend: false + content: "{{ ceilometer_event_pipeline_user_content }}" - tmp_f: "{{ (ceilometer_gnocchi_resources_user_content | length > 0) | ternary(false, '/tmp/gnocchi_resources.yaml') }}" source_f: "{{ ceilometer_lib_dir }}/ceilometer/publisher/data/gnocchi_resources.yaml" config_overrides: "{{ ceilometer_gnocchi_resources_yaml_overrides }}"