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

Auto-merge for build 20

See merge request puppet/prometheus_cd!19

doc/_index.html

@@ -83,11 +83,6 @@
       
             </li>
     
-            <li>
-      <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
-      
-            </li>
-    
             <li>
       <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>
       

doc/puppet_class_list.html

@@ -57,42 +57,35 @@
     </li>
     
 
-    <li id="object_puppet_classes::prometheus_cd::main::dirs" class="even">
+    <li id="object_puppet_classes::prometheus_cd::main::files" class="even">
-      <div class="item">
-        <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
-      </div>
-    </li>
-    
-
-    <li id="object_puppet_classes::prometheus_cd::main::files" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::prometheus_cd::main::install" class="even">
+    <li id="object_puppet_classes::prometheus_cd::main::install" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::prometheus_cd::main::install (puppet_class)">prometheus_cd::main::install</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::prometheus_cd::main::service" class="odd">
+    <li id="object_puppet_classes::prometheus_cd::main::service" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html" title="puppet_classes::prometheus_cd::main::service (puppet_class)">prometheus_cd::main::service</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="even">
+    <li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ayumrepo.html" title="puppet_classes::prometheus_cd::main::yumrepo (puppet_class)">prometheus_cd::main::yumrepo</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::prometheus_cd::params" class="odd">
+    <li id="object_puppet_classes::prometheus_cd::params" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Aparams.html" title="puppet_classes::prometheus_cd::params (puppet_class)">prometheus_cd::params</a></span>
       </div>

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html

@@ -126,7 +126,7 @@
 class prometheus_cd::main::files (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::dirs
-  if $ps_prom_host == fqdn {
+  if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
     file { $ps_main_file:
       ensure   => file,
       owner    => 'root',

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html

@@ -128,9 +128,9 @@
 
 class prometheus_cd::main::service (
 ) inherits prometheus_cd::params {
-  require prometheus_cd::main::files
-  require prometheus_cd::firewall::iptables
   if  ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
+    require prometheus_cd::main::files
+    require prometheus_cd::firewall::iptables
     service { $ps_prom_service:
       ensure     => running,
       hasstatus  => true,

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -67,8 +67,6 @@
     <dt>Inherited by:</dt>
     <dd>
       
-      <span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span><br/>
-      
       <span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span><br/>
       
       <span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::prometheus_cd::main::config (puppet_class)">prometheus_cd::main::config</a></span><br/>

manifests/main/dirs.pp

@@ -6,7 +6,7 @@
 class prometheus_cd::main::dirs (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::install
-  if $ps_prom_host == fqdn {
+  ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
     file { $ps_main_dir:
       ensure   => directory,
       owner    => 'root',

manifests/main/files.pp

@@ -6,7 +6,7 @@
 class prometheus_cd::main::files (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::dirs
-  if $ps_prom_host == fqdn {
+  if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
     file { $ps_main_file:
       ensure   => file,
       owner    => 'root',

manifests/main/service.pp

@@ -5,9 +5,9 @@
 ##############################################################################
 class prometheus_cd::main::service (
 ) inherits prometheus_cd::params {
-  require prometheus_cd::main::files
-  require prometheus_cd::firewall::iptables
   if  ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
+    require prometheus_cd::main::files
+    require prometheus_cd::firewall::iptables
     service { $ps_prom_service:
       ensure     => running,
       hasstatus  => true,

templates/prometheus.yml.erb

@@ -1,3 +1,7 @@
+###############################################################################
+#####    File created by Puppet - manual changes will be overwritten      #####
+###############################################################################
+
 global:
   scrape_interval: 60s
   scrape_timeout: 10s