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

Auto-merge for build 24

See merge request puppet/prometheus_cd!23

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html

@@ -154,10 +154,10 @@ class prometheus_cd::main::dirs (
       owner    => 'prometheus',
       group    => 'prometheus',
       mode     => '0750',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => etc_t,
-#      seluser  => system_u,
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => default_t,
+      seluser  => system_u,
     }
   }
 }</pre>

manifests/main/dirs.pp

@@ -24,10 +24,10 @@ class prometheus_cd::main::dirs (
       owner    => 'prometheus',
       group    => 'prometheus',
       mode     => '0750',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => etc_t,
-#      seluser  => system_u,
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => default_t,
+      seluser  => system_u,
     }
   }
 }

templates/prometheus.yml.erb

@@ -9,6 +9,7 @@ global:
 storage:
   tsdb:
     out_of_order_time_window: 5m
+    path: <%= @ps_data_dir %>
 alerting:
   alertmanagers:
   - follow_redirects: true