From 7a42be4063ff3c3e4e1578c2d52989047fe8c89a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 2 Jan 2025 17:19:16 +0100 Subject: [PATCH] haproxy_exporter: Move data from hiera to puppet class --- REFERENCE.md | 18 ++++++++++++++++++ data/defaults.yaml | 9 --------- manifests/haproxy_exporter.pp | 18 +++++++++--------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 3b479fc19..d7832047e 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -4741,12 +4741,16 @@ Data type: `Variant[Stdlib::HTTPUrl, Pattern[/unix:(?:\/.+)+/]]` The URI to obtain HAProxy stats from +Default value: `'http://localhost:1234/haproxy?stats;csv'` + ##### `download_extension` Data type: `String` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[Prometheus::Uri]` @@ -4761,12 +4765,16 @@ Data type: `Prometheus::Uri` Base URL for the binary archive +Default value: `'https://github.com/prometheus/haproxy_exporter/releases'` + ##### `extra_groups` Data type: `Array` Extra groups to add the binary user to +Default value: `[]` + ##### `extra_options` Data type: `Optional[String[1]]` @@ -4781,6 +4789,8 @@ Data type: `String[1]` Group under which the binary is running +Default value: `'haproxy-exporter'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -4835,12 +4845,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: `'haproxy_exporter'` + ##### `purge_config_dir` Data type: `Boolean` @@ -4879,12 +4893,16 @@ Data type: `String[1]` Name of the haproxy exporter service (default 'haproxy_exporter') +Default value: `'haproxy_exporter'` + ##### `user` Data type: `String[1]` User which runs the service +Default value: `'haproxy-user'` + ##### `version` Data type: `String[1]` diff --git a/data/defaults.yaml b/data/defaults.yaml index 8fa9f1e2b..66a0b4ef1 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -89,15 +89,6 @@ prometheus::mesos_exporter::user: 'mesos-exporter' prometheus::mesos_exporter::package_ensure: 'latest' prometheus::mesos_exporter::package_name: 'mesos_exporter' prometheus::mesos_exporter::service_name: 'mesos_exporter' -prometheus::haproxy_exporter::cnf_scrape_uri: 'http://localhost:1234/haproxy?stats;csv' -prometheus::haproxy_exporter::download_extension: 'tar.gz' -prometheus::haproxy_exporter::download_url_base: 'https://github.com/prometheus/haproxy_exporter/releases' -prometheus::haproxy_exporter::extra_groups: [] -prometheus::haproxy_exporter::group: 'haproxy-exporter' -prometheus::haproxy_exporter::package_ensure: 'latest' -prometheus::haproxy_exporter::package_name: 'haproxy_exporter' -prometheus::haproxy_exporter::service_name: 'haproxy_exporter' -prometheus::haproxy_exporter::user: 'haproxy-user' prometheus::nginx_vts_exporter::nginx_scrape_uri: 'http://localhost/status/format/json' prometheus::nginx_vts_exporter::download_extension: 'tar.gz' prometheus::nginx_vts_exporter::download_url_base: 'https://github.com/hnlq715/nginx-vts-exporter/releases' diff --git a/manifests/haproxy_exporter.pp b/manifests/haproxy_exporter.pp index 145e1d811..c32ae27be 100644 --- a/manifests/haproxy_exporter.pp +++ b/manifests/haproxy_exporter.pp @@ -58,15 +58,15 @@ # @note # This class is deprecated. class prometheus::haproxy_exporter ( - Variant[Stdlib::HTTPUrl, Pattern[/unix:(?:\/.+)+/]] $cnf_scrape_uri, - String $download_extension, - Array $extra_groups, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $user, - String[1] $service_name, - Prometheus::Uri $download_url_base, + Variant[Stdlib::HTTPUrl, Pattern[/unix:(?:\/.+)+/]] $cnf_scrape_uri = 'http://localhost:1234/haproxy?stats;csv', + String $download_extension = 'tar.gz', + Array $extra_groups = [], + String[1] $group = 'haproxy-exporter', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'haproxy_exporter', + String[1] $user = 'haproxy-user', + String[1] $service_name = 'haproxy_exporter', + Prometheus::Uri $download_url_base = 'https://github.com/prometheus/haproxy_exporter/releases', # renovate: depName=prometheus/haproxy_exporter String[1] $version = '0.15.0', Boolean $purge_config_dir = true,