apache_exporter: Move hiera data to class

voxpupuli · Jan 30, 2023 · 4fce3a8 · 4fce3a8
1 parent c2e6e88
commit 4fce3a8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -1309,6 +1309,8 @@ Data type: `String`
 
 Extension for the release binary archive
 
+Default value: `'tar.gz'`
+
 ##### <a name="-prometheus--apache_exporter--download_url"></a>`download_url`
 
 Data type: `Optional[Prometheus::Uri]`
@@ -1323,12 +1325,16 @@ Data type: `Prometheus::Uri`
 
 Base URL for the binary archive
 
+Default value: `'https://github.com/Lusitaniae/apache_exporter/releases'`
+
 ##### <a name="-prometheus--apache_exporter--extra_groups"></a>`extra_groups`
 
 Data type: `Array[String[1]]`
 
 Extra groups to add the binary user to
 
+Default value: `[]`
+
 ##### <a name="-prometheus--apache_exporter--extra_options"></a>`extra_options`
 
 Data type: `Optional[String[1]]`
@@ -1343,6 +1349,8 @@ Data type: `String[1]`
 
 Group under which the binary is running
 
+Default value: `'apache-exporter'`
+
 ##### <a name="-prometheus--apache_exporter--init_style"></a>`init_style`
 
 Data type: `Prometheus::Initstyle`
@@ -1397,12 +1405,16 @@ Data type: `String[1]`
 
 If package, then use this for package ensure default 'latest'
 
+Default value: `'latest'`
+
 ##### <a name="-prometheus--apache_exporter--package_name"></a>`package_name`
 
 Data type: `String[1]`
 
 The binary package name - not available yet
 
+Default value: `'apache_exporter'`
+
 ##### <a name="-prometheus--apache_exporter--purge_config_dir"></a>`purge_config_dir`
 
 Data type: `Boolean`
@@ -1425,6 +1437,8 @@ Data type: `String[1]`
 
 The URI for the Apache status page
 
+Default value: `'http://localhost/server-status/?auto'`
+
 ##### <a name="-prometheus--apache_exporter--service_enable"></a>`service_enable`
 
 Data type: `Boolean`
@@ -1455,12 +1469,16 @@ Data type: `String[1]`
 
 User which runs the service
 
+Default value: `'apache-exporter'`
+
 ##### <a name="-prometheus--apache_exporter--version"></a>`version`
 
 Data type: `String[1]`
 
 The binary release version
 
+Default value: `'1.0.0.RC4'`
+
 ##### <a name="-prometheus--apache_exporter--proxy_server"></a>`proxy_server`
 
 Data type: `Optional[String[1]]`
@@ -2493,7 +2511,7 @@ Default value: `$prometheus::bin_dir`
 
 ##### <a name="-prometheus--blackbox_exporter--config_file"></a>`config_file`
 
-Data type: `String[1]`
+Data type: `Stdlib::Absolutepath`
 
 Absolute path to configuration file (blackbox module definitions)
 
@@ -4174,7 +4192,7 @@ for available options
 
 ##### <a name="-prometheus--grok_exporter--config_file"></a>`config_file`
 
-Data type: `String[1]`
+Data type: `Stdlib::Absolutepath`
 
 Path to config file, it will be generated from config param
 
@@ -11956,7 +11974,7 @@ Default value: `$prometheus::bin_dir`
 
 ##### <a name="-prometheus--snmp_exporter--config_file"></a>`config_file`
 
-Data type: `String[1]`
+Data type: `Stdlib::Absolutepath`
 
 Absolute path to configuration file
 

diff --git a/data/defaults.yaml b/data/defaults.yaml
@@ -294,12 +294,3 @@ prometheus::collectd_exporter::service_name: 'collectd_exporter'
 prometheus::collectd_exporter::user: 'collectd-exporter'
 prometheus::collectd_exporter::version: '0.5.0'
 prometheus::collectd_exporter::options: ''
-prometheus::apache_exporter::scrape_uri: 'http://localhost/server-status/?auto'
-prometheus::apache_exporter::download_extension: 'tar.gz'
-prometheus::apache_exporter::download_url_base: 'https://github.com/Lusitaniae/apache_exporter/releases'
-prometheus::apache_exporter::extra_groups: []
-prometheus::apache_exporter::group: 'apache-exporter'
-prometheus::apache_exporter::package_ensure: 'latest'
-prometheus::apache_exporter::package_name: 'apache_exporter'
-prometheus::apache_exporter::user: 'apache-exporter'
-prometheus::apache_exporter::version: '0.8.0'
diff --git a/manifests/apache_exporter.pp b/manifests/apache_exporter.pp
@@ -54,15 +54,15 @@
 # @param proxy_type
 #  Optional proxy server type (none|http|https|ftp)
 class prometheus::apache_exporter (
-  String[1] $scrape_uri,
-  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] $scrape_uri                                      = 'http://localhost/server-status/?auto',
+  String $download_extension                                 = 'tar.gz',
+  Prometheus::Uri $download_url_base                         = 'https://github.com/Lusitaniae/apache_exporter/releases',
+  Array[String[1]] $extra_groups                             = [],
+  String[1] $group                                           = 'apache-exporter',
+  String[1] $package_ensure                                  = 'latest',
+  String[1] $package_name                                    = 'apache_exporter',
+  String[1] $user                                            = 'apache-exporter',
+  String[1] $version                                         = '1.0.0.RC4',
   Boolean $purge_config_dir                                  = true,
   Boolean $restart_on_change                                 = true,
   Boolean $service_enable                                    = true,