From e06aed634ee571d37b10673b0cb750ff52a1209f Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 2 Jan 2025 15:35:43 +0100 Subject: [PATCH] pushgateway_exporter: Move data from hiera to puppet class --- REFERENCE.md | 14 ++++++++++++++ data/defaults.yaml | 7 ------- manifests/pushgateway.pp | 14 +++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 72ae775d2..eda920378 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -10447,6 +10447,8 @@ Data type: `String[1]` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[String]` @@ -10461,12 +10463,16 @@ Data type: `String[1]` Base URL for the binary archive +Default value: `'https://github.com/prometheus/pushgateway/releases'` + ##### `extra_groups` Data type: `Array` Extra groups to add the binary user to +Default value: `[]` + ##### `extra_options` Data type: `Optional[String[1]]` @@ -10481,6 +10487,8 @@ Data type: `String[1]` Group under which the binary is running +Default value: `'pushgateway'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -10535,12 +10543,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: `'pushgateway'` + ##### `restart_on_change` Data type: `Boolean` @@ -10579,6 +10591,8 @@ Data type: `String[1]` User which runs the service +Default value: `'pushgateway'` + ##### `version` Data type: `String[1]` diff --git a/data/defaults.yaml b/data/defaults.yaml index e05ec1377..243f63c69 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -116,13 +116,6 @@ prometheus::process_exporter::package_name: 'process-exporter' prometheus::process_exporter::service_name: 'process-exporter' prometheus::process_exporter::user: 'process-exporter' prometheus::process_exporter::config_path: '/etc/process-exporter.yaml' -prometheus::pushgateway::download_extension: 'tar.gz' -prometheus::pushgateway::download_url_base: 'https://github.com/prometheus/pushgateway/releases' -prometheus::pushgateway::extra_groups: [] -prometheus::pushgateway::group: 'pushgateway' -prometheus::pushgateway::package_ensure: 'latest' -prometheus::pushgateway::package_name: 'pushgateway' -prometheus::pushgateway::user: 'pushgateway' prometheus::rabbitmq_exporter::download_extension: 'tar.gz' prometheus::rabbitmq_exporter::download_url_base: 'https://github.com/kbudde/rabbitmq_exporter/releases' prometheus::rabbitmq_exporter::extra_groups: [] diff --git a/manifests/pushgateway.pp b/manifests/pushgateway.pp index 3e76a60d4..3c4a5492e 100644 --- a/manifests/pushgateway.pp +++ b/manifests/pushgateway.pp @@ -48,13 +48,13 @@ # @param proxy_type # Optional proxy server type (none|http|https|ftp) class prometheus::pushgateway ( - String[1] $download_extension, - String[1] $download_url_base, - Array $extra_groups, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $user, + String[1] $download_extension = 'tar.gz', + String[1] $download_url_base = 'https://github.com/prometheus/pushgateway/releases', + Array $extra_groups = [], + String[1] $group = 'pushgateway', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'pushgateway', + String[1] $user = 'pushgateway', # renovate: depName=prometheus/pushgateway String[1] $version = '1.9.0', Boolean $restart_on_change = true,