From 304823319c466ddba6fbce09b6e8ff4de1c5deb2 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 13 Jun 2025 15:42:26 +0200 Subject: [PATCH 1/2] add services --- manifests/main/service.pp | 16 ++++++++++++++++ manifests/params.pp | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/manifests/main/service.pp b/manifests/main/service.pp index 1e60029..e3cc670 100644 --- a/manifests/main/service.pp +++ b/manifests/main/service.pp @@ -6,4 +6,20 @@ class prometheus_cd::main::service ( ) inherits prometheus_cd::params { require prometheus_cd::main::files + if $manage_prometheus == true { + service { 'prometheus': + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, + } + } + if $manage_prometheus == true { + service { 'node_exporter': + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, + } + } } diff --git a/manifests/params.pp b/manifests/params.pp index 97298b0..81fe31e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -16,6 +16,12 @@ class prometheus_cd::params ( Boolean $manage_node_exporter = false, ) { + # defaults + $fqdn = $facts['networking']['fqdn'] + $domain = $facts['networking']['domain'] + $os_name = $facts['os']['name'] + $os_release = $facts['os']['release']['major'] + # includes must be last include prometheus_cd::main::config } From 9857c6195d3727a76c8cac51a6bd902d54119c76 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 13 Jun 2025 15:43:23 +0200 Subject: [PATCH 2/2] Recommit for updates in build 8 --- .../prometheus_cd_3A_3Amain_3A_3Aservice.html | 34 ++++++++++++++++++- .../prometheus_cd_3A_3Aparams.html | 14 +++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html index da2e1f4..1ff96a2 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html @@ -104,7 +104,23 @@ 6 7 8 -9 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25
# File 'manifests/main/service.pp', line 6
@@ -112,6 +128,22 @@
 class prometheus_cd::main::service (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::files
+  if $manage_prometheus == true {
+    service { 'prometheus':
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
+  if $manage_prometheus == true {
+    service { 'node_exporter':
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  }
 }
diff --git a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html index 3583b47..d0db3bb 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html @@ -219,7 +219,13 @@ 18 19 20 -21 +21 +22 +23 +24 +25 +26 +27
# File 'manifests/params.pp', line 11
@@ -232,6 +238,12 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
 
 ) {
+  # defaults
+  $fqdn                   = $facts['networking']['fqdn']
+  $domain                 = $facts['networking']['domain']
+  $os_name                = $facts['os']['name']
+  $os_release             = $facts['os']['release']['major']
+
   # includes must be last
   include prometheus_cd::main::config
 }