consul-templaterb 1.29.0 → 1.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c96f61a1890c149604e52ed7d68bd239fe6b8df3bdf12b21fc5aacc07d985b
-  data.tar.gz: 7053673ba6ee2775cdc80a04fd2c8b2d8956b41f58108eac1617599d604072bd
+  metadata.gz: 4c45366cab4f4e92c620ccd80d1263afd031b3b26163630e7969d1dd68c7136e
+  data.tar.gz: 89c565116147e7e9ae610dad3bbfb378f0ccdfaaf0ccf1f7738f257264ee7517
 SHA512:
-  metadata.gz: 75c8c5f6b55d8246942f0e86a7d2041d54822b980379c49e06b51f2d806f316dc8f35674751eb6610b50ec465140ac8412133765378aa60d47057557dbd694a8
-  data.tar.gz: 24366dc573380c88460224829282e80ed8e39f3312daf885cd28c8d5e3028c87d0239b4b0fdc8920820e101c58e5e47121ab181ff1fae6cbf769b4152c2e20c2
+  metadata.gz: 322c5a2ba771c67090b06a87dcf01d9977846d665423bc5dbeda38188343d94f94b78c35fa7ebdac7936e2180eab91dc60f4c66cdf9fcd660605133ca6eca07e
+  data.tar.gz: a08fa814f2b7b9ec2ca5e6a5ee7a18fcfbbd74602cafa6cc9ae24f1ca664621f746824dab7664fcac29f270590c7a7c8939b993c92013174eaf2c94f1117a517

data/CHANGELOG.md

@@ -1,6 +1,41 @@
 # CHANGELOG
 
