consul-templaterb 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced33aa72d9f144f338dd896e962ad57577f0580a590a7cf9c4151ddf4f9c12c
-  data.tar.gz: 27627d161c46451eeb383d3d69797004eb3d2b9c7fda4d74e50315c332c5b9e9
+  metadata.gz: '07836a796fda9c6b6c7e2273b0ad75e5c8248d3e4331f78f9ff898ed001fef4b'
+  data.tar.gz: 27874e394149fd25bc40be6eacf99ef916c91b5795582a7ba381b5362f43aa90
 SHA512:
-  metadata.gz: 57472c838bcd831aced8a7331b058ea8a87bc4a50b1a61b5e62b6dd46dd7ac48712b626c374f5643d5ef2a7627fe9d268f05559af395d978a3ac35dcd74e28e5
-  data.tar.gz: '063973ff971f13077e2b8e8c41a93d107662b1154286933ad0211320f1a8bcb3d42ed0482ecebf3822fe545b8a6a24c2c48b4d7770df39aa75f426759de668f2'
+  metadata.gz: f8e6c2e9210e21e671395dfca15c8a80f5a763510712613528c2441c571fd1c6f54a96930546b833c763b63a40db927dad9b5a6cf37b7c1143217e8bcab58894
+  data.tar.gz: aac441891b0ba00789ae068ef3d694b3e4e3487c716359ca037bfd3de22c9a946b534a86b86b36ad1e7fc15a42453a09db841a91df6853eb50dfee2eaad6d25a

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## (UNRELEASED)
 
+## 1.5.8 (November 14, 2018)
+
+IMPROVEMENTS:
+
+ * Add consul_service_changes_total metric in samples/metrics.erb
+
+BUG FIXES:
+
+ * Remove metrics timestamping in samples/metrics.erb to allow datapoint collection when there are no changes on a service
+
 ## 1.5.7 (November 12, 2018)
 
 NEW FEATURES:

data/lib/consul/async/consul_template.rb

@@ -31,7 +31,8 @@ module Consul
         @net_info = {
           success: 0,
           errors: 0,
-          bytes_read: 0
+          bytes_read: 0,
+          changes: 0
         }
         @context = {
           current_erb_path: nil,

data/lib/consul/async/stats.rb

@@ -3,13 +3,14 @@ require 'consul/async/utilities'
 module Consul
   module Async
     class EndPointStats
-      attr_reader :successes, :errors, :start, :body_bytes, :last_error, :last_success
+      attr_reader :successes, :errors, :start, :body_bytes, :last_error, :last_success, :changes
 
       def initialize
         @start = Time.now.utc
         @successes = 0
         @errors = 0
         @body_bytes = 0
+        @changes = 0
         @last_error = @start
         @last_success = @start
       end
@@ -18,6 +19,7 @@ module Consul
         @last_success = Time.now.utc
         @successes += 1
         @body_bytes = body_bytes + res.http.response.bytesize
+        @changes += res.modified? ? 1 : 0
       end
 
       def on_error(_http)

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.5.7'.freeze
+    VERSION = '1.5.8'.freeze
   end
 end

data/samples/metrics.erb

@@ -62,32 +62,33 @@ consul_services_count <%= service_count %> <%= services(tag: service_tag_filter)
 
 # HELP consul_service_count A gauge of number instances of service with their current state
 # TYPE consul_service_count gauge
-# HELP consul_service_stats_requests_total A counter of requests performed by consul-templaterb, show activity on a service
+# HELP consul_service_stats_requests_total A counter of requests performed by consul-templaterb, shows activity on a service
 # TYPE consul_service_stats_requests_total counter
 # HELP consul_service_stats_requests_bytes A counter of bytes transfered from Consul Agent to consul-templaterb
 # TYPE consul_service_stats_requests_bytes counter
 # HELP consul_service_stats_requests_bytes_per_sec A counter of bytes transfered from Consul Agent to consul-templaterb
 # TYPE consul_service_stats_requests_bytes_per_sec gauge
+# HELP consul_service_changes_total A counter of changes that occured on a service
+# TYPE consul_service_changes_total counter
 
 <%
   json_backends = {}
   now = Time.now.utc
-  now_ms = now.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 %> <%= last_update %>
+%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"} <%= state_count %>
 <%
     end
     current_stats = service_info[:stats]
-%>consul_service_stats_requests_total{service="<%= service_name %>",type="success"} <%= current_stats.successes %> <%= last_update %>
+%>consul_service_stats_requests_total{service="<%= service_name %>",type="success"} <%= current_stats.successes %>
 <%
     if current_stats.errors > 0
-%>consul_service_stats_requests_total{service="<%= service_name %>",type="errors"} <%= current_stats.errors %> <%= last_update %>
+%>consul_service_stats_requests_total{service="<%= service_name %>",type="errors"} <%= current_stats.errors %>
 <%
     end
-%>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) %> <%= now_ms %>
+%>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(now) %>
+consul_service_changes_total{service="<%= service_name %>"} <%= service_info[:stats].changes %>
 
 <%
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language