Merge "Add config option for collectd libpodstats" into stable/ussuri

ci/environments/scenario001-multinode-containers.yaml

@@ -176,6 +176,7 @@ parameter_defaults:
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
+  CollectdEnableLibpodstats: true
   LoggingServers:
     - host: 127.0.0.1
       port: 24224

ci/environments/scenario001-standalone.yaml

@@ -163,6 +163,7 @@ parameter_defaults:
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
+  CollectdEnableLibpodstats: true
   CollectdAmqpInstances:
     notify:
       notify: true

deployment/metrics/collectd-container-puppet.yaml

@@ -370,6 +370,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:
@@ -396,6 +400,8 @@ conditions:
   sensubility_needs_sudo:
     not:
       equals: [{get_param: CollectdSensubilityExecSudoRule}, '']
+  enable_libpodstats:
+    equals: [{get_param: CollectdEnableLibpodstats}, true]
 
 resources:
   ContainersCommon:
@@ -647,6 +653,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: