.github/CONTRIBUTING.md

@@ -256,18 +256,20 @@ Beaker also supports docker containers. We also use that in our automated CI
 pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
 
 ```sh
-PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
+PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
 ```
 
-You can replace the string `debian9` with any common operating system.
+You can replace the string `debian10` with any common operating system.
 The following strings are known to work:
 
 * ubuntu1604
 * ubuntu1804
 * debian8
 * debian9
+* debian10
 * centos6
 * centos7
+* centos8
 
 The easiest way to debug in a docker container is to open a shell:
 

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.10.0'
+modulesync_config_version: '2.10.1'

.rubocop.yml

@@ -1,6 +1,7 @@
 require: rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.1
+# Puppet Server 5 defaults to jruby 1.7 so TargetRubyVersion must stay at 1.9 until we drop support for puppet 5
+  TargetRubyVersion: 1.9
   Include:
     - ./**/*.rb
   Exclude:

CHANGELOG.md

@@ -4,6 +4,14 @@ 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.
 
+## [v8.2.1](https://github.com/voxpupuli/puppet-prometheus/tree/v8.2.1) (2020-01-25)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v8.2.0...v8.2.1)
+
+**Fixed bugs:**
+
+- Execute systemctl daemon-reload before restarting daemons [\#419](https://github.com/voxpupuli/puppet-prometheus/pull/419) ([treydock](https://github.com/treydock))
+
 ## [v8.2.0](https://github.com/voxpupuli/puppet-prometheus/tree/v8.2.0) (2020-01-11)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v8.1.0...v8.2.0)

Gemfile

@@ -62,6 +62,7 @@ group :system_tests do
   gem 'rbnacl', '>= 4',                     :require => false
   gem 'rbnacl-libsodium',                   :require => false
   gem 'bcrypt_pbkdf',                       :require => false
+  gem 'ed25519',                            :require => false
 end
 
 group :release do

manifests/daemon.pp

@@ -171,6 +171,11 @@
         content => template('prometheus/daemon.systemd.erb'),
         notify  => $notify_service,
       }
+      # Puppet 5 doesn't have https://tickets.puppetlabs.com/browse/PUP-3483
+      # and camptocamp/systemd only creates this relationship when managing the service
+      if $manage_service and versioncmp($facts['puppetversion'],'6.1.0') < 0 {
+        Class['systemd::systemctl::daemon_reload'] -> Service[$name]
+      }
     }
     # service_provider returns redhat on CentOS using sysv, https://tickets.puppetlabs.com/browse/PUP-5296
     'sysv','redhat': {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-prometheus",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "author": "Vox Pupuli",
   "summary": "This module installs, configures and manages the Prometheus service.",
   "license": "Apache-2.0",

spec/defines/daemon_spec.rb

@@ -149,6 +149,10 @@
               )
             }
 
+            if Gem::Version.new(facts[:puppetversion]) < Gem::Version.new('6.1.0')
+              it { is_expected.to contain_class('systemd::systemctl::daemon_reload').that_comes_before('Service[smurf_exporter]') }
+            end
+
             context 'with overidden bin_name' do
               let(:params) do
                 parameters.merge(bin_name: 'notsmurf_exporter')

spec/spec_helper.rb

@@ -48,10 +48,14 @@
   # Otherwise we need to match the correct facter version to the used puppet version.
   # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
   # https://puppet.com/docs/puppet/5.5/about_agent.html
+  #
+  # The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
+  # if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
   c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
                                ENV['FACTERDB_FACTS_VERSION']
                              else
-                               Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
+                               puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
+                               Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
                              end
 
   # Coverage generation