consul-templaterb 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efd0da9a415f6e58d2da8e712ea082efd08b51631b38c31db287cbbdf3a3bbe
-  data.tar.gz: 9e1fdd39625a7213dfb431dc89660fdeb0da382c4459766f5a2d34803313b9fd
+  metadata.gz: 0baeb6d85fa2f689ac4ff09c496188c635affe3c36d4be0646bb12fd98bf788b
+  data.tar.gz: c9a0a12bd22972c20a88ba5cacdebb26f754e831a8c57631b4d2b3d3336512a5
 SHA512:
-  metadata.gz: 5f7c6e9187971dda5aadab619fe58facf7c76fe6cf7dde9a5d9c3708d525e8a3fc4bd8b8b558ccfcd8a3b2fafaf923acb7f5f673e9428635ef9b391ec50f6f79
-  data.tar.gz: 8031be2c311b9e1f12127a5e15922d13a12f86c86e2e0ec1ea92c1282c7f382fdab2f851c6bbb43b6d63dba91a8eb731df7825d93aaae7164407db1b1c48ebcf
+  metadata.gz: 392d5e80cc2cc910500e5d0d93f0ab5dda3e65396ca745d6881c8cf10fc3775c59d7418af83d4aebbf44cfc55036ed942b41a1ef6eff8ea16a2db65401c8c2eb
+  data.tar.gz: b88eaa96328377e5a7c23fa8283a4165831b57c4cb7861ca71352446711850e5f6afcc392819baee38aeb3ecafdc424fbeada84925be6c52109f9375f9f86b73

data/CHANGELOG.md

@@ -2,15 +2,25 @@
 
 ## (UNRELEASED)
 
+## 1.9.1
+
+NEW FEATURES:
+ 
+ * Now display effective network bandwidth instead of uncompressed bandwidth
+ * for catalog/services and catalog/nodes, now min delay is 15s instead of 30s
+
 ## 1.9.0
 
 OPTIMIZATIONS:
+
  * Better network issue because of X-Consul-Index parsing bug
 
 NEW FEATURES:
+
  * value.endpoint.x_consul_index now works as expected
 
 IMPROVEMENTS:
+
  * timeline now works well behing load balancer without stickyness
  * Now hide service column when filtering on a service
  * apply row limits immediately

data/bin/consul-templaterb

@@ -54,10 +54,10 @@ options = {
     enable_gzip_compression: true,
     paths: {
       '/v1/catalog/services': {
-        min_duration: 30,    # Since services change a lot, refresh services every 30 seconds
+        min_duration: 15,    # Since services change a lot, refresh services every 15 seconds
       },
       '/v1/catalog/nodes': {
-        min_duration: 30,    # Do not wake up before 30 seconds when node appear/disappear
+        min_duration: 15,    # Do not wake up before 15 seconds when node appear/disappear
       },
       '/v1/catalog/datacenters': {
         min_duration: 60,    # Datacenters are not added every minute, right?

data/lib/consul/async/consul_template.rb

@@ -32,7 +32,8 @@ module Consul
           success: 0,
           errors: 0,
           bytes_read: 0,
-          changes: 0
+          changes: 0,
+          network_bytes: 0
         }
         @context = {
           current_erb_path: nil,
@@ -224,7 +225,7 @@ module Consul
         if last_result != data
           STDERR.print "[INFO] Write #{Utilities.bytes_to_h data.bytesize} bytes to #{file}, "\
                        "netinfo=#{@net_info} aka "\
-                       "#{Utilities.bytes_to_h((net_info[:bytes_read] / (Time.now.utc - @start_time)).round(1))}/s ...\n"
+                       "#{Utilities.bytes_to_h((net_info[:network_bytes] / (Time.now.utc - @start_time)).round(1))}/s ...\n"
           tmp_file = "#{file}.tmp"
           File.open(tmp_file, 'w') do |f|
             f.write data
@@ -258,8 +259,10 @@ module Consul
           STDERR.print "[INFO] path #{path.ljust(64)} #{query_params.inspect}\r"
           @endpoints[fqdn] = tpl
           tpl.endpoint.on_response do |result|
-            @net_info[:success] = @net_info[:success] + 1
-            @net_info[:bytes_read] = @net_info[:bytes_read] + result.data.bytesize
+            @net_info[:success] += 1
+            @net_info[:bytes_read] += result.data.bytesize
+            @net_info[:changes] += 1 if result.modified?
+            @net_info[:network_bytes] += result.http.response_header['Content-Length'].to_i
           end
           tpl.endpoint.on_error { @net_info[:errors] = @net_info[:errors] + 1 }
         end

data/lib/consul/async/stats.rb

@@ -3,7 +3,7 @@ require 'consul/async/utilities'
 module Consul
   module Async
     class EndPointStats
-      attr_reader :successes, :errors, :start, :body_bytes, :last_error, :last_success, :changes
+      attr_reader :successes, :errors, :start, :body_bytes, :last_error, :last_success, :changes, :network_bytes
 
       def initialize
         @start = Time.now.utc
@@ -11,6 +11,7 @@ module Consul
         @errors = 0
         @body_bytes = 0
         @changes = 0
+        @network_bytes = 0
         @last_error = @start
         @last_success = @start
       end
@@ -18,8 +19,9 @@ module Consul
       def on_response(res)
         @last_success = Time.now.utc
         @successes += 1
-        @body_bytes = body_bytes + res.http.response.bytesize
-        @changes += res.modified? ? 1 : 0
+        @body_bytes += res.http.response.bytesize
+        @changes += 1 if res.modified?
+        @network_bytes += res.http.response_header['Content-Length'].to_i
       end
 
       def on_error(_http)

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.9.0'.freeze
+    VERSION = '1.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request