From 0b13905447d83b849c217fdd6cdff88b5e209f9e Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 6 May 2020 15:35:32 +0200 Subject: [PATCH] Enable collectd-ceph plugin only where needed We need to ensure that ceph plugin is enabled only on relevant nodes, otherwise it might bring whole collectd down (unlike other collectd plugins) Change-Id: I36735dc6699e957ee8903ee5a8e9f642740ea5d3 --- deployment/ceph-ansible/ceph-mon.yaml | 5 +++++ deployment/ceph-ansible/ceph-osd.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index 032344c7bf..6e7b4c8665 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -95,6 +95,11 @@ outputs: - - '9100' - [] upgrade_tasks: [] + service_config_settings: + collectd: + tripleo.collectd.plugins.ceph_osd: + - ceph + collectd::plugin::ceph::daemons: [] puppet_config: config_image: '' config_volume: '' diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index 9a7ea3ad08..25e4cb896a 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -83,6 +83,11 @@ outputs: tags: validation when: step|int == 0 shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)" + service_config_settings: + collectd: + tripleo.collectd.plugins.ceph_osd: + - ceph + collectd::plugin::ceph::daemons: [] puppet_config: config_image: '' config_volume: ''