[ansible] Use collectd_config for default_read_plugins

Update default_plugins to use the collectd_config role [1]

[1] https://github.com/infrawatch/collectd-config-ansible-role

JIRA: BAROMETER-180
Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I9ff9bf642b641132771965346d65c95a3d66b996

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 3c7d876..46b4d51 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/default_read_import.yml
+++ b/docker/ansible/roles/config_files/tasks/default_read_import.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 OPNFV, Intel Corporation and Red Hat
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,145 +12,107 @@
 # 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 contextswitch  plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$'
-      replace: '\1LoadPlugin contextswitch\2'
+  set_fact:
+     collectd_plugins: "{{ collectd_plugins | union(['contextswitch']) | unique }}"
   tags:
     - en_default_all
     - contextswitch
 
 - name: enable cpu plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin cpu(\s+.*)?$'
-      replace: '\1LoadPlugin cpu\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['cpu']) | unique }}"
   tags:
     - en_default_all
     - cpu
 
 - name: enable cpufreq plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin cpufreq(\s+.*)?$'
-      replace: '\1LoadPlugin cpufreq\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['cpufreq']) | unique }}"
   tags:
     - en_default_all
     - cpufreq
 
 - name: enable df plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin df(\s+.*)?$'
-      replace: '\1LoadPlugin df\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['df']) | unique }}"
   tags:
     - en_default_all
     - df
 
 - name: enable disk plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin disk(\s+.*)?$'
-      replace: '\1LoadPlugin disk\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['disk']) | unique }}"
   tags:
     - en_default_all
     - disk
 
 - name: enable ethstat plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$'
-      replace: '\1LoadPlugin ethstat\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['ethstat']) | unique }}"
   tags:
     - en_default_all
     - ethstat
 
 - name: enable ipc plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$'
-      replace: '\1LoadPlugin ipc\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['ipc']) | unique }}"
   tags:
     - en_default_all
     - ipc
 
 - name: enable irq plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin irq(\s+.*)?$'
-      replace: '\1LoadPlugin irq\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['irq']) | unique }}"
   tags:
     - en_default_all
     - irq
 
 - name: enable load plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin load(\s+.*)?$'
-      replace: '\1LoadPlugin load\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['load']) | unique }}"
   tags:
     - en_default_all
     - load
 
 - name: enable memory plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin memory(\s+.*)?$'
-      replace: '\1LoadPlugin memory\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['memory']) | unique }}"
   tags:
     - en_default_all
     - memory
 
 - name: enable numa plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin numa(\s+.*)?$'
-      replace: '\1LoadPlugin numa\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['numa']) | unique }}"
   tags:
     - en_default_all
     - numa
 
 - name: enable processes plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin processes(\s+.*)?$'
-      replace: '\1LoadPlugin processes\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['processes']) | unique }}"
   tags:
     - en_default_all
     - processes
 
 - name: enable swap plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin swap(\s+.*)?$'
-      replace: '\1LoadPlugin swap\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['swap']) | unique }}"
   tags:
     - en_default_all
     - swap
 
 - name: enable turbostat plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin turbostat(\s+.*)?$'
-      replace: '\1LoadPlugin turbostat\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['turbostat']) | unique }}"
   tags:
     - en_default_all
     - turbostat
 
 - name: enable uptime plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin uptime(\s+.*)?$'
-      replace: '\1LoadPlugin uptime\2'
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['uptime']) | unique }}"
   tags:
     - en_default_all
     - uptime

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
deleted file mode 100644 (file)
index 4400a23..0000000
--- a/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2
+++ /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.
-
-Hostname "{{ collectd_hostname }}"
-Interval "{{ collectd_interval }}"
-
-
-#LoadPlugin contextswitch
-#LoadPlugin cpu
-#LoadPlugin cpufreq
-#LoadPlugin df
-#LoadPlugin disk
-#LoadPlugin ethstat
-#LoadPlugin ipc
-#LoadPlugin irq
-#LoadPlugin load
-#LoadPlugin memory
-#LoadPlugin numa
-#LoadPlugin processes
-#LoadPlugin swap
-#LoadPlugin turbostat
-#LoadPlugin uptime
-

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index 383b53d..9007874 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -121,7 +121,16 @@ Clone barometer repo
 .. code:: bash
 
     $ git clone https://gerrit.opnfv.org/gerrit/barometer
-    $ cd barometer/docker/ansible
+    $ cd barometer
+
+Install ansible dependencies
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To run the ansible playbooks for the one-click install, additional dependencies are needed.
+There are listed in requirements.yml and can be installed using::
+
+  $ ansible-galaxy install -r $barometer_dir/requirements.yml
+
 
 Edit inventory file
 ^^^^^^^^^^^^^^^^^^^

diff --git a/requirements.yml b/requirements.yml
new file mode 100644 (file)
index 0000000..47720b5
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,4 @@
+---
+- src: http://github.com/infrawatch/collectd-config-ansible-role
+  version: master
+  name: collectd_config