From b8de306d51456d840f91198fcf2640ca377c9cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 19 Mar 2019 17:01:23 -0400 Subject: [PATCH] fix service name for apache exporter --- data/Debian.yaml | 1 + manifests/apache_exporter.pp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/Debian.yaml b/data/Debian.yaml index 2a53f53c1..e07454391 100644 --- a/data/Debian.yaml +++ b/data/Debian.yaml @@ -8,6 +8,7 @@ prometheus::node_exporter::package_name: 'prometheus-node-exporter' prometheus::node_exporter::service_name: 'prometheus-node-exporter' prometheus::node_exporter::group: 'prometheus' prometheus::node_exporter::user: 'prometheus' +prometheus::apache_exporter::service_name: 'prometheus-apache-exporter' prometheus::configname: 'prometheus.yml' prometheus::server::user: 'root' prometheus::server::group: 'root' diff --git a/manifests/apache_exporter.pp b/manifests/apache_exporter.pp index 61de1b4ab..ace0282fa 100644 --- a/manifests/apache_exporter.pp +++ b/manifests/apache_exporter.pp @@ -89,6 +89,7 @@ Boolean $restart_on_change = true, Boolean $service_enable = true, String[1] $service_ensure = 'running', + String $service_name = 'apache_exporter', String[1] $init_style = $prometheus::init_style, String[1] $install_method = $prometheus::install_method, Boolean $manage_group = true, @@ -105,13 +106,13 @@ #Please provide the download_url for versions < 0.9.0 $real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}") $notify_service = $restart_on_change ? { - true => Service['apache_exporter'], + true => Service[$service_name], default => undef, } $options = "-scrape_uri \"${scrape_uri}\" ${extra_options}" - prometheus::daemon { 'apache_exporter': + prometheus::daemon { $service_name: install_method => $install_method, version => $version, download_extension => $download_extension,