Merge branch 'jenkins-build-8' into 'master'

Auto-merge for build 8

See merge request puppet/prometheus_cd!7

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html

@@ -104,7 +104,23 @@
 6
 7
 8
-9</pre>
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -112,6 +128,22 @@
 class prometheus_cd::main::service (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::files
+  if $manage_prometheus == true {
+    service { &#39;prometheus&#39;:
+      ensure     =&gt; running,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; true,
+    }
+  }
+  if $manage_prometheus == true {
+    service { &#39;node_exporter&#39;:
+      ensure     =&gt; running,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; true,
+    }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -219,7 +219,13 @@
 18
 19
 20
-21</pre>
+21
+22
+23
+24
+25
+26
+27</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 11</span>
@@ -232,6 +238,12 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
 
 ) {
+  # defaults
+  $fqdn                   = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
+  $domain                 = $facts[&#39;networking&#39;][&#39;domain&#39;]
+  $os_name                = $facts[&#39;os&#39;][&#39;name&#39;]
+  $os_release             = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
+
   # includes must be last
   include prometheus_cd::main::config
 }</pre>

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,
+    }
+  }
 }

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
 }