puppetlabs/stdlib: Require 9.x

voxpupuli · Jun 16, 2023 · 2b98457 · 2b98457
1 parent a75e3d0
commit 2b98457
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/manifests/alerts.pp b/manifests/alerts.pp
@@ -29,7 +29,7 @@
       owner        => 'root',
       group        => $group,
       notify       => Class['prometheus::service_reload'],
-      content      => $alerts.to_yaml,
+      content      => $alerts.stdlib::to_yaml,
       validate_cmd => "${bin_dir}/promtool check rules %",
       require      => Class['prometheus::install'],
       before       => Class['prometheus::config'],

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -279,7 +279,7 @@
   # $scrape_configs in the template
   $collected_scrape_jobs = $prometheus::server::collect_scrape_jobs.map |$job_definition| {
     $job_name = $job_definition['job_name']
-    merge($job_definition, {
+    stdlib::merge($job_definition, {
         file_sd_configs => [{
             files => ["${prometheus::config_dir}/file_sd_config.d/${job_name}_*.yaml"]
         }]

diff --git a/manifests/node_exporter.pp b/manifests/node_exporter.pp
@@ -188,7 +188,7 @@
     }
   }
 
-  $web_config_content = merge($tls_server_config, $http_server_config, $basic_auth_config)
+  $web_config_content = stdlib::merge($tls_server_config, $http_server_config, $basic_auth_config)
 
   if empty($web_config_content) {
     file { $web_config_file:

diff --git a/manifests/rabbitmq_exporter.pp b/manifests/rabbitmq_exporter.pp
@@ -124,7 +124,7 @@
     'RABBIT_EXPORTERS'    => join($rabbit_exporters, ','),
   }
 
-  $real_env_vars = merge($env_vars, $extra_env_vars)
+  $real_env_vars = stdlib::merge($env_vars, $extra_env_vars)
 
   prometheus::daemon { 'rabbitmq_exporter':
     install_method     => $install_method,

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 9.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppet/systemd",