.github/CONTRIBUTING.md

@@ -124,7 +124,7 @@ If you have Ruby 2.x or want a specific version of Puppet,
 you must set an environment variable such as:
 
 ```sh
-export PUPPET_VERSION="~> 5.5.6"
+export PUPPET_GEM_VERSION="~> 6.1.0"
 ```
 
 You can install all needed gems for spec tests into the modules directory by
@@ -232,17 +232,16 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian10-x64 bundle exec rake beaker
+BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
 You can replace the string `debian10` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1604
 * ubuntu1804
 * ubuntu2004
-* debian9
 * debian10
+* debian11
 * centos7
 * centos8
 

.github/workflows/ci.yml

@@ -1,13 +1,10 @@
 ---
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
 name: CI
 
 on: pull_request
 
 concurrency:
-  group: ${{ github.head_ref }}
+  group: ${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
@@ -74,11 +71,16 @@ jobs:
         with:
           ruby-version: '3.0'
           bundler-cache: true
+      - name: Start squid
+        run: ./scripts/start-squid.sh
       - name: Run tests
         run: bundle exec rake beaker
         env:
           BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
           BEAKER_setfile: ${{ matrix.setfile.value }}
+      - name: squid logs
+        run: docker logs squid --tail 50
+        if: always()
 
   tests:
     needs:

.github/workflows/release.yml

@@ -9,26 +9,14 @@ on:
     tags:
       - '*'
 
-env:
-  BUNDLE_WITHOUT: development:test:system_tests
-
 jobs:
-  deploy:
-    name: 'deploy to forge'
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'voxpupuli'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-          bundler-cache: true
-      - name: Build and Deploy
-        env:
-          # Configure secrets here:
-          #  https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
-          BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
-          BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
-        run: bundle exec rake module:push
+  release:
+    name: Release
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    with:
+      allowed_owner: 'voxpupuli'
+    secrets:
+      # Configure secrets here:
+      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      username: ${{ secrets.PUPPET_FORGE_USERNAME }}
+      api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}

.msync.yml

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

.puppet-lint.rc

@@ -0,0 +1,3 @@
+--fail-on-warnings
+--no-parameter_documentation-check
+--no-parameter_types-check

.sync.yml

@@ -3,3 +3,5 @@ spec/spec_helper.rb:
   spec_overrides: "require 'spec_helper_methods'"
 spec/spec_helper_acceptance.rb:
   unmanaged: false
+.github/workflows/ci.yml:
+  unmanaged: true

CHANGELOG.md

@@ -4,6 +4,36 @@ 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.
 
+## [v12.4.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.4.0) (2022-06-03)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.3.0...v12.4.0)
+
+**Implemented enhancements:**
+
+- Adding a Proxy option [\#186](https://github.com/voxpupuli/puppet-prometheus/issues/186)
+- Implement web-config.yml handling [\#622](https://github.com/voxpupuli/puppet-prometheus/pull/622) ([rwaffen](https://github.com/rwaffen))
+- Support new download format for openldap\_exporter [\#619](https://github.com/voxpupuli/puppet-prometheus/pull/619) ([treydock](https://github.com/treydock))
+- Add php-fpm exporter [\#605](https://github.com/voxpupuli/puppet-prometheus/pull/605) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
+- Add Debian 11 support [\#601](https://github.com/voxpupuli/puppet-prometheus/pull/601) ([towo](https://github.com/towo))
+- Allow to set storage parameters to false [\#598](https://github.com/voxpupuli/puppet-prometheus/pull/598) ([kubicgruenfeld](https://github.com/kubicgruenfeld))
+- \(\#186\) Add proxy parameters [\#596](https://github.com/voxpupuli/puppet-prometheus/pull/596) ([ShaunMaxwell](https://github.com/ShaunMaxwell))
+
+**Fixed bugs:**
+
+- make process exporter service name propagate correctly [\#617](https://github.com/voxpupuli/puppet-prometheus/pull/617) ([anarcat](https://github.com/anarcat))
+
+**Closed issues:**
+
+- We should be able to download from custom url with credentials [\#603](https://github.com/voxpupuli/puppet-prometheus/issues/603)
+- Prometheus Agent mode not supported yet [\#597](https://github.com/voxpupuli/puppet-prometheus/issues/597)
+- Support for node exporter 1.x [\#520](https://github.com/voxpupuli/puppet-prometheus/issues/520)
+
+**Merged pull requests:**
+
+- Update ipmi\_exporter URL, project moved [\#620](https://github.com/voxpupuli/puppet-prometheus/pull/620) ([treydock](https://github.com/treydock))
+- extra\_options: Switch from String to Optional\[String\[1\]\] [\#610](https://github.com/voxpupuli/puppet-prometheus/pull/610) ([bastelfreak](https://github.com/bastelfreak))
+- Beaker: Install lsb-release during CI [\#609](https://github.com/voxpupuli/puppet-prometheus/pull/609) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v12.3.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.3.0) (2021-11-17)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.2.0...v12.3.0)

Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /opt/puppet
 # https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
 RUN mkdir -p /etc/sv
 
-ARG PUPPET_VERSION="~> 6.0"
+ARG PUPPET_GEM_VERSION="~> 6.0"
 ARG PARALLEL_TEST_PROCESSORS=4
 
 # Cache gems

Gemfile

@@ -1,10 +1,10 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 4.0',   :require => false
+  gem 'voxpupuli-test', '~> 5.4',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 1.0',  :require => false
@@ -28,7 +28,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby