Browse Source

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

changes/22/759722/1
Zuul 8 months ago
committed by Gerrit Code Review
parent
commit
e0d5dd1090
3 changed files with 13 additions and 0 deletions
  1. +1
    -0
      ci/environments/scenario001-multinode-containers.yaml
  2. +1
    -0
      ci/environments/scenario001-standalone.yaml
  3. +11
    -0
      deployment/metrics/collectd-container-puppet.yaml

+ 1
- 0
ci/environments/scenario001-multinode-containers.yaml View File

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


+ 1
- 0
ci/environments/scenario001-standalone.yaml View File

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


+ 11
- 0
deployment/metrics/collectd-container-puppet.yaml View File

@ -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:


Loading…
Cancel
Save