.fixtures.yml

@@ -4,9 +4,5 @@ fixtures:
     archive: "https://github.com/voxpupuli/puppet-archive.git"
     docker: "https://github.com/garethr/garethr-docker.git"
     apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
-    yumrepo_core:
-      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
-      puppet_version: ">= 6.0.0"
-    augeas_core:
-      repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
-      puppet_version: ">= 6.0.0"
+    yumrepo_core: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
+    augeas_core: https://github.com/puppetlabs/puppetlabs-augeas_core.git

.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: '5.5.0'
+modulesync_config_version: '6.0.0'

.sync.yml

@@ -3,8 +3,6 @@ Gemfile:
   optional:
     ':test':
       - gem: 'toml'
-spec/spec_helper_acceptance.rb:
-  unmanaged: false
 .puppet-lint.rc:
   enabled_lint_checks:
     - parameter_types

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.0.0](https://github.com/voxpupuli/puppet-grafana/tree/v13.0.0) (2023-06-22)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v12.0.0...v13.0.0)
+
+**Breaking changes:**
+
+- puppetlabs/stdlib: Require 9.x [\#325](https://github.com/voxpupuli/puppet-grafana/pull/325) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- Add Ubuntu 22.04 support [\#329](https://github.com/voxpupuli/puppet-grafana/pull/329) ([bastelfreak](https://github.com/bastelfreak))
+- Add EL9 support [\#328](https://github.com/voxpupuli/puppet-grafana/pull/328) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- cleanup .fixtures.yml [\#326](https://github.com/voxpupuli/puppet-grafana/pull/326) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v12.0.0](https://github.com/voxpupuli/puppet-grafana/tree/v12.0.0) (2023-06-14)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v11.2.0...v12.0.0)

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 6.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 3.0',  :require => false
   gem 'toml',                       :require => false
 end
 
@@ -17,18 +17,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
+  gem 'voxpupuli-release', '~> 3.0',              :require => false
+  gem 'faraday-retry', '~> 2.1',                  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-grafana",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "author": "Vox Pupuli",
   "summary": "This module provides Grafana, a dashboard and graph editor for Graphite and InfluxDB.",
   "license": "Apache-2.0",
@@ -29,33 +29,38 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -75,7 +80,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "tags": [

spec/acceptance/class_spec.rb

@@ -7,9 +7,6 @@
     # Create dummy module directorty
     shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/my_custom_module/files/dashboards')
     context 'default parameters' do
-      before do
-        install_module_from_forge('puppetlabs/apt', '>= 9.1.0 < 10.0.0')
-      end
       # Using puppet_apply as a helper
 
       it 'works idempotently with no errors' do

spec/spec_helper_acceptance.rb

@@ -5,6 +5,11 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-configure_beaker
+configure_beaker do |host|
+  case fact('os.family')
+  when 'Debian'
+    install_puppet_module_via_pmt_on(host, 'puppetlabs-apt')
+  end
+end
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

templates/pdashboards.yaml.epp

@@ -1,3 +1,3 @@
 # This file is managed by Puppet, any changes will be overwritten
 
-<%= to_yaml($grafana::config::pdashboards) -%>
+<%= stdlib::to_yaml($grafana::config::pdashboards) -%>

templates/pdatasources.yaml.epp

@@ -1,3 +1,3 @@
 # This file is managed by Puppet, any changes will be overwritten
 
-<%= to_yaml($grafana::config::pdatasources) -%>
+<%= stdlib::to_yaml($grafana::config::pdatasources) -%>