Merge pull request #845 from bastelfreak/haproxy

haproxy_exporter: Move data from hiera to puppet class
voxpupuli · Jan 4, 2025 · b148666 · b148666
2 parents bd636fd + 7a42be4
commit b148666
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 127 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
diff --git 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'
@@ -107,22 +98,6 @@ prometheus::nginx_vts_exporter::package_ensure: 'latest'
 prometheus::nginx_vts_exporter::package_name: 'nginx-vts-exporter'
 prometheus::nginx_vts_exporter::service_name: 'nginx-vts-exporter'
 prometheus::nginx_vts_exporter::user: 'nginx-vts-exporter'
-prometheus::process_exporter::download_extension: 'tar.gz'
-prometheus::process_exporter::download_url_base: 'https://github.com/ncabatoff/process-exporter/releases'
-prometheus::process_exporter::extra_groups: []
-prometheus::process_exporter::group: 'process-exporter'
-prometheus::process_exporter::package_ensure: 'latest'
-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: []
@@ -142,39 +117,3 @@ prometheus::rabbitmq_exporter::rabbit_exporters:
   - 'node'
   - 'overview'
   - 'queue'
-prometheus::mysqld_exporter::download_extension: 'tar.gz'
-prometheus::mysqld_exporter::download_url_base: 'https://github.com/prometheus/mysqld_exporter/releases'
-prometheus::mysqld_exporter::extra_groups: []
-prometheus::mysqld_exporter::group: 'mysqld-exporter'
-prometheus::mysqld_exporter::package_ensure: 'latest'
-prometheus::mysqld_exporter::package_name: 'mysqld_exporter'
-prometheus::mysqld_exporter::user: 'mysqld-exporter'
-prometheus::node_exporter::download_extension: 'tar.gz'
-prometheus::node_exporter::download_url_base: 'https://github.com/prometheus/node_exporter/releases'
-prometheus::node_exporter::extra_groups: []
-prometheus::node_exporter::group: 'node-exporter'
-prometheus::node_exporter::package_ensure: 'latest'
-prometheus::node_exporter::package_name: 'node_exporter'
-prometheus::node_exporter::user: 'node-exporter'
-prometheus::beanstalkd_exporter::exporter_listen: ':9371'
-prometheus::beanstalkd_exporter::beanstalkd_address: '127.0.0.1:11300'
-prometheus::beanstalkd_exporter::download_extension: ''
-prometheus::beanstalkd_exporter::download_url_base: 'https://github.com/messagebird/beanstalkd_exporter/releases'
-prometheus::beanstalkd_exporter::extra_groups: []
-prometheus::beanstalkd_exporter::group: 'beanstalkd-exporter'
-prometheus::beanstalkd_exporter::package_ensure: 'latest'
-prometheus::beanstalkd_exporter::package_name: 'beanstalkd_exporter'
-prometheus::beanstalkd_exporter::service_name: 'beanstalkd_exporter'
-prometheus::beanstalkd_exporter::user: 'beanstalkd-exporter'
-prometheus::beanstalkd_exporter::mapping_config: '/etc/beanstalkd-exporter-mapping.conf'
-prometheus::beanstalkd_exporter::config: '/etc/beanstalkd-exporter.conf'
-prometheus::snmp_exporter::config_file: '/etc/snmp-exporter.yaml'
-prometheus::snmp_exporter::config_template: ''
-prometheus::snmp_exporter::download_extension: 'tar.gz'
-prometheus::snmp_exporter::download_url_base: 'https://github.com/prometheus/snmp_exporter/releases'
-prometheus::snmp_exporter::extra_groups: []
-prometheus::snmp_exporter::group: 'snmp-exporter'
-prometheus::snmp_exporter::package_ensure: 'latest'
-prometheus::snmp_exporter::package_name: 'snmp_exporter'
-prometheus::snmp_exporter::service_name: 'snmp_exporter'
-prometheus::snmp_exporter::user: 'snmp-exporter'
diff --git a/manifests/beanstalkd_exporter.pp b/manifests/beanstalkd_exporter.pp
@@ -58,18 +58,18 @@
 # @param proxy_type
 #  Optional proxy server type (none|http|https|ftp)
 class prometheus::beanstalkd_exporter (
-  String $download_extension,
-  Prometheus::Uri $download_url_base,
-  Array $extra_groups,
-  String[1] $group,
-  String[1] $package_ensure,
-  String[1] $package_name,
-  String[1] $service_name,
-  String[1] $user,
-  String[1] $config,
-  String[1] $mapping_config,
-  String[1] $beanstalkd_address,
-  String[1] $exporter_listen,
+  String[0] $download_extension = '', # lint:ignore:params_empty_string_assignment
+  Prometheus::Uri $download_url_base = 'https://github.com/messagebird/beanstalkd_exporter/releases',
+  Array $extra_groups = [],
+  String[1] $group = 'beanstalkd-exporter',
+  String[1] $package_ensure = 'latest',
+  String[1] $package_name = 'beanstalkd_exporter',
+  String[1] $service_name = 'beanstalkd_exporter',
+  String[1] $user = 'beanstalkd-exporter',
+  Stdlib::Absolutepath $config = '/etc/beanstalkd-exporter.conf',
+  Stdlib::Absolutepath $mapping_config = '/etc/beanstalkd-exporter-mapping.conf',
+  String[1] $beanstalkd_address = '127.0.0.1:11300',
+  String[1] $exporter_listen = ':9371',
   # renovate: depName=messagebird/beanstalkd_exporter
   String[1] $version                                         = '1.0.5',
   Boolean $purge_config_dir                                  = true,

diff --git 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,

diff --git a/manifests/mysqld_exporter.pp b/manifests/mysqld_exporter.pp
@@ -75,13 +75,13 @@
 # @param cnf_ssl_key
 #  The path name of the client SSL private key file in PEM format.
 class prometheus::mysqld_exporter (
-  String $download_extension,
-  Prometheus::Uri $download_url_base,
-  Array $extra_groups,
-  String[1] $group,
-  String[1] $package_ensure,
-  String[1] $package_name,
-  String[1] $user,
+  String $download_extension = 'tar.gz',
+  Prometheus::Uri $download_url_base = 'https://github.com/prometheus/mysqld_exporter/releases',
+  Array $extra_groups = [],
+  String[1] $group = 'mysqld-exporter',
+  String[1] $package_ensure = 'latest',
+  String[1] $package_name = 'mysqld_exporter',
+  String[1] $user = 'mysqld-exporter',
   # renovate: depName=prometheus/mysqld_exporter
   String[1] $version                                         = '0.15.1',
   String[1] $service_name = 'mysqld_exporter',

diff --git a/manifests/node_exporter.pp b/manifests/node_exporter.pp
@@ -70,13 +70,13 @@
 #  Scrape port for configuring scrape targets on the prometheus server via exported `prometheus::scrape_job` resources
 #  If changed from default 9100 the option `--web.listen-address=':${scrape_port}'` will be added to the command line arguments
 class prometheus::node_exporter (
-  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 $download_extension = 'tar.gz',
+  Prometheus::Uri $download_url_base = 'https://github.com/prometheus/node_exporter/releases',
+  Array[String] $extra_groups = [],
+  String[1] $group = 'node-exporter',
+  String[1] $package_ensure = 'latest',
+  String[1] $package_name = 'node_exporter',
+  String[1] $user = 'node-exporter',
   # renovate: depName=prometheus/node_exporter
   String[1] $version                                         = '1.8.1',
   Boolean $purge_config_dir                                  = true,

diff --git a/manifests/process_exporter.pp b/manifests/process_exporter.pp
@@ -75,15 +75,15 @@
 #     ]
 #   }
 class prometheus::process_exporter (
-  String $download_extension,
-  Prometheus::Uri $download_url_base,
-  Array $extra_groups,
-  String[1] $group,
-  String[1] $package_ensure,
-  String[1] $package_name,
-  String[1] $service_name,
-  String[1] $user,
-  Stdlib::Absolutepath $config_path,
+  String $download_extension = 'tar.gz',
+  Prometheus::Uri $download_url_base = 'https://github.com/ncabatoff/process-exporter/releases',
+  Array $extra_groups = [],
+  String[1] $group = 'process-exporter',
+  String[1] $package_ensure = 'latest',
+  String[1] $package_name = 'process-exporter',
+  String[1] $service_name = 'process-exporter',
+  String[1] $user = 'process-exporter',
+  Stdlib::Absolutepath $config_path = '/etc/process-exporter.yaml',
   # renovate: depName=ncabatoff/process-exporter
   String[1] $version                                         = '0.8.2',
   Array $watched_processes                                   = [],

diff --git 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,

diff --git a/manifests/snmp_exporter.pp b/manifests/snmp_exporter.pp
@@ -56,16 +56,16 @@
 # @param proxy_type
 #  Optional proxy server type (none|http|https|ftp)
 class prometheus::snmp_exporter (
-  Stdlib::Absolutepath $config_file,
-  String $config_template,
-  String $download_extension,
-  Prometheus::Uri $download_url_base,
-  Array $extra_groups,
-  String[1] $group,
-  String[1] $package_ensure,
-  String[1] $package_name,
-  String[1] $service_name,
-  String[1] $user,
+  Stdlib::Absolutepath $config_file = '/etc/snmp-exporter.yaml',
+  String[0] $config_template = '', # lint:ignore:params_empty_string_assignment
+  String[0] $download_extension = 'tar.gz',
+  Prometheus::Uri $download_url_base = 'https://github.com/prometheus/snmp_exporter/releases',
+  Array $extra_groups = [],
+  String[1] $group = snmp-exporter,
+  String[1] $package_ensure = 'latest',
+  String[1] $package_name = 'snmp_exporter',
+  String[1] $service_name = 'snmp_exporter',
+  String[1] $user = 'snmp-exporter',
   # renovate: depName=prometheus/snmp_exporter
   String[1] $version                                         = '0.26.0',
   Boolean $purge_config_dir                                  = true,