consul-templaterb 1.27.0 → 1.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea2191ec559b6c2ccc871a6cac0083fd894200bd268421eb25b12361a8fc4373
-  data.tar.gz: db35acece2ea661ef35cefad9c1a94dd452e533458cff6cfa97f3114d5cc502f
+  metadata.gz: 5b99b274e76706dd09a6da62555cc79c462d5072237825fb10fea80ef3d3e558
+  data.tar.gz: 68e4a32addfb0decb19e8dbda17dfc99665c6e19da03d789cddf61196c051c7a
 SHA512:
-  metadata.gz: bf4a2b9e2ee7ba6d811b8d20202c2c0bc998afe5fcbd08c1325f573a38b422a5d94a21666efff14526d44071aa2faeb36e2157f72a097d36dad8309b30418aef
-  data.tar.gz: 28087756e716a4a6e2c8526b4920571118a3c6b2896ff2e302d52281fccfb277b5741b1a0c8b2be132ba7c405c6ea689767369b90c8db052562348739d3ba04d
+  metadata.gz: c1385863a2b51bb12c4b900c869a82048acecec0abe9e6875e151cf39151e5f0ff983b130549191d236315c22ff45e61810c515397d75fe2847dc28e70044499
+  data.tar.gz: 9a6acde596746461c64b99145f13952e4e4cfc4ea009b9e31f65afab96f5e7ecf93f5764ad7d0e5fd98e5b37419bc5b60c169abf6aefdc5bb2cbbd55f1495c30

data/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 ## (UNRELEASED)
 
