From 597c00cead3da3028c831bb64d11d252191d7263 Mon Sep 17 00:00:00 2001
From: pleimer <pfbleimer@gmail.com>
Date: Mon, 28 Sep 2020 15:41:23 -0400
Subject: [PATCH] Add config option for collectd libpodstats

Change-Id: I1f47772d01e10b3f399bd4ba3da90b6016e407b0
Depends-On: https://review.opendev.org/#/c/757343/
Signed-off-by: pleimer <pfbleimer@gmail.com>
(cherry picked from commit 824f1b8d3b106921e104885f026a9dc0cced0130)
(cherry picked from commit 15faa808a2ffe9c2d0628115b4bdf780feb491c0)
---
 ci/environments/scenario001-multinode-containers.yaml |  1 +
 ci/environments/scenario001-standalone.yaml           |  1 +
 deployment/metrics/collectd-container-puppet.yaml     | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 7ddc9d1843..f8f38108c5 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -170,6 +170,7 @@ parameter_defaults:
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
+  CollectdEnableLibpodstats: true
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index f578df4ff2..58af90d71a 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -162,6 +162,7 @@ parameter_defaults:
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
+  CollectdEnableLibpodstats: true
   CollectdAmqpInstances:
     notify:
       notify: true
diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index 641db5d934..041da2ee1b 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -366,6 +366,10 @@ parameters:
     type: boolean
     description: Set to true to enable mcelog
     default: false
+  CollectdEnableLibpodstats:
+    type: boolean
+    description: Set to true if collectd should run the libpodstats plugin
+    default: false
 
 conditions:
   amqp_connection:
@@ -391,6 +395,8 @@ conditions:
   sensubility_needs_sudo:
     not:
       equals: [{get_param: CollectdSensubilityExecSudoRule}, '']
+  enable_libpodstats:
+    equals: [{get_param: CollectdEnableLibpodstats}, true]
 
 resources:
   ContainersCommon:
@@ -632,6 +638,11 @@ outputs:
                         occurrences: {get_param: CollectdContainerHealthCheckOccurrences}
                         refresh: {get_param: CollectdContainerHealthCheckRefresh}
             - {}
+          - if:
+            - enable_libpodstats
+            - tripleo::profile::base::metrics::collectd::enable_libpodstats:
+                get_param: CollectdEnableLibpodstats
+            - {}
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config: