RubyGems - consul-templaterb - Versions diffs - 1.8.1 → 1.8.2 - Mend

consul-templaterb 1.8.1 → 1.8.2

Files changed (10) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +6 -0
data/lib/consul/async/version.rb +1 -1
data/samples/consul-ui/README.md +11 -2
data/samples/consul-ui/common/header.html.erb +4 -1
data/samples/consul-ui/consul-timeline-ui.html.erb +60 -0
data/samples/consul-ui/js/service.js +2 -1
data/samples/consul-ui/js/timeline.js +334 -0
data/samples/consul-ui/timeline.json.erb +188 -0
metadata +6 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4575bd9573abe22918149095549c1942aba92f447bc57c9bf466e3f4e692955f
-  data.tar.gz: e0f1daefa7fd071b16becceeb955acbf465a8c63f09a787161ea26786342be5e
+  metadata.gz: 6d652b0259f34bd70784ebdfbfe18e042bb48bdd03af5f5d920a71b94bb1281d
+  data.tar.gz: 00116db5cf7b2f11516abb912aab335c2608ec01fdf9ba527f11deb9bc861755
 SHA512:
-  metadata.gz: d06c13276838fc70fd31beeac8875b89f9b80b9efde59614be9b6b0f272e8fba819ef40424ff3b6f0a300f1f17eb719f16b66dd697b86193e3a3c7b92ea79a11
-  data.tar.gz: 4664f4a357a97d5f3047a328aa4907b08d4dab11d570a961cde0e51d0ac4453649ddb97d76cda113509e93ed43f99c96f69b86d50872d1ab38e2285a811e0f60
+  metadata.gz: c53f3a2704b5b52b3febb4c4844c36dae660b163d1de8298acde2f88c0cb9b9e65bc202d35c160d0747b3624bfa1355c0e014ef58e2d31673a5b40d17b0d8847
+  data.tar.gz: bc16ad7b30485b403c19d01251c87ffa66d17b937b09affdf2c74470455283d5121b95909524ec703d29239efe97b626f7e0c70bb34090a04bab69ad224a176c

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,12 @@
 ## (UNRELEASED)
+## 1.8.2 (December 18, 2018)
+NEW FEATURES:
+ * Added Consul timeline that displays all the changes on services in Consul UI.
 ## 1.8.1 (December 12, 2018)
 BUGFIX:

data/lib/consul/async/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.8.1'.freeze
+    VERSION = '1.8.2'.freeze
   end
 end

data/samples/consul-ui/README.md CHANGED Viewed

@@ -4,6 +4,14 @@ A simple HTML5 app that displays all services within Consul with AJAX requests.
 It supports fitering based on tags and does not rely on Consul to display pages,
 meaning that it can be scaled horizontally without any troubles with Consul.
+## Features
+* List all services details, with very fast lookups.
+* `consul-timeline-ui.html` Let you see all changes applied to your services with history
+* List all keys
+* List all nodes
+* List datacenters
 ## Is it prod ready?
 This application is used for several months within Criteo to replace Consul native interface and
@@ -44,8 +52,8 @@ instead. Example:
 ```shell
 consul-templaterb -c http://localhost:8500 \
-  --template samples/consul-ui/consul-services-ui.html:samples/consul-ui/index.html \
-  samples/consul-ui/consul_template.json.erb
+  --template samples/consul-ui/consul-services-ui.html.erb:samples/consul-ui/index.html \
+  samples/consul-ui/*.erb
 ```
 Will generate index.html and consul_template.json in your directory, so you might serve it directly.
@@ -58,3 +66,4 @@ This app supports the following environment variables:
 * INSTANCE_MUST_TAG: Second level of filtering (optional, default to SERVICES_TAG_FILTER)
 * INSTANCE_EXCLUDE_TAG: Exclude instances having the given tag (default: canary)
 * EXCLUDE_SERVICES: comma-separated services to exclude (default: consul-agent-http,mesos-slave,mesos-agent-watcher)
+* CONSUL_TIMELINE_BUFFER: number of entries to keep in the timeline. 1000 by default.

