From 8ab29b368513241783931166bc4c89a9207842c9 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 30 Jan 2023 13:44:19 +0100 Subject: [PATCH] collectd_exporter: Move hiera data to class --- REFERENCE.md | 18 ++++++++++++++++++ data/defaults.yaml | 9 --------- manifests/collectd_exporter.pp | 18 +++++++++--------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index e3990a68..fa7bf252 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -2791,6 +2791,8 @@ Data type: `String` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[String[1]]` @@ -2805,18 +2807,24 @@ Data type: `Prometheus::Uri` Base URL for the binary archive +Default value: `'https://github.com/prometheus/collectd_exporter/releases'` + ##### `options` Data type: `String` Options added to the startup command +Default value: `''` + ##### `group` Data type: `String[1]` Group under which the binary is running +Default value: `'collectd-exporter'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -2871,12 +2879,16 @@ Data type: `String[1]` If package, then use this for package ensure default 'latest' +Default value: `'latest'` + ##### `package_name` Data type: `String[1]` The binary package name - not available yet +Default value: `'collectd_exporter'` + ##### `purge_config_dir` Data type: `Boolean` @@ -2915,18 +2927,24 @@ Data type: `String[1]` Name of the collectd exporter service (default 'collectd_exporter') +Default value: `'collectd_exporter'` + ##### `user` Data type: `String[1]` User which runs the service +Default value: `'collectd-exporter'` + ##### `version` Data type: `String[1]` The binary release version +Default value: `'0.5.0'` + ##### `proxy_server` Data type: `Optional[String[1]]` diff --git a/data/defaults.yaml b/data/defaults.yaml index fd3126b7..83a33280 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -285,12 +285,3 @@ prometheus::graphite_exporter::manage_service: true prometheus::graphite_exporter::manage_user: true prometheus::graphite_exporter::version: '0.9.0' prometheus::graphite_exporter::options: '' -prometheus::collectd_exporter::download_extension: 'tar.gz' -prometheus::collectd_exporter::download_url_base: 'https://github.com/prometheus/collectd_exporter/releases' -prometheus::collectd_exporter::group: 'collectd-exporter' -prometheus::collectd_exporter::package_ensure: 'latest' -prometheus::collectd_exporter::package_name: 'collectd_exporter' -prometheus::collectd_exporter::service_name: 'collectd_exporter' -prometheus::collectd_exporter::user: 'collectd-exporter' -prometheus::collectd_exporter::version: '0.5.0' -prometheus::collectd_exporter::options: '' diff --git a/manifests/collectd_exporter.pp b/manifests/collectd_exporter.pp index a2f9ff98..1491f024 100644 --- a/manifests/collectd_exporter.pp +++ b/manifests/collectd_exporter.pp @@ -48,15 +48,15 @@ # @param proxy_type # Optional proxy server type (none|http|https|ftp) class prometheus::collectd_exporter ( - String $download_extension, - Prometheus::Uri $download_url_base, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $service_name, - String[1] $user, - String[1] $version, - String $options, + String $download_extension = 'tar.gz', + Prometheus::Uri $download_url_base = 'https://github.com/prometheus/collectd_exporter/releases', + String[1] $group = 'collectd-exporter', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'collectd_exporter', + String[1] $service_name = 'collectd_exporter', + String[1] $user = 'collectd-exporter', + String[1] $version = '0.5.0', + String $options = '', # lint:ignore:params_empty_string_assignment String[1] $os = downcase($facts['kernel']), Prometheus::Initstyle $init_style = $prometheus::init_style, Prometheus::Install $install_method = $prometheus::install_method,