consul-templaterb 1.26.1 → 1.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91552da1b0e2061c69095c958665896efc6de84ae6c5374a1b66d1c9550a3297
-  data.tar.gz: 8bdf67de550a4e2cb7d621ccad117e1e0841b3a0a49bcefb5c914e63daeddb41
+  metadata.gz: fc35b5803af2e05001323f77e18be90ec85baa05dd621030a83127cf1b5fd9f1
+  data.tar.gz: f7d3e25054dcd6c1b022e5c4bf58ea902c5c95676aafa936512659eaec3de9a1
 SHA512:
-  metadata.gz: 24a9e291106b8e32ddef2bdc3d5e87ded36122c84dd1f0547fb034410d606609dd0041d011cd4eeb58da7b38a579888fb5901e877814d49926ef7a0722020d15
-  data.tar.gz: d3b1b5578cfdc3ee7c594916fc53e22692506d1bc0faaafd91ca21891665732528e95a384766548c90c75bcec0b515f856d1236ffbd18572911363d6ab8f836b
+  metadata.gz: e1e053e41716e64177917ef8a3ef1360ba82995758bb7dacfafd3bc7fb7a8f5774f107c62cbb7c4340189ea59cab15db936fc27854f6fab1ba487466ad0add3f
+  data.tar.gz: 95c0584f456239478395ceb0d2678e2ec1c7165f2148371f272ab23780148ed6498f419bc8104933d14cd155fcf20403c2b66521e604a3d2f4232bb8373f69c2

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## (UNRELEASED)
 
+NEW FEATURES:
+
+## 1.26.2 (April 15, 2020)
+
+BUGFIX:
+
+ * Fixed broken Dockerfile (was missing the new `decorator.js.erb` file). Fixes #61 (Thanks to @ simongareste)
+
+NEW FEATURES:
+
+ * Added `consul_members_count` metric in [samples/metrics.erb](samples/metrics.erb)
+
 ## 1.26.1 (March 27, 2020)
 
 BUGFIX:

data/Dockerfile

@@ -12,4 +12,4 @@ ENV LANG C.UTF-8
 ENV CONSUL_HTTP_ADDR http://consul-relay.service.consul.preprod.crto.in:8500
 
 ENTRYPOINT ["/usr/local/bin/bundle", "exec", "consul-templaterb"]
-CMD ["--template", "samples/consul-ui/consul-keys-ui.html.erb", "--template", "samples/consul-ui/consul-nodes-ui.html.erb", "--template", "samples/consul-ui/consul-services-ui.html.erb", "--template", "samples/consul-ui/consul-timeline-ui.html.erb", "--template", "samples/consul-ui/consul_keys.json.erb", "--template", "samples/consul-ui/consul_nodes.json.erb", "--template", "samples/consul-ui/consul_services.json.erb", "--template", "samples/consul-ui/timeline.json.erb", "--template", "samples/consul-ui/consul-services-ui.html.erb:samples/consul-ui/index.html:touch samples/consul-ui/ready", "--sig-reload=NONE", "--exec=nginx -c /usr/src/app/docker-nginx-conf/nginx.conf"]
+CMD ["--template", "samples/consul-ui/consul-keys-ui.html.erb", "--template", "samples/consul-ui/decorators.js.erb", "--template", "samples/consul-ui/consul-nodes-ui.html.erb", "--template", "samples/consul-ui/consul-services-ui.html.erb", "--template", "samples/consul-ui/consul-timeline-ui.html.erb", "--template", "samples/consul-ui/consul_keys.json.erb", "--template", "samples/consul-ui/consul_nodes.json.erb", "--template", "samples/consul-ui/consul_services.json.erb", "--template", "samples/consul-ui/timeline.json.erb", "--template", "samples/consul-ui/consul-services-ui.html.erb:samples/consul-ui/index.html:touch samples/consul-ui/ready", "--sig-reload=NONE", "--exec=nginx -c /usr/src/app/docker-nginx-conf/nginx.conf"]

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.26.1'.freeze
+    VERSION = '1.26.2'.freeze
   end
 end

