consul-templaterb 1.27.2 → 1.30.0

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.27.2'.freeze
+    VERSION = '1.30.0'.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/decorators.js.erb

@@ -36,6 +36,13 @@ function usefullLinksGenerator(instance, serviceName, node_meta_info) {
     return top;
 }
 
+/**
+ * createNodeDisplayElement resolves and displays the node name.
+ */
+function createNodeDisplayElement(nodeName, nodemeta) {
+  return document.createTextNode(nodeName);
+}
+
 /**
  * serviceInstanceDecorator is called to decorate an instance.
  */

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

@@ -71,7 +71,7 @@ class NodeMainSelector extends MainSelector {
         content.setAttribute('class', 'instance-content');
         var contentHead = document.createElement('div');
         contentHead.setAttribute('class', 'instance-content-header');
-        contentHead.appendChild(nodeNameGenator(node['Node']['Name'], node['Node']['Address']));
+        contentHead.appendChild(nodeNameGenator(node['Node']));
         contentHead.appendChild(nodeAddressGenator(node['Node']['Address']));
         contentHead.appendChild(nodeMetaGenerator(node['Node']['Meta']));
         content.appendChild(contentHead);

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

@@ -304,8 +304,8 @@ class ServiceMainSelector extends MainSelector {
         element.setAttribute("class", "list-group-item service-instance");
         var state = nodeState(instance.checks);
         element.appendChild(weightsGenerator(instance.weights, state));
-        element.appendChild(serviceTitleGenerator(instance));
         var node_info = this.nodes[instance.name];
+        element.appendChild(serviceTitleGenerator(instance, serviceName, node_info));
         if (node_info != null) {
             node_info = node_info.meta;
             element.appendChild(nodeMetaGenerator(node_info, instance.sMeta));

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

@@ -63,7 +63,7 @@ function nodeState(checks) {
 
 supported_protocols = ['https', 'http', 'sftp', 'ftp', 'ssh', 'telnet']
 
-function serviceTitleGenerator(instance, serviceName) {
+function serviceTitleGenerator(instance, serviceName, node_info) {
     var protocol = null;
     for (i in supported_protocols) {
         var protoc = supported_protocols[i]
@@ -86,7 +86,10 @@ function serviceTitleGenerator(instance, serviceName) {
         instanceLink.setAttribute('target', '_blank');
     }
 
-    instanceLink.appendChild(document.createTextNode(instance.name + appendPort));
+    var nodemeta = (node_info != null) ? node_info.meta : null; 
+    instanceLink.appendChild(createNodeDisplayElement(instance.name, nodemeta));
+    instanceLink.appendChild(document.createTextNode(appendPort));
+
     const nodeInfo = document.createElement('a');
     nodeInfo.appendChild(document.createTextNode('\u24D8'));
     nodeInfo.setAttribute('title', 'Click to see details of Node: ' + instance.name +
@@ -103,7 +106,7 @@ function serviceTitleGenerator(instance, serviceName) {
     return htmlTitle;
 }
 
-function nodeNameGenator(nodename, nodeaddr) {
+function nodeNameGenator(node) {
     var protocol = 'ssh://'
 
     var htmlTitle = document.createElement('h5');
@@ -111,10 +114,10 @@ function nodeNameGenator(nodename, nodeaddr) {
     var instanceLink = document.createElement('a');
     instanceLink.setAttribute('class', 'instance-name');
     if (protocol != null) {
-        instanceLink.setAttribute('href', protocol + nodeaddr);
+        instanceLink.setAttribute('href', protocol + node['Address']);
         instanceLink.setAttribute('target', '_blank');
     }
-    instanceLink.appendChild(document.createTextNode(nodename));
+    instanceLink.appendChild(createNodeDisplayElement(node['Name'], node['Meta']));
     htmlTitle.appendChild(instanceLink);
 
     return htmlTitle;

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.27.2
+  version: 1.30.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,58 +98,58 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rubocop-junit-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: A ruby implementation of Consul Template with support of erb templating
   with hi-performance on large clusters and advanced process management features.
 email:
@@ -162,28 +162,10 @@ extra_rdoc_files:
 - CHANGELOG.md
 - TemplateAPI.md
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby_app"
-- ".travis.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Dockerfile
-- Gemfile
-- INTERNALS.md
-- LICENSE.txt
 - README.md
-- Rakefile
 - TemplateAPI.md
 - bin/consul-templaterb
-- consul-templaterb.gemspec
-- docker-nginx-conf/nginx.conf
-- docs/article-06_Template-based_discovery_with_consul-templaterb.md
-- docs/images/consul-templaterb.png
-- docs/images/consul-templaterb.svg
-- docs/images/consul-ui_001.png
 - lib/consul/async/consul_endpoint.rb
 - lib/consul/async/consul_template.rb
 - lib/consul/async/consul_template_engine.rb
@@ -199,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
@@ -252,7 +235,7 @@ files:
 - samples/vault-ldap.txt.erb
 homepage: https://rubygems.org/gems/consul-templaterb
 licenses:
-- Apache v2
+- Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/criteo/consul-templaterb/issues
   changelog_uri: https://github.com/criteo/consul-templaterb/blob/master/CHANGELOG.md

data/.gitignore

@@ -1,41 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/samples/**/*.json
-/samples/**/*.xml
-/samples/**/*.html
-/samples/**/*.txt
-/samples/**/*.cfg
-samples/consul-ui/decorators.js
-/samples/hosts
-/samples/hosts_per_services
-/samples/prometheus_consul_coordinates
-/samples/ready
-/samples/render_template_from_kv
-/samples/consul_template
-/samples/metrics
-/samples/service_checks_metrics
-/samples/find_blocked_choregraphies
-/spec/consul/async/resources/templates/*.txt
-/spec/consul/async/resources/templates/*.result
-/out.txt
-
-# rspec failure tracking
-.rspec_status
-# Mac OS
-.DS_Store
-
-# IntelliJ project files
-*.iml
-*.iws
-*.ipr
-.idea/
-
-# Misc
-*.swp

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.rubocop.yml

@@ -1,57 +0,0 @@
-AllCops:
-  Exclude:
-    - bundle/**/*
-  TargetRubyVersion: 2.4
-
-Layout/LineLength:
-  Max: 175
-
-Metrics/AbcSize:
-  Max: 87
-
-Metrics/BlockLength:
-  Max: 182
-
-Metrics/BlockNesting:
-  Max: 4
-
-Metrics/ClassLength:
-  Max: 285
-
-Metrics/CyclomaticComplexity:
-  Max: 21
-
-Metrics/MethodLength:
-  Max: 68
-
-Metrics/ParameterLists:
-  Max: 18
-
-Metrics/PerceivedComplexity:
-  Max: 24
-
-# We use `dc` as a parameter in many methods
-Naming/MethodParameterName:
-  Enabled: false
-
-Naming/VariableNumber:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: true
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/MultilineBlockChain:
-  Enabled: false
-

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-rvm:
-- 2.4.10
-- 2.5.8
-- 2.6.6
-- 2.7.1
-jobs:
-  include:
-    - stage: Gem release
-      rvm: 2.5.8
-      script: echo "Publishing consul-templaterb on rubygems.org ..."
-      deploy:
-        provider: rubygems
-        api_key:
-          secure: l78H6Ow9HCeEz0hcAP2XCXaGGBNRXZ/QLFPNzwyNmHToko9WqZj6mbiNIcVwZ8aCcZEzFmtcB7m1lC1l+mvot3Snfh4OUErK7EXMLiNxUWybtA4qJqmsb2J8JGS69pTohPKagi1YyRbyVs2tJpM5OVazcNxEQDAVkWVxJuPVz6tsn4rXZsL77nTSVyB6YGKgguRGhtS/3M0ufk1ymOpuk8pxXKaotlYGRXmht2OHW+FDQczTMgqu6jiZubjWlNHVxtYn+CsLYNj1BswzD6fF1uous6nchV0if2QW5N4OJVyZCx3yEQ0RswfI8G1kG/Jm8wd2lSknY2wpnd1qkRnAcFlKBpUv8aQd6SdbSO84GTAOvucgK7Mcf0LRvYSE2FyagaAPFSfMybWd+GS26g5AuRPpkhtsS9ijfdIzpudiF18pvnJ+wQj+hWM/THWowYNyKv9NeckxdrULaHPisA346r5eM/EADOhyEUtPm11PFgcheGjff1H4qXGc9gcm50u6mNNHkWv38oGhAPpRk/bU7qybTKqRKNGWGP0MiT4WVIFXp62/JMY7AmufOdJx5Ca5JVsaWoN4fsS9r3+R+FxvRtV9NOrRJVKKaQhzi4UHEUDQ2hQjpLDijD5L0vUsl6arl+nufTt5G5jp9QvdY7fhYT1mpGgWj0hTBd8Pxsl3N8U=
-        gem: consul-templaterb
-        on:
-          tags: true
-          repo: criteo/consul-templaterb