Recommit for updates in build 8

README.md

@@ -37,7 +37,6 @@ Then you can use Grafana itself to visualize those logs and metrics and built an
 INSTALLATION
 
 - installs alloy binaries
-- installs node exporter (optional, set `ay_manage_ne`to `true`)
 
 CONFIGURATION
 

doc/file.README.html

@@ -108,8 +108,6 @@
 <p>INSTALLATION</p>
 <ul><li>
 <p>installs alloy binaries</p>
-</li><li>
-<p>installs node exporter (optional, set <code>ay_manage_ne</code>to <code>true</code>)</p>
 </li></ul>
 
 <p>CONFIGURATION</p>

doc/index.html

@@ -108,8 +108,6 @@
 <p>INSTALLATION</p>
 <ul><li>
 <p>installs alloy binaries</p>
-</li><li>
-<p>installs node exporter (optional, set <code>ay_manage_ne</code>to <code>true</code>)</p>
 </li></ul>
 
 <p>CONFIGURATION</p>

doc/puppet_classes/confdroid_alloy_3A_3Aparams.html

@@ -234,24 +234,6 @@
       
     </li>
   
-    <li>
-      
-        <span class='name'>ay_manage_ne</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>false</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>whether to manage metric forwarding for the node exporter (external)</p>
-</div>
-      
-    </li>
-  
     <li>
       
         <span class='name'>ay_prom_url</span>
@@ -284,6 +266,42 @@
         &mdash;
         <div class='inline'>
 <p>the logging targets</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ay_prom_honor_timestamps</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to honor timestamps in prometheus metrics</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ay_prom_track_timestamps_staleness</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to track timestamps staleness in prometheus metrics</p>
 </div>
       
     </li>
@@ -299,8 +317,6 @@
         <pre class="lines">
 
 
-17
-18
 19
 20
 21
@@ -330,29 +346,29 @@
 45
 46
 47
-48</pre>
+48
+49</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
 
 class confdroid_alloy::params (
 
-  String $ay_reqpackages      = &#39;alloy&#39;,
+  String $ay_reqpackages                      = &#39;alloy&#39;,
-  String $ay_pkg_ensure       = &#39;latest&#39;,
+  String $ay_pkg_ensure                       = &#39;latest&#39;,
 
 # loki
-  Boolean $ay_manage_loki     = true,
+  Boolean $ay_manage_loki                     = true,
-  String $ay_loki_url         = &#39;https://loki.example.net/loki/api/v1/push&#39;,
+  String $ay_loki_url                         = &#39;https://loki.example.net/loki/api/v1/push&#39;,
-  String $ay_loki_username    = &#39;loki_user&#39;,
+  String $ay_loki_username                    = &#39;loki_user&#39;,
-  String $ay_loki_userpass    = &#39;loki_pass&#39;,
+  String $ay_loki_userpass                    = &#39;loki_pass&#39;,
-  Array $ay_log_targets       = [&#39;/var/log/messages&#39;,&#39;/var/log/secure&#39;,],
+  Array $ay_log_targets                       = [&#39;/var/log/messages&#39;,&#39;/var/log/secure&#39;,],
 
 # prometheus
-  Boolean $ay_manage_prom     = true,
+  Boolean $ay_manage_prom                     = true,
-  String $ay_prom_url         = &#39;https://prometheus.example.net/api/v1/write&#39;,
+  String $ay_prom_url                         = &#39;https://prometheus.example.net/api/v1/write&#39;,
-
+  Boolean $ay_prom_honor_timestamps           = true,
-# node exporter (external)
+  Boolean $ay_prom_track_timestamps_staleness = true,
-  Boolean $ay_manage_ne       = false,
 
 ) {
   # service

manifests/params.pp

@@ -8,30 +8,31 @@
 # @param [String] ay_loki_userpass the password to logon to loki
 # @param [Boolean] ay_manage_loki whether to manage log forwarding to loki
 # @param [Boolean] ay_manage_prom whether to manage metric forwarding
-# @param [Boolean] ay_manage_ne whether to manage metric forwarding for
-#   the node exporter (external)
 # @param [String] ay_prom_url the url where alloy will send metrics
 # @param [Array] ay_log_targets the logging targets
+# @param [Boolean] ay_prom_honor_timestamps whether to honor 
+#    timestamps in prometheus metrics
+# @param [Boolean] ay_prom_track_timestamps_staleness whether to track timestamps 
+#   staleness in prometheus metrics
 # @summary Class contains all parameters for the confdroid_alloy module.
 ##############################################################################
 class confdroid_alloy::params (
 
-  String $ay_reqpackages      = 'alloy',
+  String $ay_reqpackages                      = 'alloy',
-  String $ay_pkg_ensure       = 'latest',
+  String $ay_pkg_ensure                       = 'latest',
 
 # loki
-  Boolean $ay_manage_loki     = true,
+  Boolean $ay_manage_loki                     = true,
-  String $ay_loki_url         = 'https://loki.example.net/loki/api/v1/push',
+  String $ay_loki_url                         = 'https://loki.example.net/loki/api/v1/push',
-  String $ay_loki_username    = 'loki_user',
+  String $ay_loki_username                    = 'loki_user',
-  String $ay_loki_userpass    = 'loki_pass',
+  String $ay_loki_userpass                    = 'loki_pass',
-  Array $ay_log_targets       = ['/var/log/messages','/var/log/secure',],
+  Array $ay_log_targets                       = ['/var/log/messages','/var/log/secure',],
 
 # prometheus
-  Boolean $ay_manage_prom     = true,
+  Boolean $ay_manage_prom                     = true,
-  String $ay_prom_url         = 'https://prometheus.example.net/api/v1/write',
+  String $ay_prom_url                         = 'https://prometheus.example.net/api/v1/write',
-
+  Boolean $ay_prom_honor_timestamps           = true,
-# node exporter (external)
+  Boolean $ay_prom_track_timestamps_staleness = true,
-  Boolean $ay_manage_ne       = false,
 
 ) {
   # service

templates/config.alloy.erb

@@ -79,8 +79,8 @@ prometheus.scrape "node_exporter" {
   targets                     = discovery.relabel.node_exporter.output
   forward_to                  = [prometheus.remote_write.prometheus.receiver]
   scrape_interval             = "15s"
-  honor_timestamps            = true
+  honor_timestamps            = <%= @ay_prom_honor_timestamps %>
-  track_timestamps_staleness  = true
+  track_timestamps_staleness  = <%= @ay_prom_track_timestamps_staleness %>
 }
 
 prometheus.remote_write "prometheus" {