openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable collectd health check"

This commit is contained in:
Zuul 2018-03-14 04:32:27 +00:00 committed by Gerrit Code Review
parent 41fffa9f8c 3a76b9e7ba
commit 09a3c8b379
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/collectd.yaml
View File

@ -97,6 +97,8 @@ outputs:
privileged: true privileged: true
user: root user: root
restart: always restart: always
healthcheck:
test: /openstack/healthcheck
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}

3
puppet/services/metrics/collectd.yaml
View File

@ -37,6 +37,7 @@ parameters:
- memory - memory
- processes - processes
- tcpconns - tcpconns
- unixsock
type: comma_delimited_list type: comma_delimited_list
description: > description: >
List of collectd plugins to activate on all overcloud hosts. See List of collectd plugins to activate on all overcloud hosts. See
@ -206,6 +207,8 @@ outputs:
collectd::recurse: true collectd::recurse: true
collectd::purge_config: true collectd::purge_config: true
collectd::minimum_version: "5.7" collectd::minimum_version: "5.7"
collectd::plugin::unixsock::socketgroup: root
collectd::plugin::unixsock::socketfile: /var/run/collectd-socket
tripleo.collectd.plugins.collectd: tripleo.collectd.plugins.collectd:
yaql: yaql:
data: data: