Skip to content

Commit

Permalink
switch from to_yaml to stdlib::yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Jun 26, 2023
1 parent eb7465b commit f28e924
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@
$collected_scrape_jobs = $prometheus::server::collect_scrape_jobs.map |$job_definition| {
$job_name = $job_definition['job_name']
$job_definition + {
file_sd_configs => [{
files => ["${prometheus::config_dir}/file_sd_config.d/${job_name}_*.yaml"]
}]
file_sd_configs => [{
files => ["${prometheus::config_dir}/file_sd_config.d/${job_name}_*.yaml"]
}]
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/node_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
} else {
file { $web_config_file:
ensure => file,
content => $web_config_content.to_yaml,
content => $web_config_content.stdlib::to_yaml,
}

if versioncmp($version, '1.5.0') >= 0 {
Expand Down
2 changes: 1 addition & 1 deletion manifests/process_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
if $hash_watched_processes.empty() {
$config_path_content = template('prometheus/process-exporter.yaml.erb')
} else {
$config_path_content = $hash_watched_processes.to_yaml
$config_path_content = $hash_watched_processes.stdlib::to_yaml
}

file { $config_path:
Expand Down
2 changes: 1 addition & 1 deletion manifests/scrape_job.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Hash[String[1], String[1]] $labels = {},
Stdlib::Absolutepath $collect_dir = undef,
) {
$config = to_yaml([
$config = stdlib::to_yaml([
{
targets => $targets,
labels => $labels,
Expand Down
2 changes: 1 addition & 1 deletion manifests/statsd_exporter.pp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
mode => $config_mode,
owner => 'root',
group => $group,
content => to_yaml({ mappings => $mappings }),
content => stdlib::to_yaml({ mappings => $mappings }),
notify => $notify_service,
}

Expand Down
2 changes: 1 addition & 1 deletion templates/ipmi_exporter.yaml.epp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<%- | Hash $modules | -%>
<%- $config = { 'modules' => $modules } -%>
<%= to_yaml($config) -%>
<%= stdlib::to_yaml($config) -%>
2 changes: 1 addition & 1 deletion templates/sachet.yaml.epp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<%- | Array $templates, Array $receivers, Hash $providers | -%>
<%- $config = { 'templates' => $templates, 'receivers' => $receivers, 'providers' => $providers } -%>
<%= to_yaml($config) -%>
<%= stdlib::to_yaml($config) -%>
2 changes: 1 addition & 1 deletion templates/ssh_exporter.yaml.epp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<%- | Hash $modules | -%>
<%- $config = { 'modules' => $modules } -%>
<%= to_yaml($config) -%>
<%= stdlib::to_yaml($config) -%>
2 changes: 1 addition & 1 deletion templates/ssl_exporter.yaml.epp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<%- | Hash $modules | -%>
<%- $config = { 'modules' => $modules } -%>
<%= to_yaml($config) -%>
<%= stdlib::to_yaml($config) -%>

0 comments on commit f28e924

Please sign in to comment.