15 files changed, 76 insertions, 78 deletions
diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml
index f57d55d7..cfca03a2 100644
--- a/docker/ansible/roles/config_files/tasks/capabilities.yml
+++ b/docker/ansible/roles/config_files/tasks/capabilities.yml
@@ -1,4 +1,4 @@
-#Copyright 2019 OPNFV and Intel Corporation
+# Copyright 2019-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
 ---
 
 - name: enable capabilities plugin
-  template:
-    src: capabilities.conf.j2
-    dest: "{{ config_file_dir }}/capabilities.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['capabilities']) | unique }}"
   tags:
     - capabilities
 
-
diff --git a/docker/ansible/roles/config_files/tasks/csv.yml b/docker/ansible/roles/config_files/tasks/csv.yml
index 0be4ec8f..bfd88c0e 100644
--- a/docker/ansible/roles/config_files/tasks/csv.yml
+++ b/docker/ansible/roles/config_files/tasks/csv.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
 ---
 
 - name: enable csv plugin
-  template:
-    src: csv.conf.j2
-    dest: "{{ config_file_dir }}/csv.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['csv']) | unique }}"
   tags:
     - csv
 
diff --git a/docker/ansible/roles/config_files/tasks/dpdk.yml b/docker/ansible/roles/config_files/tasks/dpdk.yml
index 5ae05cbb..a022de9e 100644
--- a/docker/ansible/roles/config_files/tasks/dpdk.yml
+++ b/docker/ansible/roles/config_files/tasks/dpdk.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@
     - dpdkevents
 
 - name: enable dpdk_telemetry plugin
-  template:
-    src: dpdk_telemetry.conf.j2
-    dest: "{{ config_file_dir }}/dpdk_telemetry.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['dpdk_telemetry']) | unique }}"
   tags:
     - dpdk_telemetry
diff --git a/docker/ansible/roles/config_files/tasks/exec.yml b/docker/ansible/roles/config_files/tasks/exec.yml
index b7389703..956e3a8f 100644
--- a/docker/ansible/roles/config_files/tasks/exec.yml
+++ b/docker/ansible/roles/config_files/tasks/exec.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-
 - name: enable exec plugin
-  template:
-    src: exec.conf.j2
-    dest: "{{ config_file_dir }}/exec.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['exec']) | unique }}"
   tags:
     - exec
diff --git a/docker/ansible/roles/config_files/tasks/hugepages.yml b/docker/ansible/roles/config_files/tasks/hugepages.yml
index 43dca504..5b4ec0ba 100644
--- a/docker/ansible/roles/config_files/tasks/hugepages.yml
+++ b/docker/ansible/roles/config_files/tasks/hugepages.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,9 +25,8 @@
     - hugepages
 
 - name: enable hugepages plugin
-  template:
-    src: hugepages.conf.j2
-    dest: "{{ config_file_dir }}//hugepages.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['hugepages']) | unique }}"
   when: hugepages_result is succeeded
   tags:
     - hugepages
diff --git a/docker/ansible/roles/config_files/tasks/ipmi.yml b/docker/ansible/roles/config_files/tasks/ipmi.yml
index 558d5393..12913a85 100644
--- a/docker/ansible/roles/config_files/tasks/ipmi.yml
+++ b/docker/ansible/roles/config_files/tasks/ipmi.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,9 +52,8 @@
      - ipmi
 
 - name: enable ipmi plugin
-  template:
-    src: ipmi.conf.j2
-    dest: "{{ config_file_dir }}/0_ipmi.conf"
+  set_fact:
+    collectd_plugins: '{{ collectd_plugins | union(["ipmi"]) | unique }}'
   when: (ipmi0_exists is succeeded) and (ipmi_devintf is succeeded) and (ipmi_devsi is succeeded)
   tags:
     - ipmi
diff --git a/docker/ansible/roles/config_files/tasks/kafka.yml b/docker/ansible/roles/config_files/tasks/kafka.yml
index d7639cbf..6fb3f050 100644
--- a/docker/ansible/roles/config_files/tasks/kafka.yml
+++ b/docker/ansible/roles/config_files/tasks/kafka.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
 # limitations under the License.
 ---
 