data/samples/consul-ui/common/header.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
   # CONSUL_TOOLS_SUFFIX: suffix for the address of consul tools
   # CONSUL_TOOLS_PREFIX: prefix for the address of consul tools
   # CONSUL_TOOLS: comma sperated list of consul tools
-  tools = (ENV['CONSUL_TOOLS'] || 'services,nodes,keys').split(",")
+  tools = (ENV['CONSUL_TOOLS'] || 'services,nodes,keys,timeline').split(",")
   tools_suffix = ENV['CONSUL_TOOLS_PREFIX'] || '-ui.html'
   tools_prefix = ENV['CONSUL_TOOLS_SUFFIX'] || 'consul-'
@@ -38,6 +38,9 @@
     <style id="css-states">
       .service-tags { display: none; }
     </style>
+    <style id="serviceCol">
+      .service-tags { display: none; }
+    </style>
   </head>
   <body>
     <nav class="navbar navbar-expand-md navbar-dark bg-secondary">

data/samples/consul-ui/consul-timeline-ui.html.erb ADDED Viewed

@@ -0,0 +1,60 @@
+<% datasource = ENV['TIMELINE_DATASOURCE'] || 'timeline.json'
+   # Time to wait before reloading configuration again in seconds (0 = never)
+   refresh = ENV['REFRESH'] || '3600' %><%= render_file('common/header.html.erb', title: 'Services Timeline') %>
+    <div class="main">
+      <div class="row mx-0">
+        <div id="filter-menu" class="col-2 col-m-3 px-4 pt-4">
+          <div class="form-group">
+            <div class="input-group">
+              <input id="service-filter" type="text" placeholder="filter instances" class="form-control" />
+              <div class="input-group-append">
+                <span class="input-group-text" id="service-counter"></span>
+              </div>
+            </div>
+          </div>
+          <div id="service-wrapper" >
+            <ul id="service-list" class="list-group">
+            <li onfocus="serviceTimeline.selectService(this)" onclick="serviceTimeline.selectService(this)" value="" class="serviceListItem list-group-item list-group-item-actionn active" id="anyService"><div class="statuses float-right"><span class="lookup badge badge-pill badge-dark">1000</span></div><div class="service-name">All</div></li>
+            </ul>
+          </div>
+        </div>
+        <div class="col-10 col-m-9">
+          <h2 class="text-center" id="service-title"></h2>
+          <div class="row mb-2">
+            <div class="input-group float-left col-12">
+              <input id="instance-filter" type="text" placeholder="filter nodes by name or tags" class="form-control" />
+            </div>
+          </div>
+          <div id="instances-wrapper">
+            <div id="events-list" class="list-group">
+            <table id="all-events" class="table table-striped table-hover table-sm">
+              <thead class="thead-dark">
+                <tr>
+                  <th scope="col">Time</th>
+                  <th scope="col" class="serviceCol">Service</th>
+                  <th scope="col">Instance</th>
+                  <th scope="col">Check State</th>
+                  <th scope="col">Service&nbsp;Status&nbsp;Change</th>
+                  <th colspan="2" scope="col">Service&nbsp;Instances</th>
+                </tr>
+              </thead>
+              <tbody>
+              </tbody>
+            </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  <!-- Optional JavaScript -->
+  <!-- JavaScript Dependencies: jQuery, Popper.js, Bootstrap JS, Shards JS -->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+  <script src="js/utils.js"></script>
+  <script src="js/timeline.js"></script>
+  <script type="text/javascript">
+    serviceTimeline = new ServiceTimeline('<%= datasource %>','<%= refresh %>');
+  </script>
+  <script src="vendors/highlight/highlight.pack.js"></script>
+  </body>
+</html>

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

