From 95206e03bc740bb8ae47125b84a5e0fa3c033ed5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 26 Jun 2023 14:17:10 +0200 Subject: [PATCH 1/3] redis_exporter: Move hiera data to class --- REFERENCE.md | 18 ++++++++++++++++++ data/defaults.yaml | 10 ---------- manifests/redis_exporter.pp | 18 +++++++++--------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 3247a9d0a..4185b482a 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -10944,12 +10944,16 @@ Data type: `Array[String]` Array of address of one or more redis nodes. Defaults to redis://localhost:6379 +Default value: `['redis://localhost:6379']` + ##### `download_extension` Data type: `String` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[Prometheus::Uri]` @@ -10964,12 +10968,16 @@ Data type: `Prometheus::Uri` Base URL for the binary archive +Default value: `'https://github.com/oliver006/redis_exporter/releases'` + ##### `extra_groups` Data type: `Array[String]` Extra groups to add the binary user to +Default value: `[]` + ##### `extra_options` Data type: `Optional[String[1]]` @@ -10986,6 +10994,8 @@ Data type: `String[1]` Group under which the binary is running +Default value: `'redis-exporter'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -11048,12 +11058,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: `'redis_exporter'` + ##### `purge_config_dir` Data type: `Boolean` @@ -11100,12 +11114,16 @@ Data type: `String[1]` User which runs the service +Default value: `'redis-exporter'` + ##### `version` Data type: `String[1]` The binary release version +Default value: `'1.9.0'` + ##### `proxy_server` Data type: `Optional[String[1]]` diff --git a/data/defaults.yaml b/data/defaults.yaml index 563c956f9..64a72550f 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -249,14 +249,4 @@ prometheus::postgres_exporter::package_name: 'postgres_exporter' prometheus::postgres_exporter::postgres_auth_method: 'env' prometheus::postgres_exporter::user: 'postgres-exporter' prometheus::postgres_exporter::version: '0.5.1' -prometheus::redis_exporter::addr: - - 'redis://localhost:6379' -prometheus::redis_exporter::download_extension: 'tar.gz' -prometheus::redis_exporter::download_url_base: 'https://github.com/oliver006/redis_exporter/releases' -prometheus::redis_exporter::extra_groups: [] -prometheus::redis_exporter::group: 'redis-exporter' -prometheus::redis_exporter::package_ensure: 'latest' -prometheus::redis_exporter::package_name: 'redis_exporter' -prometheus::redis_exporter::user: 'redis-exporter' -prometheus::redis_exporter::version: '1.9.0' prometheus::user: 'prometheus' diff --git a/manifests/redis_exporter.pp b/manifests/redis_exporter.pp index 7d081739c..2ad967f16 100644 --- a/manifests/redis_exporter.pp +++ b/manifests/redis_exporter.pp @@ -56,15 +56,15 @@ # @param proxy_type # Optional proxy server type (none|http|https|ftp) class prometheus::redis_exporter ( - Array[String] $addr, - String $download_extension, - Prometheus::Uri $download_url_base, - Array[String] $extra_groups, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $user, - String[1] $version, + Array[String] $addr = ['redis://localhost:6379'], + String $download_extension = 'tar.gz', + Prometheus::Uri $download_url_base = 'https://github.com/oliver006/redis_exporter/releases', + Array[String] $extra_groups = [], + String[1] $group = 'redis-exporter', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'redis_exporter', + String[1] $user = 'redis-exporter', + String[1] $version = '1.9.0', Boolean $purge_config_dir = true, Boolean $restart_on_change = true, Boolean $service_enable = true, From f2140f3af10c80c5e6edf3f28e956b119a7ea7c5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 26 Jun 2023 14:19:33 +0200 Subject: [PATCH 2/3] postgres_exporter: Move hiera data to class --- REFERENCE.md | 20 ++++++++++++++++++++ data/defaults.yaml | 10 ---------- manifests/postgres_exporter.pp | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 4185b482a..5157cdb05 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -9029,6 +9029,8 @@ Data type: `String` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[Prometheus::Uri]` @@ -9043,18 +9045,24 @@ Data type: `Prometheus::Uri` Base URL for the binary archive +Default value: `'https://github.com/prometheus-community/postgres_exporter/releases'` + ##### `extra_groups` Data type: `Array[String[1]]` Extra groups to add the binary user to +Default value: `[]` + ##### `group` Data type: `String[1]` Group under which the binary is running +Default value: `'postgres-exporter'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -9109,12 +9117,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: `'postgres_exporter'` + ##### `purge_config_dir` Data type: `Boolean` @@ -9161,12 +9173,16 @@ Data type: `String[1]` User which runs the service +Default value: `'postgres-exporter'` + ##### `version` Data type: `String[1]` The binary release version +Default value: `'0.5.1'` + ##### `postgres_user` Data type: `Optional[String]` @@ -9191,12 +9207,16 @@ method for presenting username and password to the exporter This can be file, or env (default 'env') Using 'custom' requires 'data_source_custom' values +Default value: `'env'` + ##### `data_source_uri` Data type: `String[1]` Uri on howto connect to the database +Default value: `'host=/var/run/postgresql/ sslmode=disable'` + ##### `proxy_server` Data type: `Optional[String[1]]` diff --git a/data/defaults.yaml b/data/defaults.yaml index 64a72550f..21870ff91 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -239,14 +239,4 @@ prometheus::blackbox_exporter::package_name: 'blackbox_exporter' prometheus::blackbox_exporter::modules: {} prometheus::blackbox_exporter::config_file: '/etc/blackbox-exporter.yaml' prometheus::blackbox_exporter::version: '0.17.0' -prometheus::postgres_exporter::data_source_uri: 'host=/var/run/postgresql/ sslmode=disable' -prometheus::postgres_exporter::download_extension: 'tar.gz' -prometheus::postgres_exporter::download_url_base: 'https://github.com/prometheus-community/postgres_exporter/releases' -prometheus::postgres_exporter::extra_groups: [] -prometheus::postgres_exporter::group: 'postgres-exporter' -prometheus::postgres_exporter::package_ensure: 'latest' -prometheus::postgres_exporter::package_name: 'postgres_exporter' -prometheus::postgres_exporter::postgres_auth_method: 'env' -prometheus::postgres_exporter::user: 'postgres-exporter' -prometheus::postgres_exporter::version: '0.5.1' prometheus::user: 'prometheus' diff --git a/manifests/postgres_exporter.pp b/manifests/postgres_exporter.pp index 70a197071..4a0cfc37c 100644 --- a/manifests/postgres_exporter.pp +++ b/manifests/postgres_exporter.pp @@ -60,16 +60,16 @@ # @param proxy_type # Optional proxy server type (none|http|https|ftp) class prometheus::postgres_exporter ( - String $download_extension, - Prometheus::Uri $download_url_base, - Array[String[1]] $extra_groups, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $user, - String[1] $version, - String[1] $data_source_uri, - Enum['custom', 'env', 'file'] $postgres_auth_method, + String $download_extension = 'tar.gz', + Prometheus::Uri $download_url_base = 'https://github.com/prometheus-community/postgres_exporter/releases', + Array[String[1]] $extra_groups = [], + String[1] $group = 'postgres-exporter', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'postgres_exporter', + String[1] $user = 'postgres-exporter', + String[1] $version = '0.5.1', + String[1] $data_source_uri = 'host=/var/run/postgresql/ sslmode=disable', + Enum['custom', 'env', 'file'] $postgres_auth_method = 'env', Hash[String[1],String[1]] $data_source_custom = {}, Boolean $purge_config_dir = true, Boolean $restart_on_change = true, From 05a3e83d77657cf9a6dcd4bd1fbf44c7197ed00b Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 26 Jun 2023 14:22:29 +0200 Subject: [PATCH 3/3] blackbox_exporter: Move hiera data to class --- REFERENCE.md | 18 ++++++++++++++++++ data/defaults.yaml | 10 ---------- manifests/blackbox_exporter.pp | 18 +++++++++--------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 5157cdb05..3e275f871 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -2515,12 +2515,16 @@ Data type: `Stdlib::Absolutepath` Absolute path to configuration file (blackbox module definitions) +Default value: `'/etc/blackbox-exporter.yaml'` + ##### `download_extension` Data type: `String` Extension for the release binary archive +Default value: `'tar.gz'` + ##### `download_url` Data type: `Optional[Prometheus::Uri]` @@ -2535,12 +2539,16 @@ Data type: `Prometheus::Uri` Base URL for the binary archive +Default value: `'https://github.com/prometheus/blackbox_exporter/releases'` + ##### `extra_groups` Data type: `Array[String]` Extra groups to add the binary user to +Default value: `[]` + ##### `extra_options` Data type: `Optional[String[1]]` @@ -2555,6 +2563,8 @@ Data type: `String[1]` Group under which the binary is running +Default value: `'blackbox-exporter'` + ##### `init_style` Data type: `Prometheus::Initstyle` @@ -2617,12 +2627,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: `'blackbox_exporter'` + ##### `restart_on_change` Data type: `Boolean` @@ -2661,12 +2675,16 @@ Data type: `String[1]` User which runs the service +Default value: `'blackbox-exporter'` + ##### `version` Data type: `String[1]` The binary release version +Default value: `'0.17.0'` + ##### `config_mode` Data type: `String[1]` diff --git a/data/defaults.yaml b/data/defaults.yaml index 21870ff91..85aecc5c3 100644 --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -229,14 +229,4 @@ prometheus::statsd_exporter::service_name: 'statsd_exporter' prometheus::statsd_exporter::user: 'statsd-exporter' prometheus::statsd_exporter::version: '0.17.0' prometheus::storage_retention: '360h' # 15d; "d" suffix is only supported with prom >= 2.* -prometheus::blackbox_exporter::user: 'blackbox-exporter' -prometheus::blackbox_exporter::group: 'blackbox-exporter' -prometheus::blackbox_exporter::download_extension: 'tar.gz' -prometheus::blackbox_exporter::download_url_base: 'https://github.com/prometheus/blackbox_exporter/releases' -prometheus::blackbox_exporter::extra_groups: [] -prometheus::blackbox_exporter::package_ensure: 'latest' -prometheus::blackbox_exporter::package_name: 'blackbox_exporter' -prometheus::blackbox_exporter::modules: {} -prometheus::blackbox_exporter::config_file: '/etc/blackbox-exporter.yaml' -prometheus::blackbox_exporter::version: '0.17.0' prometheus::user: 'prometheus' diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp index b0fd86f0d..12930094c 100644 --- a/manifests/blackbox_exporter.pp +++ b/manifests/blackbox_exporter.pp @@ -67,15 +67,15 @@ # tcp: # preferred_ip_protocol: ip4 class prometheus::blackbox_exporter ( - Stdlib::Absolutepath $config_file, - String $download_extension, - Prometheus::Uri $download_url_base, - Array[String] $extra_groups, - String[1] $group, - String[1] $package_ensure, - String[1] $package_name, - String[1] $user, - String[1] $version, + Stdlib::Absolutepath $config_file = '/etc/blackbox-exporter.yaml', + String $download_extension = 'tar.gz', + Prometheus::Uri $download_url_base = 'https://github.com/prometheus/blackbox_exporter/releases', + Array[String] $extra_groups = [], + String[1] $group = 'blackbox-exporter', + String[1] $package_ensure = 'latest', + String[1] $package_name = 'blackbox_exporter', + String[1] $user = 'blackbox-exporter', + String[1] $version = '0.17.0', Boolean $restart_on_change = true, Boolean $service_enable = true, Stdlib::Ensure::Service $service_ensure = 'running',