.github/CONTRIBUTING.md

@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '6.0.0'
+modulesync_config_version: '7.0.0'

CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v13.3.0](https://github.com/voxpupuli/puppet-prometheus/tree/v13.3.0) (2023-08-19)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v13.2.0...v13.3.0)
+
+**Implemented enhancements:**
+
+- Drop legacy systemd reload code for Puppet 5 [\#689](https://github.com/voxpupuli/puppet-prometheus/pull/689) ([bastelfreak](https://github.com/bastelfreak))
+- add proxy\_server & proxy\_type to server install [\#641](https://github.com/voxpupuli/puppet-prometheus/pull/641) ([sabo](https://github.com/sabo))
+
+**Fixed bugs:**
+
+- Fix Arch Linux Prometheus Server installation [\#684](https://github.com/voxpupuli/puppet-prometheus/pull/684) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- init.pp: Add default data from hiera [\#686](https://github.com/voxpupuli/puppet-prometheus/pull/686) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v13.2.0](https://github.com/voxpupuli/puppet-prometheus/tree/v13.2.0) (2023-07-29)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v13.1.0...v13.2.0)

Gemfile

@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 3.0',  :require => false

REFERENCE.md

@@ -174,7 +174,10 @@ The following parameters are available in the `prometheus` class:
 * [`proxy_server`](#-prometheus--proxy_server)
 * [`proxy_type`](#-prometheus--proxy_type)
 * [`env_file_path`](#-prometheus--env_file_path)
+* [`manage_config_dir`](#-prometheus--manage_config_dir)
+* [`manage_init_file`](#-prometheus--manage_init_file)
 * [`manage_config`](#-prometheus--manage_config)
+* [`manage_localstorage`](#-prometheus--manage_localstorage)
 * [`manage_prometheus_server`](#-prometheus--manage_prometheus_server)
 
 ##### <a name="-prometheus--configname"></a>`configname`
@@ -199,6 +202,8 @@ Data type: `String`
 
 User running prometheus
 
+Default value: `'prometheus'`
+
 ##### <a name="-prometheus--manage_group"></a>`manage_group`
 
 Data type: `Boolean`
@@ -221,6 +226,8 @@ Data type: `String`
 
 Group under which prometheus is running
 
+Default value: `'prometheus'`
+
 ##### <a name="-prometheus--bin_dir"></a>`bin_dir`
 
 Data type: `Stdlib::Absolutepath`
@@ -235,6 +242,8 @@ Data type: `Stdlib::Absolutepath`
 
 Directory where shared files are located
 
+Default value: `'/usr/local/share/prometheus'`
+
 ##### <a name="-prometheus--arch"></a>`arch`
 
 Data type: `String[1]`
@@ -281,36 +290,48 @@ Data type: `Prometheus::Uri`
 
 Base URL for prometheus
 
+Default value: `'https://github.com/prometheus/prometheus/releases'`
+
 ##### <a name="-prometheus--download_extension"></a>`download_extension`
 
 Data type: `String`
 
 Extension of Prometheus binaries archive
 
+Default value: `'tar.gz'`
+
 ##### <a name="-prometheus--package_name"></a>`package_name`
 
 Data type: `String`
 
 Prometheus package name - not available yet
 
+Default value: `'prometheus'`
+
 ##### <a name="-prometheus--package_ensure"></a>`package_ensure`
 
 Data type: `String`
 
 If package, then use this for package ensurel default 'latest'
 
+Default value: `'latest'`
+
 ##### <a name="-prometheus--config_dir"></a>`config_dir`
 
 Data type: `String`
 
 Prometheus configuration directory (default /etc/prometheus)
 
+Default value: `'/etc/prometheus'`
+
 ##### <a name="-prometheus--localstorage"></a>`localstorage`
 
 Data type: `Stdlib::Absolutepath`
 
 Location of prometheus local storage (storage.local argument)
 
+Default value: `'/var/lib/prometheus'`
+
 ##### <a name="-prometheus--extra_options"></a>`extra_options`
 
 Data type: `Optional[String[1]]`
@@ -341,12 +362,16 @@ Data type: `String`
 
 Configuration template to use (template/prometheus.yaml.erb)
 
+Default value: `'prometheus/prometheus.yaml.erb'`
+
 ##### <a name="-prometheus--config_mode"></a>`config_mode`
 
 Data type: `String`
 
 Configuration file mode (default 0660)
 
+Default value: `'0640'`
+
 ##### <a name="-prometheus--service_enable"></a>`service_enable`
 
 Data type: `Boolean`
@@ -403,18 +428,24 @@ Data type: `Hash`
 
 Prometheus global configuration variables
 
+Default value: `{ 'scrape_interval' => '15s', 'evaluation_interval' => '15s', 'external_labels' => { 'monitor' => 'master' } }`
+
 ##### <a name="-prometheus--rule_files"></a>`rule_files`
 
 Data type: `Array`
 
 Prometheus rule files
 
+Default value: `[]`
+
 ##### <a name="-prometheus--scrape_configs"></a>`scrape_configs`
 
 Data type: `Array`
 
 Prometheus scrape configs
 
+Default value: `[]`
+
 ##### <a name="-prometheus--include_default_scrape_configs"></a>`include_default_scrape_configs`
 
 Data type: `Boolean`
@@ -429,18 +460,24 @@ Data type: `Array`
 
 Prometheus remote_read config to scrape prometheus 1.8+ instances
 
+Default value: `[]`
+
 ##### <a name="-prometheus--remote_write_configs"></a>`remote_write_configs`
 
 Data type: `Array`
 
 Prometheus remote_write config to scrape prometheus 1.8+ instances
 
+Default value: `[]`
+
 ##### <a name="-prometheus--alerts"></a>`alerts`
 
 Data type: `Variant[Array,Hash]`
 
 alert rules to put in alerts.rules
 
+Default value: `{}`
+
 ##### <a name="-prometheus--extra_alerts"></a>`extra_alerts`
 
 Data type: `Hash`
@@ -455,12 +492,16 @@ Data type: `Array`
 
 Prometheus alert relabel config under alerting
 
+Default value: `[]`
+
 ##### <a name="-prometheus--alertmanagers_config"></a>`alertmanagers_config`
 
 Data type: `Array`
 
 Prometheus managers config under alerting
 
+Default value: `[]`
+
 ##### <a name="-prometheus--storage_retention"></a>`storage_retention`
 
 Data type: `String`
@@ -469,6 +510,8 @@ How long to keep timeseries data. This is given as a duration like "100h" or "14
 prometheus 1.8.*, only durations understood by golang's time.ParseDuration are supported. Starting
 with prometheus 2, durations can also be given in days, weeks and years.
 
+Default value: `'360h'`
+
 ##### <a name="-prometheus--external_url"></a>`external_url`
 
 Data type: `Optional[Variant[Stdlib::HTTPUrl, Stdlib::Unixpath, String[1]]]`
@@ -839,6 +882,8 @@ Data type: `Array`
 
 Extra groups of which the user should be a part
 
+Default value: `[]`
+
 ##### <a name="-prometheus--proxy_server"></a>`proxy_server`
 
 Data type: `Optional[String[1]]`
@@ -861,12 +906,38 @@ Data type: `Stdlib::Absolutepath`
 
 
 
+##### <a name="-prometheus--manage_config_dir"></a>`manage_config_dir`
+
+Data type: `Boolean`
+
+
+
+Default value: `true`
+
+##### <a name="-prometheus--manage_init_file"></a>`manage_init_file`
+
+Data type: `Boolean`
+
+
+
+Default value: `true`
+
 ##### <a name="-prometheus--manage_config"></a>`manage_config`
 
 Data type: `Boolean`
 
 
 
+Default value: `true`
+
+##### <a name="-prometheus--manage_localstorage"></a>`manage_localstorage`
+
+Data type: `Boolean`
+
+
+
+Default value: `true`
+
 ##### <a name="-prometheus--manage_prometheus_server"></a>`manage_prometheus_server`
 
 Data type: `Boolean`
@@ -11577,7 +11648,9 @@ The following parameters are available in the `prometheus::server` class:
 * [`package_name`](#-prometheus--server--package_name)
 * [`package_ensure`](#-prometheus--server--package_ensure)
 * [`config_dir`](#-prometheus--server--config_dir)
+* [`manage_config_dir`](#-prometheus--server--manage_config_dir)
 * [`localstorage`](#-prometheus--server--localstorage)
+* [`manage_localstorage`](#-prometheus--server--manage_localstorage)
 * [`config_template`](#-prometheus--server--config_template)
 * [`config_mode`](#-prometheus--server--config_mode)
 * [`global_config`](#-prometheus--server--global_config)
@@ -11613,6 +11686,9 @@ The following parameters are available in the `prometheus::server` class:
 * [`collect_tag`](#-prometheus--server--collect_tag)
 * [`max_open_files`](#-prometheus--server--max_open_files)
 * [`usershell`](#-prometheus--server--usershell)
+* [`proxy_server`](#-prometheus--server--proxy_server)
+* [`proxy_type`](#-prometheus--server--proxy_type)
+* [`manage_init_file`](#-prometheus--server--manage_init_file)
 
 ##### <a name="-prometheus--server--configname"></a>`configname`
 
@@ -11718,6 +11794,14 @@ Data type: `String`
 
 Default value: `$prometheus::config_dir`
 
+##### <a name="-prometheus--server--manage_config_dir"></a>`manage_config_dir`
+
+Data type: `Boolean`
+
+
+
+Default value: `$prometheus::manage_config_dir`
+
 ##### <a name="-prometheus--server--localstorage"></a>`localstorage`
 
 Data type: `Variant[Stdlib::Absolutepath, Boolean[false]]`
@@ -11726,6 +11810,14 @@ Data type: `Variant[Stdlib::Absolutepath, Boolean[false]]`
 
 Default value: `$prometheus::localstorage`
 
+##### <a name="-prometheus--server--manage_localstorage"></a>`manage_localstorage`
+
+Data type: `Boolean`
+
+
+
+Default value: `$prometheus::manage_localstorage`
+
 ##### <a name="-prometheus--server--config_template"></a>`config_template`
 
 Data type: `String`
@@ -12006,6 +12098,30 @@ Data type: `Stdlib::Absolutepath`
 
 Default value: `$prometheus::usershell`
 
+##### <a name="-prometheus--server--proxy_server"></a>`proxy_server`
+
+Data type: `Optional[String[1]]`
+
+
+
+Default value: `$prometheus::proxy_server`
+
+##### <a name="-prometheus--server--proxy_type"></a>`proxy_type`
+
+Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]`
+
+
+
+Default value: `$prometheus::proxy_type`
+
+##### <a name="-prometheus--server--manage_init_file"></a>`manage_init_file`
+
+Data type: `Boolean`
+
+
+
+Default value: `$prometheus::manage_init_file`
+
 ### <a name="prometheus--snmp_exporter"></a>`prometheus::snmp_exporter`
 
 This module manages prometheus snmp_exporter

data/Archlinux.yaml

@@ -1,7 +1,12 @@
 ---
+prometheus::manage_localstorage: false
+prometheus::server::manage_user: false
+prometheus::server::manage_group: false
+prometheus::server::package_ensure: 'installed'
+prometheus::server::manage_config_dir: false
+prometheus::server::manage_init_file: false
 prometheus::configname: 'prometheus.yml'
-prometheus::server::init_style: 'none'
-prometheus::version: '2.10.0'
+prometheus::version: '2.46.0'
 prometheus::install_method: 'package'
 prometheus::bin_dir: '/usr/bin'
 prometheus::env_file_path: '/etc/conf.d'