Skip to content

Commit a0f8a54

Browse files
committed
fix: load ::common::monitor::prometheus::server and ::common::monitor::exporter from common::monitor::prometheus class, so node_exporter does not fail with wierd error
``` Error: Could not retrieve catalog from remote server: Error 500 on SERVER: Server Error: Evaluation Error: Error while evaluating a Resource Statement, Class[Prometheus]: expects a value for parameter env_file_path parameter init_style expects a match for Prometheus::Initstyle = Enum[launchd, none, sles, systemd, sysv, upstart], got init (file: /etc/puppetlabs/code/environments/arm64_support/modules/enableit/common/manifests/monitor/exporter/node.pp, line: 167, column: 3) on node ```
1 parent eda8ec8 commit a0f8a54

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

modules/enableit/common/manifests/monitor.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
) {
99
if $enable {
1010
contain ::monitor
11-
contain ::common::monitor::exporter
12-
contain ::common::monitor::prometheus::server
11+
contain ::common::monitor::prometheus
1312
}
1413
}

modules/enableit/common/manifests/monitor/prometheus.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,7 @@
5454
env_file_path => $env_file_path,
5555
init_style => $_init_style,
5656
}
57+
58+
include common::monitor::prometheus::server
59+
include common::monitor::exporter
5760
}

modules/enableit/common/manifests/monitor/prometheus/server.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
Eit_types::Noop_Value $noop_value = $common::monitor::noop_value,
2121
) {
2222

23-
include common::monitor::prometheus
24-
2523
Exec {
2624
noop => $noop_value,
2725
}

0 commit comments

Comments
 (0)