Recommit for updates in build 20

doc/_index.html

@@ -135,7 +135,7 @@
           <ul>
     
             <li>
-      <span class='object_link'><a href="puppet_defined_types/confdroid_alloy_3A_3Alog_targets.html" title="puppet_defined_types::confdroid_alloy::log_targets (puppet_defined_type)">confdroid_alloy::log_targets</a></span>
+      <span class='object_link'><a href="puppet_defined_types/confdroid_alloy_3A_3Amonitoring_3A_3Alog_targets.html" title="puppet_defined_types::confdroid_alloy::monitoring::log_targets (puppet_defined_type)">confdroid_alloy::monitoring::log_targets</a></span>
       
             </li>
     

doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html

@@ -169,8 +169,7 @@
 71
 72
 73
-74
+74</pre>
-75</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -179,7 +178,6 @@ class confdroid_alloy::main::files (
 
 ) inherits confdroid_alloy::params {
   require confdroid_alloy::main::dirs
-  include concat
 
   $log_targets_array = Array($confdroid_alloy::params::ay_log_targets, true)
 

doc/puppet_defined_type_list.html

@@ -40,9 +40,9 @@
       <ul id="full_list" class="puppet_defined_type">
         
 
-    <li id="object_puppet_defined_types::confdroid_alloy::log_targets" class="odd">
+    <li id="object_puppet_defined_types::confdroid_alloy::monitoring::log_targets" class="odd">
       <div class="item">
-        <span class='object_link'><a href="puppet_defined_types/confdroid_alloy_3A_3Alog_targets.html" title="puppet_defined_types::confdroid_alloy::log_targets (puppet_defined_type)">confdroid_alloy::log_targets</a></span>
+        <span class='object_link'><a href="puppet_defined_types/confdroid_alloy_3A_3Amonitoring_3A_3Alog_targets.html" title="puppet_defined_types::confdroid_alloy::monitoring::log_targets (puppet_defined_type)">confdroid_alloy::monitoring::log_targets</a></span>
       </div>
     </li>
     

doc/puppet_defined_types/confdroid_alloy_3A_3Amonitoring_3A_3Alog_targets.html

@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Defined Type: confdroid_alloy::monitoring::log_targets
+  
+    &mdash; Documentation by YARD 0.9.36
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "puppet_defined_types::confdroid_alloy::monitoring::log_targets";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_defined_type_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Defined Types</span></span>
+     &raquo; 
+    <span class="title">confdroid_alloy::monitoring::log_targets</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Defined Type: confdroid_alloy::monitoring::log_targets</h1>
+<div class="box_info">
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/monitoring/log_targets.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Adds log file targets to the Alloy configuration.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_alloy::monitoring::log_targets.pp Module name: confdroid_alloy</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>targets</span>
+      
+      
+        <span class='type'>(<tt>Array[String]</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Paths to log files to scrape.</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/monitoring/log_targets.pp', line 6</span>
+
+define confdroid_alloy::monitoring::log_targets (
+
+  Array[String] $targets = [],
+
+) {
+  if $confdroid_alloy::params::ay_manage_loki == true and $targets != [] {
+    $log_targets_array = $targets
+
+    concat::fragment { &quot;log_targets_${name}&quot;:
+      target  =&gt; $confdroid_alloy::params::ay_main_file,
+      content =&gt; template(&#39;confdroid_alloy/log_targets.alloy.erb&#39;),
+      order   =&gt; &#39;020&#39;,
+    }
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
+</div>
+
+    </div>
+  </body>
+</html>

manifests/main/files.pp

@@ -7,7 +7,6 @@ class confdroid_alloy::main::files (
 
 ) inherits confdroid_alloy::params {
   require confdroid_alloy::main::dirs
-  include concat
 
   $log_targets_array = Array($confdroid_alloy::params::ay_log_targets, true)
 

manifests/monitoring/log_targets.pp

@@ -1,9 +1,9 @@
-## confdroid_alloy::log_targets.pp
+## confdroid_alloy::monitoring::log_targets.pp
 # Module name: confdroid_alloy
 # @summary Adds log file targets to the Alloy configuration.
 # @param [Array[String]] targets Paths to log files to scrape.
 ###############################################################################
-define confdroid_alloy::log_targets (
+define confdroid_alloy::monitoring::log_targets (
 
   Array[String] $targets = [],