consul-templaterb 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed586b6f530661c89df4f8f31dd1f4960742b1fcfd9ea2aed2af44da9f059c05
-  data.tar.gz: d0eb5d09751bd5a8eafac6bf67febce94601ceae65f03ede0f576627f1d179ef
+  metadata.gz: 304b95f065eeb5380e20568ab0d157b011b02e2990bcad5badffdc9cdbd74463
+  data.tar.gz: e3e520457339beea59c4d0caf4f21b42457ad67fb163d5f2a93ce227b0bb5602
 SHA512:
-  metadata.gz: 865873980923a237af55f5809eb8a9ebb484279897c5dd3f37c6b7a8a19a780ed1bde203a566883f921fb14c4dc8c3e750abdf10807f86546c47d681da7a9483
-  data.tar.gz: 96dfd1d681f5760897609a6ec69b66fde406745ee4fb718d94e8faa566f97581637e08bd57fc91dc520be109221d426da0e9c6d327480e04fc8f0ae5b5dafdbc
+  metadata.gz: 6cf440dbc49f9f9834eae4fee2f8377e7dbcd06362ca8a7bf4ca0525d62ac5e426c2069f571a76e82081db10a43c55faea2c4a31050015cb4b5e060905d81017
+  data.tar.gz: 83a6958a169229cbb598a93440852f824e5cc8c65c6e2b751146e36e5371e8c6cc8bafd3bedfd2862e2323d2047eaa01ad6abc86c54bfbf4543034f61082b8e4

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## (UNRELEASED)
 
-## 1.5.4 (September 27, 2018)
+## 1.5.6 (September 30, 2018)
+
+IMPROVEMENTS:
+
+ * Added methods to get timestamps on each endpoint
+ * Use timestamps in [Prometheus template](samples/metrics.erb) to get more precise metrics
+
+## 1.5.5 (September 27, 2018)
 
 IMPROVEMENTS:
 

data/lib/consul/async/stats.rb

@@ -3,21 +3,25 @@ require 'consul/async/utilities'
 module Consul
   module Async
     class EndPointStats
-      attr_reader :successes, :errors, :start, :body_bytes
+      attr_reader :successes, :errors, :start, :body_bytes, :last_error, :last_success
 
       def initialize
         @start = Time.now.utc
         @successes = 0
         @errors = 0
         @body_bytes = 0
+        @last_error = @start
+        @last_success = @start
       end
 
       def on_response(res)
+        @last_success = Time.now.utc
         @successes += 1
         @body_bytes = body_bytes + res.http.response.bytesize
       end
 
       def on_error(_http)
+        @last_error = Time.now.utc
         @errors += 1
       end
 
@@ -34,6 +38,10 @@ module Consul
       def body_bytes_human
         Utilities.bytes_to_h(body_bytes)
       end
+
+      def last_success_or_error
+        [@last_error, @last_success].max
+      end
     end
   end
 end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.5.5'.freeze
+    VERSION = '1.5.6'.freeze
   end
 end

data/samples/metrics.erb

@@ -50,15 +50,15 @@
 %>
 # HELP consul_datacenters_count A gauge of number of datacenters available
 # TYPE consul_nodes_count gauge
-consul_datacenters_count <%= datacenters().count %>
+consul_datacenters_count <%= datacenters().count %> <%= datacenters().endpoint.stats.last_success_or_error.to_i * 1000 %>
 
 # HELP consul_nodes_count A gauge of number of nodes in the cluster
 # TYPE consul_nodes_count gauge
-consul_nodes_count <%= nodes().count %>
+consul_nodes_count <%= nodes().count %> <%= nodes().endpoint.stats.last_success_or_error.to_i * 1000 %>
 
 # HELP consul_services_count A gauge of the number of services
 # TYPE consul_services_count gauge
-consul_services_count <%= service_count %>
+consul_services_count <%= service_count %> <%= services(tag: service_tag_filter).endpoint.stats.last_success_or_error.to_i * 1000 %>
 
 # HELP consul_service_count A gauge of number instances of service with their current state
 # TYPE consul_service_count gauge
@@ -71,20 +71,22 @@ consul_services_count <%= service_count %>
 
 <%
   json_backends = {}
+  now = Time.now.utc.to_i * 1000
   backends.each_pair do |service_name, service_info|
+    last_update = service_info[:stats].last_success_or_error.to_i * 1000
     service_info[:state].each_pair do |state_name, state_count|
-%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"} <%= state_count %>
+%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"} <%= state_count %> <%= last_update %>
 <%
     end
     current_stats = service_info[:stats]
-%>consul_service_stats_requests_total{service="<%= service_name %>",type="success"} <%= current_stats.successes %>
+%>consul_service_stats_requests_total{service="<%= service_name %>",type="success"} <%= current_stats.successes %> <%= last_update %>
 <%
     if current_stats.errors > 0
-%>consul_service_stats_requests_total{service="<%= service_name %>",type="errors"} <%= current_stats.errors %>
+%>consul_service_stats_requests_total{service="<%= service_name %>",type="errors"} <%= current_stats.errors %> <%= last_update %>
 <%
     end
-%>consul_service_stats_requests_bytes{service="<%= service_name %>"} <%= service_info[:stats].body_bytes %>
-consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= service_info[:stats].bytes_per_sec %>
+%>consul_service_stats_requests_bytes{service="<%= service_name %>"} <%= service_info[:stats].body_bytes %> <%= last_update %>
+consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= service_info[:stats].bytes_per_sec %> <%= now %>
 
 <%
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request