7 files changed, 80 insertions, 6 deletions
diff --git a/docker/ansible/roles/build_collectd/tasks/main.yml b/docker/ansible/roles/build_collectd/tasks/main.yml
new file mode 100644
index 00000000..6faddde5
--- /dev/null
+++ b/docker/ansible/roles/build_collectd/tasks/main.yml
@@ -0,0 +1,71 @@
+# Copyright 2021 Anuket and others
+#
+# 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: Build stable container
+  docker_image:
+    name: anuket/barometer-collectd
+    build:
+      path: "{{ playbook_dir }}/../barometer-collectd/"
+    source: build
+  tags:
+    - stable
+
+- name: Build the latest container
+  docker_image:
+    name: anuket/barometer-collectd-latest
+    build:
+      path: "{{ playbook_dir }}/../../"
+      dockerfile: "docker/barometer-collectd-latest/Dockerfile"
+    source: build
+  tags:
+    - latest
+
+- name: Build collectd-experimental
+  docker_image:
+    name: anuket/barometer-collectd-experimental
+    build:
+      path: "{{ playbook_dir }}/../../"
+      dockerfile: "docker/barometer-collectd-experimental/Dockerfile"
+      args:
+        COLLECTD_FLAVOR: experimental
+        COLLECTD_TAG: "{{ COLLECTD_TAG | default('main') }}"
+        COLLECTD_PULL_REQUESTS: "{{ COLLECTD_PULL_REQUESTS | default() }}"
+    source: build
+  tags:
+    - experimental
+
+- name: Build collectd-6
+  docker_image:
+    name: "anuket/barometer-collectd-6{{ ( '-' + COLLECTD_PULL_REQUESTS ) if COLLECTD_PULL_REQUESTS is defined else '' }}"
+    build:
+      path: "{{ playbook_dir }}/../../"
+      dockerfile: "docker/barometer-collectd-experimental/Dockerfile"
+      args:
+        COLLECTD_FLAVOR: collectd-6
+        COLLECTD_TAG: "{{ COLLECTD_TAG | default('collectd-6.0') }}"
+        COLLECTD_CONFIG_CMD_ARGS: "{{ COLLECTD_CONFIG_CMD_ARGS if COLLECTD_CONFIG_CMD_ARGS is defined }}"
+    source: build
+  tags:
+    - collectd-6
+
+- name: Build test_app for write_http
+  docker_image:
+    name: test-collectd-write_http
+    build:
+      path: "{{ playbook_dir }}/../flask_app/"
+    source: build
+  tags:
+    - flask_test
+    - never
+
diff --git a/docker/ansible/roles/config_files/tasks/logparser.yml b/docker/ansible/roles/config_files/tasks/logparser.yml
index 615d2e2b..72adcea2 100644
--- a/docker/ansible/roles/config_files/tasks/logparser.yml
+++ b/docker/ansible/roles/config_files/tasks/logparser.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.
@@ -15,9 +15,8 @@
 
 - name: enable logparser plugin
   template:
-    src: experimental/logparser.conf.j2
+    src: logparser.conf.j2
     dest: "{{ config_file_dir }}/logparser.conf"
-  when: flavor|default('stable')|string == 'experimental'
   tags:
     - logparser
 
diff --git a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 b/docker/ansible/roles/config_files/templates/logparser.conf.j2
index 1f1a725b..1f1a725b 100644
--- a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2
+++ b/docker/ansible/roles/config_files/templates/logparser.conf.j2
diff --git a/docker/ansible/roles/config_files/vars/main.yml b/docker/ansible/roles/config_files/vars/main.yml
index 410e24ed..02fd7fb9 100644
--- a/docker/ansible/roles/config_files/vars/main.yml
+++ b/docker/ansible/roles/config_files/vars/main.yml
@@ -18,6 +18,9 @@ collectd_hostname: "{{ inventory_hostname }}"
 
 collectd_plugin_capabilities_port: "9564"
 
+collectd_plugin_cpu_valuespercentage: False
+collectd_plugin_cpu_reportbystate: True
+
 collectd_plugin_csv_datadir: "{{ csv_log_dir }}"
 collectd_plugin_csv_storerates: False
 
diff --git a/docker/ansible/roles/install_docker/tasks/fedora.yml b/docker/ansible/roles/install_docker/tasks/fedora.yml
index 56eebd59..f2a4f403 100644
--- a/docker/ansible/roles/install_docker/tasks/fedora.yml
+++ b/docker/ansible/roles/install_docker/tasks/fedora.yml
@@ -24,7 +24,7 @@
      packages:
         - python3-dnf
         - python3
-        - libselinux-python
+        - python3-libselinux
 
 - name: set up docker repository
   command: "dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo && dnf makecache"
diff --git a/docker/ansible/roles/run_collectd/tasks/main.yml b/docker/ansible/roles/run_collectd/tasks/main.yml
index 2c5d0e67..bf5aabf5 100644
--- a/docker/ansible/roles/run_collectd/tasks/main.yml
+++ b/docker/ansible/roles/run_collectd/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: remove bar-collectd container
   docker_container:
-    name: bar-collectd
+    name: "{{ collectd_container_name }}"
     state: absent
   tags:
     - rm_containers
@@ -52,7 +52,7 @@
 
 - name: launch collectd container
   docker_container:
-    name: bar-collectd
+    name: "{{ collectd_container_name }}"
     image: "{{ collectd_image_name }}"
     volumes: "{{ volumes_list }}"
     entrypoint: "/run_collectd.sh"
diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml
index 96c9032e..26007ecf 100644
--- a/docker/ansible/roles/run_collectd/vars/main.yml
+++ b/docker/ansible/roles/run_collectd/vars/main.yml
@@ -13,6 +13,7 @@
 # limitations under the License.
 ---
 
+collectd_container_name: "bar-collectd"
 default_flavor: "{{ flavor|default('stable')|string }}"
 flavor_image_name: "{{
          'barometer-collectd-latest' if (default_flavor == 'master' or default_flavor == 'latest') else