-## (UNRELEASED)
+## 1.31.1 (Jan 28, 2021)
+
+IMPROVEMENTS:
+
+* Switched to Github Actions (build)
+* No functional changes in GEM - Test release only
+
+## 1.32.0 (Jan 27, 2021)
+
+IMPROVEMENTS:
+
+* Use Ruby 2.7.2 in Travis build
+* [VAULT] Do not handle missing secret as a blocking exception ([#73](https://github.com/criteo/consul-templaterb/pull/73))
+
+## 1.31.1 (Jan 25, 2021)
+
+IMPROVEMENTS:
+
+* Use Node.Meta.fqdn to display node names in timeline if set
+
+## 1.31.0 (Jan 18, 2021)
+
+IMPROVEMENTS:
+
+* Do not apply penalty on unmodified services not changing much (Will improve streaming performance)
+
+## 1.30.0 (Dec 18, 2020)
+
+IMPROVEMENTS:
+
+ * Allow customization to sort nodes in service view in Consul-UI ([#71](https://github.com/criteo/consul-templaterb/pull/71))
+
+NEW FEATURES:
+
+ * Auto-detection of rate-limit on Consul Side (introduced in Consul 1.6.2+), this feature
+   will work only Consul 1.9+ (see [Consul #7527](https://github.com/hashicorp/consul/issues/7527)). 
 
 ## 1.29.0 (Oct 6, 2020)
 

data/README.md

@@ -1,6 +1,6 @@
 # consul-templaterb
 
-[![Build Status](https://api.travis-ci.org/criteo/consul-templaterb.svg?branch=master)](https://travis-ci.org/criteo/consul-templaterb)
+[![Build Status](https://github.com/criteo/consul-templaterb/workflows/Ruby/badge.svg?branch=master)](https://github.com/criteo/consul-templaterb/actions?query=branch%3Amaster)
 [![Gem Version](https://badge.fury.io/rb/consul-templaterb.svg)](http://github.com/criteo/consul-templaterb/releases)
 [![GEM Downloads](https://ruby-gem-downloads-badge.herokuapp.com/consul-templaterb?type=total&metric=true)](https://rubygems.org/gems/consul-templaterb)
 [![License](https://img.shields.io/badge/license-ApacheV2-yellowgreen.svg)](#license)

data/lib/consul/async/consul_endpoint.rb

@@ -225,9 +225,34 @@ module Consul
         retry_in / 2 + Consul::Async::Utilities.random.rand(retry_in)
       end
 
+      # rubocop:disable Style/ClassVars
+      def _last_429
+        @@_last_429 ||= { count: 0 }
+      end
+      # rubocop:enable Style/ClassVars
+
       def _handle_error(http, consul_index)
         retry_in = _compute_retry_in([600, conf.retry_duration + 2**@consecutive_errors].min)
-        ::Consul::Async::Debug.puts_error "[#{path}] X-Consul-Index:#{consul_index} - #{http.error} - Retry in #{retry_in}s #{stats.body_bytes_human}"
+        if http.response_header.status == 429
+          _last_429
+          retry_in = 60 + Consul::Async::Utilities.random.rand(180) if retry_in < 60
+          _last_429[:time] = Time.now.utc
+          _last_429[:count] += 1
+          if (_last_429[:count] % 10) == 1
+            if _last_429[:count] == 1
+              ::Consul::Async::Debug.puts_error "Rate limiting detected on Consul side (HTTP 429)!\n\n" \
+                                                "******************************* CONFIGURATION ISSUE DETECTED *******************************\n" \
+                                                "* Too many simultaneous connections for Consul agent #{conf.base_url}\n" \
+                                                "* You should tune 'limits.http_max_conns_per_client' to a higher value.\n" \
+                                                "* This program will behave badly until you change this.\n" \
+                                                "* See https://www.consul.io/docs/agent/options.html#http_max_conns_per_client for more info\n" \
+                                                "********************************************************************************************\n\n"
+            end
+            ::Consul::Async::Debug.puts_error "[#{path}] Too many conns to #{conf.base_url}, errors=#{_last_429[:count]} - Retry in #{retry_in}s #{stats.body_bytes_human}"
+          end
+        else
+          ::Consul::Async::Debug.puts_error "[#{path}] X-Consul-Index:#{consul_index} - #{http.error} - Retry in #{retry_in}s #{stats.body_bytes_human}"
+        end
         @consecutive_errors += 1
         http_result = HttpResponse.new(http)
         EventMachine.add_timer(retry_in) do
@@ -272,11 +297,12 @@ module Consul
                             end
               new_content = http_result.response.freeze
               modified = @last_result.fake? || @last_result.data != new_content
-              if n_consul_index == consul_index || n_consul_index.nil?
+              if n_consul_index.nil?
                 retry_in = modified ? conf.missing_index_retry_time_on_diff : conf.missing_index_retry_time_on_unchanged
                 n_consul_index = consul_index
               else
                 retry_in = modified ? conf.min_duration : conf.retry_on_non_diff
+                retry_in = 0.1 if retry_in < (Time.now - @last_result.last_update)
               end
               retry_in = _compute_retry_in(retry_in)
               retry_in = 0.1 if retry_in < 0.1

data/lib/consul/async/vault_endpoint.rb

@@ -245,7 +245,7 @@ module Consul
           http = connection.send(http_method.downcase, build_request) # Under the hood: c.send('get', {stuff}) === c.get({stuff})
           http.callback do
             http_result = VaultHttpResponse.new(http.dup.freeze, default_value)
-            if enforce_json_200 && http.response_header.status != 200
+            if enforce_json_200 && ![200, 404].include?(http.response_header.status)
               _handle_error(http_result) { connection = EventMachine::HttpRequest.new(conf.base_url, options) }
             else
               @consecutive_errors = 0

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.29.0'.freeze
+    VERSION = '1.32.1'.freeze
   end
 end

data/samples/consul-ui/.preferences.rb.samples

@@ -0,0 +1 @@
+SORT_CONSUL_SERVICE_NODES = -> (nodes) { nodes.sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] } }

data/samples/consul-ui/README.md

@@ -94,3 +94,9 @@ This app supports the following environment variables:
 * `EXCLUDE_SERVICES`: comma-separated services to exclude (default: lbl7.*,netsvc-probe.*,consul-probed.*)
 * `CONSUL_TIMELINE_BUFFER`: number of entries to keep in the timeline. 1000 by default.
 * `CONSUL_TIMELINE_BLACKLIST`: regexp of services to hide from timeline
+
+### Preferences
+
+Some templates allows you to override some behavior through `.preferences.rb` file.
+In order to do that, rename `.preferences.rb.samples` file to `.preferences.rb`
+and update lambda defined inside to match targeted behavior.

data/samples/consul-ui/consul_services.json.erb

@@ -6,6 +6,19 @@
 #   INSTANCE_EXCLUDE_TAG: Exclude instances having the given tag (default: canary)
 #   EXCLUDE_SERVICES: comma-separated services regexps to exclude (default: lbl7.*,netsvc-probe.*,consul-probed.*)
 
+  unless @sort_consul_service_nodes
+    begin
+      target_dir = File.split(File.expand_path(template_info['source']))[0]
+      target = File.join(target_dir, '.preferences.rb')
+      load "#{target}"
+      STDERR.puts "Using #{target} file."
+      @sort_consul_service_nodes = SORT_CONSUL_SERVICE_NODES
+    rescue LoadError
+      STDERR.puts 'Couldn\'t find .preferences.rb file ; default configuration will be used.'
+      @sort_consul_service_nodes = -> (nodes) { nodes.sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] } }
+    end
+  end
+
   service_tag_filter = ENV['SERVICES_TAG_FILTER'] || nil
   instance_must_tag = ENV['INSTANCE_MUST_TAG'] || service_tag_filter
   instance_exclude_tag = ENV['INSTANCE_EXCLUDE_TAG']
@@ -20,7 +33,7 @@
     if !services_blacklist.any? {|r| r.match(service_name)} && (instance_must_tag.nil? || tags.include?(instance_must_tag))
       tags_per_service[service_name] = tags.sort
       the_backends = []
-      service(service_name).sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] }.each do |snode|
+      @sort_consul_service_nodes.call(service(service_name)).each do |snode|
         tags_of_instance = snode['Service']['Tags'].sort
         if (instance_must_tag.nil? || tags_of_instance.include?(instance_must_tag)) && !tags_of_instance.include?(instance_exclude_tag)
           the_backends << snode if snode['Service']['Port']

data/samples/consul-ui/js/timeline.js

@@ -434,7 +434,7 @@ class ServiceTimeline {
             }
             var text = e.instance;
             if (e.instance_info && e.instance_info.node) {
-                text = e.instance_info.node;
+                text = e.instance_info.fqdn;
                 if (e.instance_info.port > 0) {
                     text += ":" + e.instance_info.port
                 }

data/samples/consul-ui/timeline.json.erb

@@ -41,10 +41,12 @@ cur_state = services.map do |service_name, _tags|
       mindex = chk['ModifyIndex'] || 0
       mod_index = mindex if mod_index < mindex
     end
-    ["#{instance['Node']['Node']}:#{instance['Service']['ID']}",
+    node_name = instance['Node']['Node']
+    ["#{node_name}:#{instance['Service']['ID']}",
      {
        'address' => instance.service_address,
-       'node' => instance['Node']['Node'],
+       'node' => node_name,
+       'fqdn' => instance.node_meta['fqdn'] || node_name,
        'port' => instance['Service']['Port'],
        'idx'  => mod_index || cur_index,
        'status' => instance.status,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.32.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -181,6 +181,7 @@ files:
 - samples/all_services_multi_agents.txt.erb
 - samples/all_templates.erb
 - samples/checks_in_warning_or_critical_state.yaml.erb
+- samples/consul-ui/.preferences.rb.samples
 - samples/consul-ui/README.md
 - samples/consul-ui/common/footer.html.erb
 - samples/consul-ui/common/header.html.erb
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language