Recommit for updates in build 8

doc/puppet_classes/confdroid_alloy_3A_3Aparams.html

@@ -302,60 +302,6 @@
         —
         <div class='inline'>
 <p>whether to track timestamps staleness in prometheus metrics</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ay_prom_max_shards</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the maximum number of shards to use for prometheus metrics</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ay_prom_max_samples_per_send</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;2000&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the maximum number of samples to send</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ay_prom_batch_send_deadline</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;5s&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the maximum time to wait before sending</p>
 </div>
       
     </li>
@@ -371,6 +317,9 @@
         <pre class="lines">
 
 
+19
+20
+21
 22
 23
 24
@@ -398,16 +347,10 @@
 46
 47
 48
-49
+49</pre>
-50
-51
-52
-53
-54
-55</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
 
 class confdroid_alloy::params (
 
@@ -426,9 +369,6 @@ class confdroid_alloy::params (
   String $ay_prom_url                         = &#39;https://prometheus.example.net/api/v1/write&#39;,
   Boolean $ay_prom_honor_timestamps           = true,
   Boolean $ay_prom_track_timestamps_staleness = true,
-  String $ay_prom_max_shards                  = &#39;10&#39;,
-  String $ay_prom_max_samples_per_send        = &#39;2000&#39;,
-  String $ay_prom_batch_send_deadline         = &#39;5s&#39;,
 
 ) {
   # service

manifests/params.pp

@@ -14,9 +14,6 @@
 #    timestamps in prometheus metrics
 # @param [Boolean] ay_prom_track_timestamps_staleness whether to track timestamps 
 #   staleness in prometheus metrics
-# @param [String] ay_prom_max_shards the maximum number of shards to use for prometheus metrics
-# @param [String] ay_prom_max_samples_per_send the maximum number of samples to send
-# @param [String] ay_prom_batch_send_deadline the maximum time to wait before sending
 # @summary Class contains all parameters for the confdroid_alloy module.
 ##############################################################################
 class confdroid_alloy::params (
@@ -36,9 +33,6 @@ class confdroid_alloy::params (
   String $ay_prom_url                         = 'https://prometheus.example.net/api/v1/write',
   Boolean $ay_prom_honor_timestamps           = true,
   Boolean $ay_prom_track_timestamps_staleness = true,
-  String $ay_prom_max_shards                  = '10',
-  String $ay_prom_max_samples_per_send        = '2000',
-  String $ay_prom_batch_send_deadline         = '5s',
 
 ) {
   # service

templates/config.alloy.erb

@@ -94,11 +94,6 @@ prometheus.remote_write "prometheus" {
       username = "<%= @ay_loki_username %>"
       password = "<%= @ay_loki_userpass %>"
     }
-    queue_config {
-      max_shards           = <%= @ay_prom_max_shards %>
-      max_samples_per_send = <%= @ay_prom_max_samples_per_send %>
-      batch_send_deadline  = <%= @ay_prom_batch_send_deadline %>
-    }
   }
 }
 <% end %>