From e56f9e304fa12eef915da4d8e2c0218ca1155ca3 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Wed, 14 Dec 2016 22:07:26 -0500 Subject: updates to collectd support Based on Steve Hardy's comments in https://review.openstack.org/#/c/413748/, we need to move handling of the list of plugins out of the heat templates and into puppet. This module now uses the service_names variable to look up information on per-service collectd plugins. Change-Id: Ie5fba01e1f91ffdc39eb0eb1be9b1464c797b04f --- manifests/profile/base/metrics/collectd/collectd_plugin.pp | 6 ++++++ manifests/profile/base/metrics/collectd/collectd_service.pp | 11 +++++++++++ 2 files changed, 17 insertions(+) create mode 100644 manifests/profile/base/metrics/collectd/collectd_plugin.pp create mode 100644 manifests/profile/base/metrics/collectd/collectd_service.pp (limited to 'manifests/profile/base/metrics/collectd') diff --git a/manifests/profile/base/metrics/collectd/collectd_plugin.pp b/manifests/profile/base/metrics/collectd/collectd_plugin.pp new file mode 100644 index 0000000..5ab940b --- /dev/null +++ b/manifests/profile/base/metrics/collectd/collectd_plugin.pp @@ -0,0 +1,6 @@ +# We use this to transform a list of unqualified plugin names +# (like ['disk', 'ntpd']) into the correct collectd plugin classes. +define tripleo::profile::base::metrics::collectd::collectd_plugin ( +) { + include "collectd::plugin::${title}" +} diff --git a/manifests/profile/base/metrics/collectd/collectd_service.pp b/manifests/profile/base/metrics/collectd/collectd_service.pp new file mode 100644 index 0000000..c1b3a60 --- /dev/null +++ b/manifests/profile/base/metrics/collectd/collectd_service.pp @@ -0,0 +1,11 @@ +# This is used to look up a list of service-specific collectd plugins +# in the hiera data provided by THT. +define tripleo::profile::base::metrics::collectd::collectd_service ( +) { + $plugins = hiera("tripleo.collectd.plugins.${title}", []) + + if $plugins { + ::tripleo::profile::base::metrics::collectd::collectd_plugin { + $plugins: } + } +} -- cgit 1.2.3-korg