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

Auto-merge for build 22

See merge request puppet/prometheus_cd!21

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">
-      <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">
+    <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_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_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/>
@@ -308,6 +306,19 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>ps_data_dir</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/data/prometheus&#39;</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -359,7 +370,8 @@
 54
 55
 56
-57</pre>
+57
+58</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
@@ -376,6 +388,7 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
   Boolean $ps_manage_fw         = false,
   String $ps_prom_host          = &#39;prometheus.example.net&#39;,
+  String $ps_data_dir           = &#39;/data/prometheus&#39;,
 
   # firewall
   String $ps_fw_prefix          = &#39;50&#39;,

manifests/main/dirs.pp

@@ -7,6 +7,7 @@ class prometheus_cd::main::dirs (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::install
   if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
+    # prometheus directors
     file { $ps_main_dir:
       ensure   => directory,
       owner    => 'root',
@@ -17,5 +18,16 @@ class prometheus_cd::main::dirs (
       seltype  => etc_t,
       seluser  => system_u,
     }
+    # data directory
+    file { $ps_data_dir,
+      ensure   => directory,
+      owner    => 'prometheus',
+      group    => 'prometheus',
+      mode     => '0750',
+#      selrange => s0,
+#      selrole  => object_r,
+#      seltype  => etc_t,
+#      seluser  => system_u,
+    }
   }
 }

manifests/params.pp

@@ -26,6 +26,7 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
   Boolean $ps_manage_fw         = false,
   String $ps_prom_host          = 'prometheus.example.net',
+  String $ps_data_dir           = '/data/prometheus',
 
   # firewall
   String $ps_fw_prefix          = '50',