-- name: enable kafka plugin
-  template:
-    src: kafka.conf.j2
-    dest: "{{ config_file_dir }}/kafka.conf"
+- name: enable kafka plugin with collectd_config
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['write_kafka']) | unique }}"
   tags:
     - kafka
diff --git a/docker/ansible/roles/config_files/tasks/logfile.yml b/docker/ansible/roles/config_files/tasks/logfile.yml
index b2700594..cd1c1049 100644
--- a/docker/ansible/roles/config_files/tasks/logfile.yml
+++ b/docker/ansible/roles/config_files/tasks/logfile.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,12 +14,8 @@
 ---
 
 - name: enable logfile plugin
-  template:
-    src: logfile.conf.j2
-    dest: "{{ config_file_dir }}/logfile.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['logfile']) | unique }}"
   tags:
     - logfile
 
-
-
-
diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml
index 4a25e4eb..eab356d9 100644
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@ -83,6 +83,9 @@
 - name: enable syslog plugin
   import_tasks: syslog.yml
 
+- name: enable ovs plugins
+  import_tasks: ovs.yml
+
 - name: enable virt plugin
   import_tasks: virt.yml
 
@@ -101,13 +104,23 @@
     - always
     - en_default_all
 
-- name: "Copy the generated plugin configs"
-  shell:
-    sudo cp /tmp/collectd.conf.d/*.conf {{ config_file_dir }} && sudo cp /tmp/collectd.conf {{ config_file_dir }}/../collectd.conf
+- name: Copy the generated plugin configs
+  copy:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - { src: "/tmp/collectd.conf.d/", dest: "{{ config_file_dir }}" }
+    - { src: "/tmp/collectd.conf", dest: "{{ config_file_dir }}/../collectd.conf" }
   tags:
     - always
     - en_default_all
 
+- name: Update TypesDB location
+  lineinfile:
+    path: "{{ config_file_dir }}../collectd.conf"
+    regexp: '^TypesDB "/usr/share/collectd/types.db"$'
+    line: 'TypesDB "/opt/collectd/share/collectd/types.db"'
+
 - name: Update config file location
   lineinfile:
     path: "{{ config_file_dir }}../collectd.conf"
diff --git a/docker/ansible/roles/config_files/tasks/network.yml b/docker/ansible/roles/config_files/tasks/network.yml
index 52902d4c..0af6a713 100644
--- a/docker/ansible/roles/config_files/tasks/network.yml
+++ b/docker/ansible/roles/config_files/tasks/network.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,26 +14,24 @@
 ---
 
 - name: Enable network plugin
-  template:
-    src: network.conf.j2
-    dest: "{{ config_file_dir }}/network.conf"
+  set_fact:
+    collectd_plugins: '{{ collectd_plugins | union (["network"]) | unique }}'
   tags:
      - network
 
 - name: Add network port if defined
-  lineinfile:
-    dest: "{{ config_file_dir }}/network.conf"
-    insertafter: Plugin network
-    line: "    Server \"{{ network_ip_addr }}\" \"{{ network_port }}\""
+  set_fact:
+    collectd_plugin_network_server: "{{ collectd_plugin_network_server | default([]) | union([{
+        'name': network_ip_addr,
+        'port': network_port,
+      }]) }}"
   when: network_ip_addr is defined
   tags:
    - network
 
 - name: Modify network.conf to add influxdb_hosts
-  lineinfile:
-    dest: "{{ config_file_dir }}/network.conf"
-    insertafter: Plugin network
-    line: "    Server \"{{ item }}\" \"{{ influx_network_port }}\""
+  set_fact:
+    collectd_plugin_network_server: "{{ collectd_plugin_network_server | default([]) | union([{ 'name': item, 'port': influx_network_port }]) }}"
   with_items: "{{ groups['influxdb_hosts'] }}"
   tags:
    - network
diff --git a/docker/ansible/roles/config_files/tasks/vswitch.yml b/docker/ansible/roles/config_files/tasks/ovs.yml
index c3028822..fe3f0a13 100644
--- a/docker/ansible/roles/config_files/tasks/vswitch.yml
+++ b/docker/ansible/roles/config_files/tasks/ovs.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,17 +31,21 @@
      - ovs_events
 
 - name: enable ovs_stats plugin
-  template:
-    src: "ovs_stats.conf.j2"
-    dest: "{{ config_file_dir }}/ovs_stats.conf"
+  set_fact:
+    collectd_plugins: '{{ collectd_plugins | union(["ovs_stats"]) | unique }}'
+    collectd_plugin_ovs_stats_port: "{{ ovs_stats_port if ovs_stats_port is defined else omit }}"
+    collectd_plugin_ovs_stats_address: "{{ ovs_stats_ip_addr if ovs_stats_ip_addr is defined else omit }}"
+    collectd_plugin_ovs_stats_interval: "{{ ovs_stats_interval if ovs_stats_interval is defined else omit }}"
   when: (vswitchd_running is succeeded) and (dbsock_exists is succeeded)
   tags:
-   - ovs_stats
+    - ovs_stats
 
 - name: enable ovs_events plugin
-  template:
-    src: "ovs_events.conf.j2"
-    dest: "{{ config_file_dir }}/ovs_events.conf"
+  set_fact:
+    collectd_plugins: '{{ collectd_plugins | union(["ovs_events"]) | unique }}'
+    collectd_plugin_ovs_events_interval: "{{ ovs_events_interval if ovs_events_interval is defined else omit }}"
+    collectd_plugin_ovs_events_address: "{{ ovs_events_ip_addr if ovs_events_ip_addr is defined else omit }}"
+    collectd_plugin_ovs_events_port: "{{ ovs_events_port if ovs_events_port is defined else omit }}"
   when: (vswitchd_running is succeeded) and (dbsock_exists is succeeded)
   tags:
     - ovs_events
diff --git a/docker/ansible/roles/config_files/tasks/pmu.yml b/docker/ansible/roles/config_files/tasks/pmu.yml
index 20e3034c..c5820f98 100644
--- a/docker/ansible/roles/config_files/tasks/pmu.yml
+++ b/docker/ansible/roles/config_files/tasks/pmu.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 ---
 
 - name: enable intel_pmu plugin
-  template:
-    src: intel_pmu.conf.j2
-    dest: "{{ config_file_dir }}/intel_pmu.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['intel_pmu']) | unique }}"
   tags:
     - pmu
diff --git a/docker/ansible/roles/config_files/tasks/prometheus.yml b/docker/ansible/roles/config_files/tasks/prometheus.yml
index 51f2b1f6..c0e7e79d 100644
--- a/docker/ansible/roles/config_files/tasks/prometheus.yml
+++ b/docker/ansible/roles/config_files/tasks/prometheus.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 ---
 
 - name: enable prometheus plugin
-  template:
-    src: prometheus.conf.j2
-    dest: "{{ config_file_dir }}/prometheus.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['write_prometheus']) | unique }}"
   tags:
-     - prometheus
-\ No newline at end of file
+     - prometheus
diff --git a/docker/ansible/roles/config_files/tasks/syslog.yml b/docker/ansible/roles/config_files/tasks/syslog.yml
index 97864a5d..e9ab06f3 100644
--- a/docker/ansible/roles/config_files/tasks/syslog.yml
+++ b/docker/ansible/roles/config_files/tasks/syslog.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
 ---
 
 - name: enable syslog plugin
-  template:
-    src: syslog.conf.j2
-    dest: "{{ config_file_dir }}/syslog.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['syslog']) | unique }}"
   tags:
     - syslog
 
diff --git a/docker/ansible/roles/config_files/tasks/uuid.yml b/docker/ansible/roles/config_files/tasks/uuid.yml
index 25cfa128..df669e1a 100644
--- a/docker/ansible/roles/config_files/tasks/uuid.yml
+++ b/docker/ansible/roles/config_files/tasks/uuid.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 ---
 
 - name: enable uuid plugin
-  template:
-    src: uuid.conf.j2
-    dest: "{{ config_file_dir }}/uuid.conf"
+  set_fact:
+    collectd_plugins: "{{ collectd_plugins | union(['uuid']) | unique }}"
   tags:
     - uuid