data/samples/consul-ui/README.md

@@ -50,6 +50,25 @@ The content is statically created, so you can serve it using any HTTP server ver
 For development, you might use `python -m SimpleHTTPServer` in order to server the result
 on your browser.
 
+### Running it in production
+
+Whatever your solution, be sure to have a index.html, so read next below on
+how generating an index.html.
+
+#### Running with web server
+
+You can run it with your favoite web server, at Criteo we run it with nginx
+which handles nicely cache and offer good performance.
+
+In that case, consul-templaterb can start nginx with `--exec` or you can run it
+as a daemon, in which case, consul-templaterb only generate the files.
+
+#### Run it in Consul
+
+You can run consul with `-ui-dir=/path/to/directory/of/consul-ui`, in such case
+reaching consul on poort 8500 will redirect to the /ui/ path, displaying the UI
+of your choice on http://consul-agent.example.org:8500/ui/.
+
 ### Generating index.html
 
 By default, the command `consul-templaterb -c http://localhost:8500 samples/consul-ui/*.erb``

data/samples/find_nodes_in_catalog_but_not_in_members.json.erb

@@ -0,0 +1,28 @@
+<%= 
+   all_catalog = nodes.map{ |n| [n['Node'], n] }.to_h
+   all_members = agent_members.sort{ |a,b| a['Name'] <=> b['Name'] }
+   members_by_state = {}
+   all_members.each do |m|
+     state = m.status
+     members = members_by_state[state] || 0
+     members_by_state[state] = members + 1
+   end
+   # Find all virtual nodes (eg: k8s-sync)
+   catalog_external_sources = nodes.select{|n| (n['Meta']||{})['external-source'] }.map{|n| n['Node']}
+   in_catalog_but_not_in_members = all_catalog.keys - all_members.map{ |m| m['Name'] }
+   not_virtual_not_in_members = in_catalog_but_not_in_members - catalog_external_sources
+   JSON.pretty_generate(
+    {
+      'stats' => {
+        'catalog' => all_catalog.count,
+        'catalog_virtual' => in_catalog_but_not_in_members.count,
+        'members' => all_members.count,
+        'members_by_state': members_by_state,
+        'catalog_external_sources' => catalog_external_sources,
+      },
+      'errors': {
+        'in_catalog_but_not_in_members' => in_catalog_but_not_in_members,
+        'not_virtual_not_in_members'    =>  not_virtual_not_in_members,
+      }
+   })
+%>

data/samples/metrics.erb

@@ -21,6 +21,20 @@
   all_stats = {}
   service_count = 0
 
+  statuses = agent_members().map {|m| m.status}.reduce({}) do |sum, s|
+    v = sum[s] || 0
+    sum[s] = v + 1
+    sum
+  end
+%>
+# HELP consul_members_count A gauge of number of serf members with their count and their status('alive', 'leaving', 'left', 'failed')
+# TYPE consul_members_count gauge
+<%
+  statuses.each do |k, v|
+%>
+consul_members_count{serf="lan",status="<%= k %>"} <%= v %><%
+  end
+
   services(tag: service_tag_filter).each do |service_name, tags|
     if !services_blacklist.any? {|r| r.match(service_name)} && (instance_must_tag.nil? || tags.include?(instance_must_tag))
       service_count += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.26.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -230,6 +230,7 @@ files:
 - samples/debug/compare_connect_services.txt.erb
 - samples/demos/compute_pricing.txt.erb
 - samples/find_all_invalid_dns_labels.json.erb
+- samples/find_nodes_in_catalog_but_not_in_members.json.erb
 - samples/ha_proxy.cfg.erb
 - samples/haproxy_dns.cfg.erb
 - samples/hosts.erb