From 0b13b508203283a5f69f9c89217fb3cf4f6c1a1e Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 23 Nov 2020 15:56:37 +0000 Subject: [ansible][default_plugins] Update how the default plugins are enabled By adding the "en_default_all" tag to each task in the default_read_import task, there is no need to have different tasks for that tag vs when individual plugin tags are enabled. JIRA: BAROMETER-180 Change-Id: I15cc77959bbd25516e9da10af064abeea5527ea9 Signed-off-by: Emma Foley --- .../config_files/tasks/default_read_import.yml | 22 ++++++++++++++ .../config_files/tasks/default_read_plugins.yml | 34 ---------------------- docker/ansible/roles/config_files/tasks/main.yml | 2 +- .../templates/default_read_plugins.conf.j2 | 4 +-- 4 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 docker/ansible/roles/config_files/tasks/default_read_plugins.yml (limited to 'docker') diff --git a/docker/ansible/roles/config_files/tasks/default_read_import.yml b/docker/ansible/roles/config_files/tasks/default_read_import.yml index d70919b3..3c7d8766 100644 --- a/docker/ansible/roles/config_files/tasks/default_read_import.yml +++ b/docker/ansible/roles/config_files/tasks/default_read_import.yml @@ -13,12 +13,20 @@ # limitations under the License. --- +- name: copy default template to system + template: + src: default_read_plugins.conf.j2 + dest: "{{ config_file_dir }}/default_read_plugins.conf" + tags: + - always + - name: enable contextswitch plugin replace: path: "{{ config_file_dir }}/default_read_plugins.conf" regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$' replace: '\1LoadPlugin contextswitch\2' tags: + - en_default_all - contextswitch - name: enable cpu plugin @@ -27,6 +35,7 @@ regexp: '(\s+)#LoadPlugin cpu(\s+.*)?$' replace: '\1LoadPlugin cpu\2' tags: + - en_default_all - cpu - name: enable cpufreq plugin @@ -35,6 +44,7 @@ regexp: '(\s+)#LoadPlugin cpufreq(\s+.*)?$' replace: '\1LoadPlugin cpufreq\2' tags: + - en_default_all - cpufreq - name: enable df plugin @@ -43,6 +53,7 @@ regexp: '(\s+)#LoadPlugin df(\s+.*)?$' replace: '\1LoadPlugin df\2' tags: + - en_default_all - df - name: enable disk plugin @@ -51,6 +62,7 @@ regexp: '(\s+)#LoadPlugin disk(\s+.*)?$' replace: '\1LoadPlugin disk\2' tags: + - en_default_all - disk - name: enable ethstat plugin @@ -59,6 +71,7 @@ regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$' replace: '\1LoadPlugin ethstat\2' tags: + - en_default_all - ethstat - name: enable ipc plugin @@ -67,6 +80,7 @@ regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$' replace: '\1LoadPlugin ipc\2' tags: + - en_default_all - ipc - name: enable irq plugin @@ -75,6 +89,7 @@ regexp: '(\s+)#LoadPlugin irq(\s+.*)?$' replace: '\1LoadPlugin irq\2' tags: + - en_default_all - irq - name: enable load plugin @@ -83,6 +98,7 @@ regexp: '(\s+)#LoadPlugin load(\s+.*)?$' replace: '\1LoadPlugin load\2' tags: + - en_default_all - load - name: enable memory plugin @@ -91,6 +107,7 @@ regexp: '(\s+)#LoadPlugin memory(\s+.*)?$' replace: '\1LoadPlugin memory\2' tags: + - en_default_all - memory - name: enable numa plugin @@ -99,6 +116,7 @@ regexp: '(\s+)#LoadPlugin numa(\s+.*)?$' replace: '\1LoadPlugin numa\2' tags: + - en_default_all - numa - name: enable processes plugin @@ -107,6 +125,7 @@ regexp: '(\s+)#LoadPlugin processes(\s+.*)?$' replace: '\1LoadPlugin processes\2' tags: + - en_default_all - processes - name: enable swap plugin @@ -115,6 +134,7 @@ regexp: '(\s+)#LoadPlugin swap(\s+.*)?$' replace: '\1LoadPlugin swap\2' tags: + - en_default_all - swap - name: enable turbostat plugin @@ -123,6 +143,7 @@ regexp: '(\s+)#LoadPlugin turbostat(\s+.*)?$' replace: '\1LoadPlugin turbostat\2' tags: + - en_default_all - turbostat - name: enable uptime plugin @@ -131,4 +152,5 @@ regexp: '(\s+)#LoadPlugin uptime(\s+.*)?$' replace: '\1LoadPlugin uptime\2' tags: + - en_default_all - uptime diff --git a/docker/ansible/roles/config_files/tasks/default_read_plugins.yml b/docker/ansible/roles/config_files/tasks/default_read_plugins.yml deleted file mode 100644 index 95b942c2..00000000 --- a/docker/ansible/roles/config_files/tasks/default_read_plugins.yml +++ /dev/null @@ -1,34 +0,0 @@ -#Copyright 2018 OPNFV and Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- - -- name: copy default template to system - template: - src: default_read_plugins.conf.j2 - dest: "{{ config_file_dir }}/default_read_plugins.conf" - tags: - - always - -- name: enable all default plugins - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin(\s+.*)?$' - replace: '\1LoadPlugin\2' - register: en_default_all - tags: - - en_default_all - -- name: include per default plugin tasks - include: default_read_import.yml - when: en_default_all is not defined \ No newline at end of file diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml index 3221242d..b3e93765 100644 --- a/docker/ansible/roles/config_files/tasks/main.yml +++ b/docker/ansible/roles/config_files/tasks/main.yml @@ -37,7 +37,7 @@ import_tasks: csv.yml - name: enable default plugins - import_tasks: default_read_plugins.yml + import_tasks: default_read_import.yml - name: enable dpdk plugins import_tasks: dpdk.yml diff --git a/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 b/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 index 48beb0be..4400a23b 100644 --- a/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 +++ b/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -Hostname "{{ inventory_hostname }}" -Interval "{{ interval_value }}" +Hostname "{{ collectd_hostname }}" +Interval "{{ collectd_interval }}" #LoadPlugin contextswitch -- cgit 1.2.3-korg