@@ -235,7 +235,8 @@ class ConsulService {
   }
   displayService(service) {
-    $("#service-title").html(service['name']);
+    var titleText = service['name'] + ' <a href="consul-timeline-ui.html?service=' + service['name'] + '">timeline</a>';
+    $("#service-title").html(titleText);
     $("#instances-list").html("");
     var serviceStatus = buildServiceStatus(service);

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

@@ -0,0 +1,334 @@
+// strict
+class ServiceTimeline {
+    constructor(ressourceURL, refresh) {
+      this.ressourceURL = ressourceURL;
+      this.fetchRessource();
+      this.serviceList = $("#service-list");
+      this.serviceFilter = $("#service-filter");
+      this.serviceFilter.keyup(this.filterService);
+      this.serviceInstanceFilter = '';
+      this.instanceFilter = $("#instance-filter");
+      this.instanceFilter.keyup(this.doFilter);
+      this.refresh = parseInt(refresh);
+      this.filterStatus = null;
+      this.refreshTimeout = null;
+      this.serviceFilterCounter = $("#service-counter");
+      this.serviceFilterCount = 0;
+      this.services = {}
+      this.presentServices = {}
+      var sT = this;
+    }
+    fetchRessource() {
+        $.ajax({url: this.ressourceURL, cache: false, dataType: "json", sourceObject: this, success: function(result){
+          serviceTimeline.initRessource(result);
+        }});
+    }
+    initRessource(data) {
+        this.data = data;
+        this.reloadTimeline(true);
+    }
+    createServiceDefItem(label, serviceName, counter) {
+        var listItem = document.createElement('li');
+        listItem.setAttribute('onfocus','serviceTimeline.selectService(this, true)');
+        listItem.setAttribute('onclick','serviceTimeline.selectService(this, true)');
+        listItem.setAttribute('value', serviceName);
+        var serviceNameItem = document.createElement('div');
+        serviceNameItem.setAttribute('class', 'service-name');
+        serviceNameItem.appendChild(document.createTextNode(label));
+        listItem.appendChild(serviceNameItem);
+        var listItemClass = 'serviceListItem list-group-item list-group-item-action';
+        listItem.setAttribute('class', listItemClass);
+        var statuses = document.createElement('div');
+        statuses.setAttribute('class','statuses float-right');
+        statuses.appendChild(this.createBadge(counter, 'dark'));
+        listItem.prepend(statuses);
+        return listItem;
+    }
+    reloadTimeline(firstReload) {
+        if (!this.data) {
+          console.log("No data to display");
+        }
+        this.serviceList.html('');
+        this.serviceFilterCount = 0;
+        var servicesPerName = {};
+        var numberOfEvents = this.data.length;
+        for (var i = 0 ; i < numberOfEvents; i++) {
+            var e = this.data[i];
+            var srvName = e.service;
+            var arr = servicesPerName[srvName];
+            if (arr == null) {
+                arr = 0;
+            }
+            servicesPerName[srvName] = (arr + 1);
+        }
+        var sorted = Object.keys(servicesPerName).sort();
+        var serviceListItems = this.serviceList[0];
+        var allServices = this.createServiceDefItem('All', '', numberOfEvents);
+        allServices.setAttribute('id', 'anyService');
+        serviceListItems.appendChild(allServices);
+        this.presentServices = servicesPerName;
+        for (var i = 0 ; i < sorted.length; i++) {
+            var serviceName = sorted[i];
+            var counter = servicesPerName[serviceName];
+            var listItem = this.createServiceDefItem(serviceName, serviceName, counter);
+            serviceListItems.appendChild(listItem);
+        }
+        this.displayEvents();
+        if (firstReload) {
+            var sT = this;
+            setTimeout(function(){
+                var filterParam = new URL(location.href).searchParams.get('filter');
+                if (filterParam) {
+                    $('#instance-filter')[0].value = filterParam;
+                }
+                var urlParam = new URL(location.href).searchParams.get('service');
+                if (urlParam === null) {
+                    var servicePrefix = '#service_'
+                    if (location.hash.startsWith(servicePrefix)) {
+                        urlParam = location.hash.substr(servicePrefix.length)
+                    }
+                }
+                var found = false;
+                if (urlParam && urlParam != '.*') {
+                    var nodes = document.getElementById('service-list').childNodes;
+                    for (var i = 0; i < nodes.length; i++) {
+                        if($(nodes[i]).find(".service-name").html() == urlParam) {
+                            var selectedElement = $(nodes[i])
+                            found = true;
+                            sT.selectService(selectedElement, false);
+                            setTimeout(function(){
+                              selectedElement.focus();
+                            }, 150);
+                            break;
+                        }
+                    }
+                }
+                if (!found) {
+                    sT.selectService($('#anyService', false));
+                }
+            }, 150);
+        }
+    }
+    appChild(rootKind, elem) {
+        var root = document.createElement(rootKind)
+        root.appendChild(elem);
+        return root
+    }
+    buildCell(row, elem, clazz, value) {
+        var td = document.createElement(elem);
+        td.setAttribute('class', clazz);
+        td.appendChild(value);
+        row.appendChild(td);
+        return td;
+    }
+    createBadge(status, clazz) {
+      if (status == null) {
+        status = 'missing';
+        clazz = 'dark';
+      } else if (status != null && clazz == null) {
+         if (status == 'passing') {
+            clazz='success';
+         } else if (clazz != 'warning') {
+            clazz='danger';
+         }
+      }
+      var span = document.createElement('span');
+      span.setAttribute('class', 'lookup badge badge-pill badge-' + clazz);
+      span.appendChild(document.createTextNode(status));
+      return span;
+    }
+    doFilter() {
+        var filterValue = $('#instance-filter')[0].value;
+        this.refreshTimeout = null;
+        var matcher;
+        try {
+            matcher = new RegExp(filterValue);
+        } catch (e) {
+          var safeReg = filterValue.replace(/[-[\]{}()*+?.,\\^$|]/g, "\\$&")
+          console.log("Failed to compile regexp for '" + filterValue + "', using strict lookup due to: " + e);
+          matcher = new RegExp(safeReg);
+        }
+        console.log("Filtering on service", serviceTimeline.serviceInstanceFilter, " with ", matcher, "filterValue:=", filterValue);
+        var isCorrectService = function(){ return true; };
+        if (serviceTimeline.serviceInstanceFilter == ''){
+            var stylesheet = document.getElementById('serviceCol');
+            var txt = '';
+            if (filterValue) {
+                txt+='tr.filtered { display: none; }';
+            }
+            stylesheet.textContent = txt;
+        } else {
+            var stylesheet = document.getElementById('serviceCol');
+            var txt = '.serviceCol';
+            if (filterValue) {
+                txt+=',tr.filtered'
+            }
+            for (var i in this.presentServices) {
+                if (i != serviceTimeline.serviceInstanceFilter) {
+                    txt+=',tr.srv-'+i;
+                }
+            }
+            stylesheet.textContent = txt + ' { display: none; }';
+            isCorrectService = function(ui) { return ui.hasClass('srv-' + serviceTimeline.serviceInstanceFilter) };
+        }
+        if (filterValue) {
+            $("#all-events > tbody").children('tr').each(function (){
+            var ui = $(this);
+            var shouldShow = isCorrectService(ui) && ui.children('.lookup').is(function (){
+                var elem = $(this);
+                if (elem[0].innerHTML.match(matcher)) {
+                return true;
+                }
+                return false;
+            });
+            if (shouldShow) {
+                ui.removeClass('filtered');
+            } else {
+                ui.addClass('filtered');
+            }
+            });
+        }
+    }
+    selectService(source, updateUrl) {
+        $(this.selectedService).removeClass('active');
+        var serviceName = $(source).find(".service-name").html()
+        this.selectedService = source.closest('li');
+        $(this.selectedService).addClass('active');
+        if (serviceName == 'All') {
+            serviceName = '';
+            $("#service-title").html('');
+        } else {
+            var titleText = '<a href="consul-services-ui.html?service=' + serviceName + '">'+serviceName+'</a>';
+            $("#service-title").html(titleText);
+        }
+        serviceTimeline.serviceInstanceFilter = serviceName;
+        if (updateUrl) {
+          serviceTimeline.updateURL(serviceName == 'All' ? '' : serviceName);
+        }
+        this.doFilter();
+    }
+    updateURL(link) {
+        var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
+        if (link) {
+          newUrl += '?service=' + link
+        }
+        window.history.pushState({},"",newUrl);
+      }
+    filterService() {
+        var filter;
+        var serviceVal = serviceTimeline.serviceFilter.val();
+        try {
+          filter = new RegExp(serviceVal);
+        } catch (e) {
+          var safeReg = serviceVal.replace(/[-[\]{}()*+?.,\\^$|]/g, "\\$&")
+          console.log("Failed to compile regexp for '" + serviceVal + "', using strict lookup due to: " + e);
+          filter = new RegExp(safeReg);
+        }
+        serviceTimeline.serviceFilterCount = 0;
+        var showProxiesInList = this.showProxiesInList;
+        serviceTimeline.serviceList.children('.serviceListItem').each(function (){
+          var ui = $(this);
+          if(this.getElementsByClassName('service-name')[0].innerHTML == 'All' || this.getElementsByClassName('service-name')[0].innerHTML.match(filter)) {
+            ui.removeClass('d-none');
+            ui.addClass('d-block');
+          } else {
+            ui.removeClass('d-block');
+            ui.addClass('d-none');
+          }
+        });
+      }
+    displayEvents() {
+        //$("#service-title").html(service['name']);
+        var tableBody = $('#all-events > tbody');
+        tableBody.html("");
+        var tbody = tableBody[0];
+        var filter = "";
+        for (var i = 0 ; i < this.data.length; i++) {
+            var e = this.data[i];
+            var row = document.createElement('tr');
+            row.setAttribute("class", 'srv-' + e.service);
+            this.buildCell(row, 'td', 'ts', this.appChild('time', document.createTextNode(e.ts)));
+            this.buildCell(row, 'td', 'lookup serviceName serviceCol', document.createTextNode(e.service));
+            var text = e.instance;
+            if (e.instance_info && e.instance_info.node) {
+                text = e.instance_info.node;
+                if (e.instance_info.port > 0) {
+                    text += ":" + e.instance_info.port
+                }
+            }
+            var instanceCell = this.buildCell(row, 'td', 'lookup instance', document.createTextNode(text));
+            instanceCell.setAttribute("title", e.instance);
+            {
+                var checksCell = document.createElement("div")
+                this.buildCell(row, 'td', 'lookup checks', checksCell);
+                for (var j = 0; j < e.checks.length; j++) {
+                    var c = e.checks[j];
+                    var statusSpan = document.createElement('div');
+                    statusSpan.setAttribute('class', 'checkTransition');
+                    statusSpan.appendChild(this.createBadge(c['old']));
+                    statusSpan.appendChild(document.createTextNode('→'));
+                    var newBadge = this.createBadge(c['new']);
+                    newBadge.setAttribute('title', c['output']);
+                    statusSpan.appendChild(newBadge);
+                    checksCell.appendChild(statusSpan);
+                    var checkName = document.createElement('div');
+                    checkName.setAttribute('class', 'lookup checkName');
+                    checkName.setAttribute('title', c['id']);
+                    checkName.appendChild(document.createTextNode(c['name']));
+                    checksCell.appendChild(checkName);
+                }
+            }
+            {
+                var statusSpan = document.createElement('span');
+                statusSpan.appendChild(this.createBadge(e['old_state']));
+                statusSpan.appendChild(document.createTextNode('→'));
+                statusSpan.appendChild(this.createBadge(e['new_state']));
+                this.buildCell(row, 'td', 'status', statusSpan);
+            }
+            {
+                var allInstances = document.createElement('span');
+                var nSuccess = e['stats']['passing'];
+                if (nSuccess > 0) {
+                    var success = this.createBadge(nSuccess, 'success');
+                    allInstances.appendChild(success);
+                }
+                var nWarnings = e['stats']['warning'];
+                if (nWarnings > 0) {
+                    var elem = this.createBadge(nWarnings, 'warning');
+                    allInstances.appendChild(elem);
+                }
+                var nCritical = e['stats']['critical'];
+                if (nCritical > 0) {
+                    var elem = this.createBadge(nCritical, 'danger');
+                    allInstances.appendChild(elem);
+                }
+                var elem = this.createBadge(nCritical);
+                var percent = Math.round(nSuccess * 100 / e['stats']['total']);
+                var clazz = 'secondary'
+                if (percent > 90) {
+                    clazz = 'success';
+                } else if (percent < 20) {
+                    clazz = 'danger';
+                } else if (percent < 50) {
+                    clazz = 'warning';
+                }
+                allInstances.appendChild(this.createBadge(percent + " %", clazz));
+                row.appendChild(allInstances);
+            }
+            tbody.prepend(row)
+        }
+    }
+}

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

@@ -0,0 +1,188 @@
+<%
+require 'json'
+@current_time = Time.now.utc
+cur_state = services.map do |service_name, _tags|
+  next if service_name.match?(/^lbl7-/)
+  next if service_name.match?(/^wmi-/)
+  next if service_name.match?(/collectd-/)
+  next if service_name.match?(/-(eu|as|us)$/)
+  next if service_name.match?(/-admin$/)
+  snodes = service(service_name)
+  cur_stats = {
+    'passing'  => 0,
+    'warning'  => 0,
+    'critical' => 0,
+    'total'    => snodes.count
+  }
+  snodes.each do |snode|
+    case snode.status.downcase
+    when 'passing'
+      cur_stats['passing'] += 1
+    when 'warning'
+      cur_stats['warning'] += 1
+    else
+      cur_stats['critical'] += 1
+    end
+  end
+  instances = snodes
+              .sort { |a, b| a['Node']['Node'] <=> b['Node']['Node'] }
+              .map do |instance|
+    ["#{instance['Node']['Node']}:#{instance['Service']['ID']}",
+     {
+       'address' => instance.service_address,
+       'node' => instance['Node']['Node'],
+       'port' => instance['Service']['Port'],
+       'idx'  => instance['Service']['ModifyIndex'],
+       'status' => instance.status,
+       'stats'  => cur_stats,
+       'checks' => instance['Checks'].map { |check| [check['CheckID'], { 'name' => check['Name'], 'status' => check['Status'], 'output' => check['Output'] }] }.to_h
+     }]
+  end.to_h
+  [service_name, instances]
+end
+                    .compact
+                    .to_h
+old_state = if @previous_state
+              @previous_state
+            else
+              cur_state
+            end
+class RingBuffer < Array
+  attr_reader :max_size
+  def initialize(max_size:, enum: nil)
+    @max_size = max_size
+    enum&.each { |e| self << e }
+  end
+  def <<(element)
+    if size < @max_size || @max_size.nil?
+      super
+    else
+      shift
+      push(element)
+    end
+  end
+  alias push <<
+end
+def diff(old, new)
+  diff = OpenStruct.new
+  diff.appeared = new - old
+  diff.disappeared = old - new
+  diff.stayed = new & old
+  diff
+end
+@events = RingBuffer.new(max_size: (ENV['CONSUL_TIMELINE_BUFFER'] || 1000).to_i) unless @events
+def log_event(line)
+  puts "#{Time.now.to_i} #{line}" if ENV['DEBUG_TIMELINE']
+end
+def store_event(service: service_name, instance: nil, old_state: nil, new_state: nil, instance_info: nil, checks: [])
+  STDERR.puts "empty instance_info for  #{service} ; #{instance} ; #{new_state}" unless instance_info
+  @events << { 'service' => service, 'instance' => instance, 'old_state' => old_state, 'new_state' => new_state,
+               'ts' => @current_time, 'instance_info' => instance_info }.tap do |ev|
+    ev['checks'] = checks if checks
+    ev['stats'] = if instance_info
+                    instance_info['stats']
+                  else
+                    {}
+                  end
+  end
+end
+def compute_checks(old_state, cur_state, service_name, instance_name)
+  old_checks = old_state.dig(service_name, instance_name, 'checks') || {}
+  new_checks = cur_state.dig(service_name, instance_name, 'checks') || {}
+  check_diff = diff(old_checks.keys, new_checks.keys)
+  checks = []
+  check_diff.stayed.each do |check_id|
+    old_status = old_state.dig(service_name, instance_name, 'checks', check_id, 'status')
+    cur_status = cur_state.dig(service_name, instance_name, 'checks', check_id, 'status')
+    next if old_status == cur_status
+    check_name = cur_state.dig(service_name, instance_name, 'checks', check_id, 'name')
+    check_name = old_state.dig(service_name, instance_name, 'checks', check_id, 'name') unless check_name
+    check_name = check_id unless check_name
+    checks << { 'id' => check_id,
+                'old' => old_status,
+                'new' => cur_status,
+                'name' => check_name }.tap do |check|
+                  check['output'] = (cur_state.dig(service_name, instance_name, 'checks', check_id, 'output') || '')[0..512]
+                end
+  end
+  checks
+end
+service_diff = diff(old_state.keys, cur_state.keys)
+service_diff.disappeared.each do |service_name|
+  old_state[service_name].each do |instance_name, instance_info|
+    checks = compute_checks(old_state, cur_state, service_name, instance_name)
+    store_event(service: service_name,
+                instance: instance_name,
+                old_state: old_state[service_name][instance_name]['status'],
+                new_state: nil,
+                instance_info: instance_info,
+                checks: checks)
+  end
+end
+def instances_are_equal(o_state, n_state)
+  return true if o_state == n_state
+  return false unless o_state.nil? || n_state.nil?
+  %w[address node port status].each do |field|
+    return false if o_state[field] != n_state[field]
+  end
+  true
+end
+(service_diff.stayed + service_diff.appeared).each do |service_name|
+  instance_diff = diff((old_state[service_name] || {}).keys, cur_state[service_name].keys)
+  instance_diff.disappeared.each do |instance_name|
+    checks = compute_checks(old_state, cur_state, service_name, instance_name)
+    store_event(service: service_name,
+                old_state: old_state[service_name][instance_name]['status'],
+                new_state: nil,
+                instance: instance_name,
+                instance_info: old_state[service_name][instance_name],
+                checks: checks)
+  end
+  instance_diff.appeared.each do |instance_name|
+    checks = compute_checks(old_state, cur_state, service_name, instance_name)
+    store_event(service: service_name,
+                old_state: nil,
+                new_state: cur_state[service_name][instance_name]['status'],
+                instance: instance_name,
+                instance_info: cur_state[service_name][instance_name],
+                checks: checks)
+  end
+  instance_diff.stayed.each do |instance_name, _instance_info|
+    checks = compute_checks(old_state, cur_state, service_name, instance_name)
+    o_state = old_state[service_name][instance_name]['status']
+    n_state = cur_state[service_name][instance_name]['status']
+    next if instances_are_equal(o_state, n_state) && checks.empty?
+    store_event(service: service_name,
+                old_state: o_state,
+                new_state: n_state,
+                instance: instance_name,
+                instance_info: cur_state[service_name][instance_name],
+                checks: checks)
+  end
+end
+# We save the previous state only when we have a complete state once
+if template_info['was_rendered_once']
+  warn "First full rendering completed at #{@current_time} !" unless @previous_state
+  @previous_state = cur_state
+end
+%><%= JSON.generate(@events)%>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -179,6 +179,7 @@ files:
 - samples/consul-ui/consul-keys-ui.html.erb
 - samples/consul-ui/consul-nodes-ui.html.erb
 - samples/consul-ui/consul-services-ui.html.erb
+- samples/consul-ui/consul-timeline-ui.html.erb
 - samples/consul-ui/consul_keys.json.erb
 - samples/consul-ui/consul_nodes.json.erb
 - samples/consul-ui/consul_services.json.erb
@@ -186,7 +187,9 @@ files:
 - samples/consul-ui/js/keys.js
 - samples/consul-ui/js/nodes.js
 - samples/consul-ui/js/service.js
+- samples/consul-ui/js/timeline.js
 - samples/consul-ui/js/utils.js
+- samples/consul-ui/timeline.json.erb
 - samples/consul-ui/vendors/highlight/atom-one-dark.css
 - samples/consul-ui/vendors/highlight/highlight.pack.js
 - samples/consul_template.html.erb
@@ -228,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key:
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language