+## 1.28.2 (Oct 5, 2020)
+
+NEW FEATURES:
+
+ * Added new decorator to compute node names in consul-ui ([#70](https://github.com/criteo/consul-templaterb/pull/70))
+
+## 1.28.1 (Sept 30, 2020)
+
+IMPROVEMENTS:
+
+ * Reduced size of GEM from 400k o 100k by removing not needed files
+
+## 1.28.0 (Sept 25, 2020)
+
+NEW FEATURES:
+
+ * Added `-W` or `--wait-between-reload-signal` to avoid sending too many signals
+   to a process executed. This avoids for instance reloading too much a HAProxy configuration
+   without having to play with `-w` as described in [#69](https://github.com/criteo/consul-templaterb/issues/69)
+
+BUG FIXES:
+
+ * Removed warnings at runtime with Ruby 2.7+
+ * Minor JS fix in Consul-UI (Added missing unused parameter to function `serviceTitleGenerator`)
+
+## 1.27.2 (Sept 4, 2020)
+
+IMPROVEMENTS:
+
+ * Consul-UI now supports navigation between nodes and services in both ways
+
+## 1.27.1 (July 28, 2020)
+
+BUGIX:
+
+ * Fix collision in JSON queries when using payload in requests [#68](https://github.com/criteo/consul-templaterb/pull/68)
+
 ## 1.27.0 (June 5, 2020)
 
 NEW FEATURES:
@@ -13,15 +50,15 @@ NEW FEATURES:
 
 ## 1.26.3 (April 15, 2020)
 
-BUGFIX:
+BUG FIXES:
 
  * Removed all Criteo specific decorators from Consul-UI
 
 ## 1.26.2 (April 15, 2020)
 
-BUGFIX:
+BUG FIXES:
 
- * Fixed broken Dockerfile (was missing the new `decorator.js.erb` file). Fixes #61 (Thanks to @ simongareste)
+ * Fixed broken Dockerfile (was missing the new `decorator.js.erb` file). Fixes #61 (Thanks to [@simongareste](https://github.com/simongareste))
 
 NEW FEATURES:
 
@@ -29,7 +66,7 @@ NEW FEATURES:
 
 ## 1.26.1 (March 27, 2020)
 
-BUGFIX:
+BUG FIXES:
 
  * Using `agent: http://vault_or_consul_agent:port>` was not properly taken into account in some endpoints
 
@@ -47,7 +84,7 @@ NEW FEATURES:
 
 ## 1.25.2 (February 29, 2020)
 
-BUGFIX:
+BUG FIXES:
 
  * Update rake to 12.3.3 to fix [CVE-2020-8130](https://github.com/advisories/GHSA-jppv-gw3r-w3q8)
 
@@ -66,7 +103,7 @@ NEW FEATURES:
 
 ## 1.24.1 (February 19, 2020)
 
-BUGFIX:
+BUG FIXES:
 
  * Properly set service meta in node meta decorator
 
@@ -83,7 +120,7 @@ NEW FEATURES:
  * Implementation of #59 - implementation of `--retry` and `--vault-retry` new flags
    Those flags work in a similar way as in consul-template: stop program after X failures
    of consul or vault endpoints
- * Added --fail-fast that stop the programs immediately if vault or consul are not available
+ * Added `--fail-fast` that stop the programs immediately if vault or consul are not available
    at startup (also works with `--once`)
 
 ## 1.22.0 (January 17, 2020)
@@ -94,7 +131,7 @@ NEW FEATURES:
 
 ## 1.21.8 (January 2, 2020)
 
-BUGFIX:
+BUG FIXES:
 
  * Escape properly metadata containing double quotes in prometheus exporter
 
@@ -108,13 +145,13 @@ IMPROVEMENTS:
 
 IMPROVEMENTS:
 
- * Added node_meta_info for serviceInstanceDecorator and serviceMetaDecorator
+ * Added `node_meta_info` for `serviceInstanceDecorator` and `serviceMetaDecorator` in Consul-UI
 
 ## 1.21.5 (December 6, 2019)
 
 NEW FEATURES:
 
- * Added clean() method in nodes.js to allow nexw behaviors
+ * Added `clean()` method in nodes.js to allow new behaviors
 
 ## 1.21.4 (November 28, 2019)
 
@@ -145,7 +182,7 @@ IMPROVEMENTS:
 ## 1.21.0 (November 21, 2019)
 
 * added function `templates` to list all templates being rendered
-* added support for JS decorators in consul-ui (thanks to @Thib17)
+* added support for JS decorators in consul-ui (thanks to [@Thib17](https://github.com/Thib17))
 
 ## 1.20.0 (October 16, 2019)
 
@@ -164,7 +201,7 @@ NEW FEATURES:
 
 * Added new function `checks_for_node`
 
-BUGFIXs:
+BUG FIXES:
 
 * Avoid try publishing several times Gem on rubygems.org
 
@@ -186,13 +223,13 @@ IMPROVEMENTS:
 
 ## 1.18.3 (September 2, 2019)
 
-BUGFIX:
+BUG FIXES:
 
 * When vault receives at timeout, correctly reschedule it
 
 ## 1.18.2 (August 28,  2019)
 
-BUGFIX:
+BUG FIXES:
 
 * In Consul UI, showing data from KV with markup was not properly handled
 
@@ -208,7 +245,7 @@ Support any request method for remote_resource.as_json (#41)
 
 ## 1.18.1 (July 27, 2019)
 
-BUGFIX:
+BUG FIXES:
 
 Fixed wrong lazy initialization in `remote_resource.as_json` that
 cause too many connections to be opened.
@@ -217,13 +254,13 @@ cause too many connections to be opened.
 
 NEW FEATURES:
 
- * Support for `remote_resource` provided by @kamaradclimber
+ * Support for `remote_resource` provided by [@kamaradclimber](https://github.com/kamaradclimber)
  * Added support for `remote_resource.as_json` to fetch JSON remote resource from a web server
  * Added `samples/list_ruby_versions_from_rubygems.txt.erb` to demonstrate usage
 
 ## 1.17.3 (July 18, 2019)
 
-BUGFIX:
+BUG FIXES:
 
  * Added gem parallel as a dependency to allow `samples/prometheus_consul_coordinates.erb`
    to work properly
@@ -348,7 +385,7 @@ NEW FEATURES:
 
 ## 1.10.1 (February 28, 2019)
 
-BUGFIX:
+BUG FIXES:
 
  * Ensure that timeline sort properly events when healthchecks are removed (eg: maintenance)
 
@@ -371,7 +408,7 @@ IMPROVEMENTS:
 
 ## 1.9.8 (January 16, 2019)
 
-BUGFIX:
+BUG FIXES:
 
  * When default value was the same as real value, endpoints were always marked as
    dirty, thus rendering of templates did never succeed.
@@ -387,7 +424,7 @@ IMPROVEMENTS:
 
 ## 1.9.6 (January 15, 2019)
 
-BUGFIX:
+BUG FIXES:
 
  * Keep connections open properly as it increase timeouts on Consul servers on
    very large templates
@@ -398,7 +435,7 @@ IMPROVEMENTS:
 
 ## 1.9.5 (January 14, 2019)
 
-BUGFIX:
+BUG FIXES:
 
  * Ensure to always re-open Connection to Consul agent in case of network error
 
@@ -448,11 +485,11 @@ IMPROVEMENTS:
 
 OPTIMIZATIONS:
 
- * Better network issue because of X-Consul-Index parsing bug
+ * Better network usage because of X-Consul-Index parsing bug
 
-NEW FEATURES:
+BUG FIXES:
 
- * value.endpoint.x_consul_index now works as expected
+ * `value.endpoint.x_consul_index` now works as expected
 
 IMPROVEMENTS:
 
@@ -492,7 +529,7 @@ NEW FEATURES:
 
 ## 1.8.1 (December 12, 2018)
 
-BUGFIX:
+BUG FIXES:
 
  * Properly fill `template_info` strtucture when hot reload is performed so templates using
    `template_info()` new function can behave nicely.
@@ -601,8 +638,8 @@ IMPROVEMENTS:
  * [Prometheus template](samples/metrics.erb) to export easily Consul
    informations about nodes, datacenters and all services states
  * Code style cleanup + travis now enforces Rubocop
- * Remove criteo references in spec files thanks to @pierrecdn
- * Bitrate display more consistent thanks to @pierrecdn
+ * Remove criteo references in spec files thanks to [@pierrecdn](https://github.com/pierrecdn)
+ * Bitrate display more consistent thanks to [@pierrecdn](https://github.com/pierrecdn)
 
 ## 1.5.3 (September 24, 2018)
 

data/README.md

@@ -165,9 +165,19 @@ USAGE: consul-templaterb [[options]]
     -f, --[no-]fail-fast             If consul/vault endpoints fail at startup, fail immediately
     -g, --no-gzip-compression        Disable GZIP compression in HTTP requests
     -c, --consul-addr=<address>      Address of Consul, eg: http://localhost:8500
+        --consul-cert-chain=<path/to/cert_chain>
+                                     Path to Consul TLS client certificate chain to use
+        --consul-private-key=<path/to/private_key>
+                                     Path to Consul TLS client private key to use
+        --skip-consul-verify-tls     Skip verifying Consul TLS via certificate authority (DANGEROUS)
     -l, --log-level=<log_level>      Log level, default=info, any of none|error|info|debug
         --consul-token=<token>       Use a token to connect to Consul
     -V, --vault-addr=<address>       Address of Vault, eg: http://localhost:8200
+        --vault-cert-chain=<path/to/cert_chain>
+                                     Path to Vault TLS client certificate chain to use
+        --vault-private-key=<path/to/private_key>
+                                     Path to Vault TLS client private key to use
+        --skip-vault-verify-tls      Skip verifying Vault TLS via certificate authority (DANGEROUS)
         --vault-token=<token>        Token used to authenticate against vault.
         --[no-]vault-renew           Control auto-renewal of the Vault token. Default: activated
         --vault-retry, --vault-retry-attempts [RETRIES]
@@ -178,10 +188,11 @@ USAGE: consul-templaterb [[options]]
     -r, --retry-delay=<min_duration> Min Retry delay on Error/Missing Consul Index
     -k, --hot-reload=<behavior>      Control hot reload behaviour, one of :[die (kill daemon on hot reload failure), keep (on error, keep running), disable (hot reload disabled)]
     -K, --sig-term=kill_signal       Signal to send to next --exec command on kill, default=TERM
+    -M, --debug-memory-usage         Display messages when RAM grows
     -T, --trim-mode=trim_mode        ERB Trim mode to use (- by default)
     -R, --sig-reload=reload_signal   Signal to send to next --exec command on reload (NONE supported), default=HUP
-    -M, --debug-memory-usage         Display messages when RAM grows
-    -e, --exec=<command>             Execute the following command
+    -W, --wait-signal=min_duration   Wait at least n seconds before each reload signal being sent to next --exec process
+    -e, --exec=<command>             Execute the following command in as a subprocess when all templates are ready
     -d, --debug-network-usage        Debug the network usage
     -t erb_file:[output]:[command]:[params_file],
         --template                   Add a erb template, its output and optional reload command
@@ -235,7 +246,11 @@ nor write the file.
 Signals can be customized per process. Two signals are supported with options `--sig-reload` and
 `--sig-term`. When the option is added, the next `--exec` options to start a process will use the
 given signal. By default, HUP will be sent to reload events (you can use NONE to avoid sending any
-reload signal), TERM will be used when leaving consul-templaterb.
+reload signal), TERM will be used when leaving consul-templaterb. A minimum duration between reload
+signals can be specified for each sub process by prepending `--wait-signal=min_duration` to `--exec`
+command.
+In such case, the signal will be sent every `min_duration` as a maximum (very useful for templates
+changing a lot, but you don't want to trigger too many reloads, for instance for a load-balancer).
 
 ### Bandwidth limitation
 

data/TemplateAPI.md

@@ -388,7 +388,7 @@ name or its ID. If DC is specified, will lookup for given node in another datace
 
 [Find all the checks](https://www.consul.io/api/health.html#list-checks-for-service) of a given service.
 
-## def checks_in_state(check_state, dc: nil, [agent: consul_agent_address])
+## checks_in_state(check_state, dc: nil, [agent: consul_agent_address])
 
 [Find all the checks in a given state](https://www.consul.io/api-docs/health#list-checks-in-state) in the whole cluster.
 

data/bin/consul-templaterb

@@ -94,6 +94,7 @@ consul_engine = Consul::Async::ConsulTemplateEngine.new
 @programs = {}
 cur_sig_reload = 'HUP'.freeze
 cur_sig_term = 'TERM'.freeze
+cur_min_duration_between_signals = 1
 
 optparse = OptionParser.new do |opts|
   opts.banner = usage_text
@@ -215,6 +216,10 @@ optparse = OptionParser.new do |opts|
     cur_sig_term = compute_signal(sig, nil)
   end
 
+  opts.on('-M', '--debug-memory-usage', 'Display messages when RAM grows') do
+    consul_engine.debug_memory = true
+  end
+
   opts.on('-T', '--trim-mode=trim_mode', String,
           "ERB Trim mode to use (#{options[:erb][:trim_mode]} by default)") do |trim_mode|
     options[:erb][:trim_mode] = trim_mode
@@ -225,25 +230,36 @@ optparse = OptionParser.new do |opts|
     cur_sig_reload = compute_signal(sig, 'NONE')
   end
 
-  opts.on('-M', '--debug-memory-usage', 'Display messages when RAM grows') do
-    consul_engine.debug_memory = true
+  opts.on('-W', '--wait-signal=min_duration', Float, 'Wait at least n seconds before each reload signal being sent to next --exec process') do |min_duration|
+    raise "-wait-between-reload-signal=#{min_duration} must be greater than 0" unless min_duration.positive?
+
+    cur_min_duration_between_signals = min_duration
   end
 
-  opts.on('-e', '--exec=<command>', String, 'Execute the following command') do |cmd|
+  opts.on('-e', '--exec=<command>', String, 'Execute the following command in as a subprocess when all templates are ready') do |cmd|
     sig_reload = cur_sig_reload
     sig_term = cur_sig_term
+    sig_min_interval = cur_min_duration_between_signals
     consul_engine.add_template_callback do |all_ready, template_manager, results|
       if all_ready
         modified = results.any?(&:modified)
         if @programs[cmd].nil?
-          warn "[EXEC] Starting process: #{cmd}... on_reload=#{sig_reload || 'NONE'} on_term=#{sig_term}"
+          warn "[EXEC] Starting process: #{cmd}... on_reload=#{sig_reload || 'NONE'} on_term=#{sig_term}, delay between reloads=#{sig_min_interval}s"
           @programs[cmd] = Consul::Async::ProcessHandler.new(cmd, sig_reload: sig_reload, sig_term: sig_term)
           @programs[cmd].start
         else
+
           # At least one template has been modified
-          @programs[cmd].reload if modified
+          process_to_reload = @programs[cmd]
+          if modified && !process_to_reload.reload_scheduled
+            process_to_reload.reload_scheduled = true
+            now = Time.now
+            delay = sig_min_interval - (now - @programs[cmd].last_signal_sent)
+            delay = 0 if delay.negative?
+            EventMachine.add_timer(delay) { process_to_reload.reload }
+          end
           begin
-            @programs[cmd].process_status
+            process_to_reload.process_status
           rescue Consul::Async::ProcessDoesNotExist => e
             warn "[FATAL] The process is dead, aborting run: #{e.inspect}"
             template_manager.terminate

data/lib/consul/async/consul_template.rb

@@ -31,7 +31,8 @@ module Consul
 
       def as_json(url, default_value, refresh_delay_secs: 10, **opts)
         conf = JSONConfiguration.new(url: url, min_duration: refresh_delay_secs, retry_on_non_diff: refresh_delay_secs, **opts)
-        @endp_manager.create_if_missing(url, {}) do
+        endpoint_id = url + opts.to_json
+        @endp_manager.create_if_missing(url, {}, endpoint_id: endpoint_id) do
           if default_value.is_a?(Array)
             ConsulTemplateJSONArray.new(JSONEndpoint.new(conf, url, default_value))
           else
@@ -394,16 +395,21 @@ module Consul
         VaultEndpoint.new(vault_conf, path, :POST, {}, {})
       end
 
-      def create_if_missing(path, query_params, fail_fast_errors: @fail_fast_errors, max_consecutive_errors_on_endpoint: @max_consecutive_errors_on_endpoint, agent: nil)
-        fqdn = path.dup
-        query_params.each_pair do |k, v|
-          fqdn = "#{agent}#{fqdn}&#{k}=#{v}"
-        end
-        tpl = @endpoints[fqdn]
+      def create_if_missing(path, query_params, fail_fast_errors: @fail_fast_errors,
+                            max_consecutive_errors_on_endpoint: @max_consecutive_errors_on_endpoint,
+                            agent: nil, endpoint_id: nil)
+        endpoint_id ||= begin
+                          fqdn = path.dup
+                          query_params.each_pair do |k, v|
+                            fqdn = "#{agent}#{fqdn}&#{k}=#{v}"
+                          end
+                          fqdn
+                        end
+        tpl = @endpoints[endpoint_id]
         unless tpl
           tpl = yield
           ::Consul::Async::Debug.print_debug "path #{path.ljust(64)} #{query_params.inspect}\r"
-          @endpoints[fqdn] = tpl
+          @endpoints[endpoint_id] = tpl
           tpl.endpoint.on_response do |result|
             @net_info[:success] += 1
             @net_info[:bytes_read] += result.data.bytesize

data/lib/consul/async/consul_template_render.rb

@@ -59,7 +59,7 @@ module Consul
         return false unless new_template != @template
 
         # We render to ensure the template is valid
-        render(new_template, current_template_info)
+        render(new_template, current_template_info: current_template_info)
         @template = new_template.freeze
         true
       end

data/lib/consul/async/process_handler.rb

@@ -7,7 +7,8 @@ module Consul
     # Handle the full lifecycle of a process and allows to forward
     # Posix signals to child process when needed.
     class ProcessHandler
-      attr_reader :command, :sig_reload, :sig_term, :pid, :exit_status
+      attr_reader :command, :sig_reload, :sig_term, :pid, :exit_status, :last_signal_sent, :reload_scheduled
+      attr_writer :reload_scheduled
       def initialize(command, sig_reload: 'HUP', sig_term: 'TERM')
         raise 'empty sig_term is not supported' unless sig_term
 
@@ -16,18 +17,23 @@ module Consul
         @sig_term = sig_term
         @pid = nil
         @exit_status = nil
+        @last_signal_sent = Time.now
+        @reload_scheduled = false
       end
 
       def start
         return pid unless pid.nil?
 
         @pid = Process.spawn(command)
+        @last_signal_sent = Time.now
       end
 
       def reload
         return if sig_reload.nil?
 
+        @last_signal_sent = Time.now
         warn "Sending SIG #{sig_reload} to #{pid}..."
+        @reload_scheduled = false
         begin
           Process.kill(sig_reload, pid)
         rescue Errno::ESRCH => e