consul-templaterb 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e36b411332292a31c63add335521285556e3a1e6350ef2a548c9dacf01142c
-  data.tar.gz: f46920293d0b25fdcbe8ceb27d75faa4cb401f1aa19bd38f952a44a292f44723
+  metadata.gz: d17ec48b3c3611a4e49e13ef9daaeeb44f3f6cc02768ccdcd579e64c2af1a7ec
+  data.tar.gz: 59300692c12bacfa4e232679fc7568437ebf9fd3ca977161f702b2f1f4666b76
 SHA512:
-  metadata.gz: f7ee00e33c8796ee5a6b6483693d6ca49f05959d59c29c184912feb95da44df6659d3dd513105338166906e2098ddd342c374623bef7610b576e3afea9ca37b8
-  data.tar.gz: '0787cdbfae7aa011793a12be3c6f6ce798b326913aabe430627aa8eb8d9baaaf3bd3a205faa26d5ad3d15e4617fcb882bb91238f54a9f9593bd2d1debb15027f'
+  metadata.gz: b3356add5c81df85061ed0810ea6775252044e771ca10cce3cec5a60fc22c9e1f2cd5e60707d90c4e939b061baa3c8c97155ffe7e3fa41b16a195730f3ebbd98
+  data.tar.gz: 6f6b3a75a175d7314f8f7b8878c161d283500011beb7b4e21ae9c1a410d326a15ca7d83e135ed4a0a13705995053940036689a6b4cb4f2d249494881013466b1

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## (UNRELEASED)
 
+## 1.8.5 (December 18, 2018)
+
+OPTIMIZATIONS:
+
+ * Use less memory on the client side for consul-timeline
+ * Properly handle multiple instances of JSON file behinf a LB
+
 ## 1.8.3 / 1.8.4 (December 18, 2018)
 
 OPTIMIZATIONS:

data/lib/consul/async/consul_template.rb

@@ -185,6 +185,7 @@ module Consul
           template_info: tpl_info
         }
         result = ERB.new(tpl, nil, @trim_mode).result(binding)
+        raise "Result is not a string :='#{result}' for #{tpl_file_path}" unless result.is_a?(String)
         @context = old_value
         result
       rescue StandardError => e

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.8.4'.freeze
+    VERSION = '1.8.5'.freeze
   end
 end

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

@@ -11,13 +11,17 @@
           </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" id="anyService"><div class="statuses float-right"><span id="allServicesCount" class="lookup badge badge-pill badge-secondary">loading&hellip;</span></div><div class="service-name">All</div></li>
+            <li onfocus="serviceTimeline.selectService(this)" onclick="serviceTimeline.selectService(this, true)" value="" class="serviceListItem list-group-item list-group-item-actionn" id="anyService"><div class="statuses float-right"><span id="allServicesCount" class="lookup badge badge-pill badge-secondary">loading&hellip;</span></div><div class="service-name">All</div></li>
             </ul>
           </div>
         </div>
         <div class="col-10 col-m-9">
-          <div id="autorefresh"><input id="autorefresh-check" type="checkbox" checked><label for="autorefresh-check">Autorefresh</label></div>
-          <h2 class="text-center" id="service-title"></h2>
+          <div id="autorefresh">
+            <input id="autorefresh-check" type="checkbox" checked><label for="autorefresh-check">Autorefresh</label><br/>
+            <label for="autorefresh-check">Max Rows:</label>
+            <input id="maxRows" style="width: 5em;" type="number" min="100" max="<%= (ENV['CONSUL_TIMELINE_BUFFER'] || 10000) %>" step="100" value="5000"/>
+          </div>
+          <h2 class="text-center" id="service-title" style="clear:both"></h2>
           <div class="row mb-2">
             <div class="input-group float-left col-12">
               <input id="instance-filter" type="search" placeholder="filter events" class="form-control" />

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

@@ -135,7 +135,7 @@ class ServiceTimeline {
                 setInterval(sT.reloadDataFromJSON, 10000);
             }, 150);
         } else {
-            this.doFilter();
+            this.performFiltering($('#instance-filter')[0].value);
         }
     }
 
@@ -182,17 +182,20 @@ class ServiceTimeline {
         }
         console.log("Filtering on service", serviceTimeline.serviceInstanceFilter, " with ", matcher, "filterValue:=", filterValue);
         var isCorrectService = function(){ return true; };
+        if (serviceTimeline.serviceInstanceFilter == 'All') {
+            serviceTimeline.serviceInstanceFilter = '';
+        }
         if (serviceTimeline.serviceInstanceFilter == ''){
             var stylesheet = document.getElementById('serviceCol');
             var txt = '';
-            if (filterValue) {
+            if (filterValue != '') {
                 txt+='tr.filtered { display: none; }';
             }
             stylesheet.textContent = txt;
         } else {
             var stylesheet = document.getElementById('serviceCol');
             var txt = '.serviceCol';
-            if (filterValue) {
+            if (filterValue != '') {
                 txt+=',tr.filtered'
             }
             for (var i in this.presentServices) {
@@ -203,7 +206,7 @@ class ServiceTimeline {
             stylesheet.textContent = txt + ' { display: none; }';
             isCorrectService = function(ui) { return ui.hasClass('srv-' + serviceTimeline.serviceInstanceFilter) };
         }
-        if (filterValue) {
+        if (filterValue != '') {
             $("#all-events > tbody").children('tr').each(function (){
             var ui = $(this);
             var shouldShow = isCorrectService(ui) && ui.children('.lookup').is(function (){
@@ -226,6 +229,7 @@ class ServiceTimeline {
         var filterValue = $('#instance-filter')[0].value;
         if (this.refreshTimeout) {
             clearTimeout(this.refreshTimeout);
+            this.refreshTimeout = null;
         }
         this.refreshTimeout = window.setTimeout(function(){
             serviceTimeline.performFiltering(filterValue);
@@ -238,7 +242,6 @@ class ServiceTimeline {
         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>';
@@ -246,7 +249,7 @@ class ServiceTimeline {
         }
         serviceTimeline.serviceInstanceFilter = serviceName;
         if (updateUrl) {
-          serviceTimeline.updateURL(serviceName == 'All' ? '' : serviceName);
+          serviceTimeline.updateURL(serviceName);
         }
         this.doFilter();
     }
@@ -283,6 +286,7 @@ class ServiceTimeline {
       }
 
     displayEvents(firstReload) {
+        var maxRows = document.getElementById("maxRows").value;
         //$("#service-title").html(service['name']);
         var tableBody = $('#all-events > tbody');
         var startIndex = 0;
@@ -290,19 +294,37 @@ class ServiceTimeline {
             tableBody.html("");
         } else {
             // We first try to find new entries...
-            var o = this.lastEntryLoaded;
+            var lastDisplayedIndex = indexOfTimelineEvent(this.lastEntryLoaded);
+            var newestIndexInNewDocument = "000";
+            if (this.data.length > 0) {
+                newestIndexInNewDocument = indexOfTimelineEvent(this.data[this.data.length - 1]);
+            }
+            if (lastDisplayedIndex >= newestIndexInNewDocument) {
+                // Might happen when behind a VIP
+                console.log("Skip reload, index: ", lastDisplayedIndex, ", new is ", newestIndexInNewDocument);
+                return;
+            } else {
+                console.log("Index ", lastDisplayedIndex, " -> ", newestIndexInNewDocument);
+            }
             for (var i = 0 ; i < this.data.length; i++) {
                 var e = this.data[i];
-                if (o.ts == e.ts && o.instance == e.instance) {
+                if (lastDisplayedIndex < indexOfTimelineEvent(e)) {
                     startIndex = i + 1;
                     console.log('Resuming at ', startIndex, " with ", e);
                     break;
                 }
             }
         }
-        var tbody = tableBody[0];
+        var frag = document.createDocumentFragment();
         var filter = "";
         var lastEntryFound = null;
+        if (this.data.length > maxRows) {
+            var remaining = this.data.length - startIndex;
+            if (startIndex < remaining) {
+                startIndex = this.data.length - maxRows;
+                console.log('Skip first ', startIndex, " entries on ", this.data.length, " lines...");
+            }
+        }
         for (var i = startIndex ; i < this.data.length; i++) {
             var e = this.data[i];
             lastEntryFound = e;
@@ -391,8 +413,22 @@ class ServiceTimeline {
                 }
                 this.buildCell(row, 'td', 'ipercents', this.createBadge(percent + " %", clazz));
             }
-            tbody.prepend(row)
+            frag.prepend(row);
         }
+        var tbody = tableBody[0];
+        tbody.prepend(frag);
         this.lastEntryLoaded = lastEntryFound;
+        console.log("Last entry loaded: ", indexOfTimelineEvent(this.lastEntryLoaded));
+        var i = 0;
+        
+        var tbody = tableBody.children('tr').each (function() {
+            i++;
+            if (i > maxRows) {
+                $(this).remove()
+            }
+        });
+        if (i > maxRows) {
+            console.log("Removed ", maxRows - i, " lines.")
+        }
     }
 }

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

@@ -20,6 +20,12 @@ function formatDate(date) {
   return padDateUnit(date.getMonth()+1) + "/" + padDateUnit(date.getDate()) + " " + padDateUnit(date.getHours()) + ':' + padDateUnit(date.getMinutes()) + ':' + padDateUnit(date.getSeconds());
 }
 
+function indexOfTimelineEvent(e) {
+  if (e == null) {
+    return 'k/0000000000/0000/0000';
+  }
+  return 'k/' + e.idx.toString().padStart(10, '0') + '/' + e.service + '/' + e.instance;
+}
 
 function nodeState(checks) {
   status='passing';

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

@@ -77,6 +77,7 @@ def diff(old, new)
 end
 
 @events = RingBuffer.new(max_size: (ENV['CONSUL_TIMELINE_BUFFER'] || 10000).to_i) unless @events
+@new_events = []
 
 def log_event(line)
   puts "#{Time.now.to_i} #{line}" if ENV['DEBUG_TIMELINE']
@@ -84,7 +85,7 @@ 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,
+  @new_events << { 'service' => service, 'instance' => instance, 'idx' => instance_info['idx'], '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
@@ -176,10 +177,20 @@ end
                 checks: checks)
   end
 end
+sorted_events = @new_events.sort do |a, b|
+  res = 0
+  %w[idx service instance].each do |f|
+    res = a[f] <=> b[f]
+    break if res != 0
+  end
+  res
+end
+sorted_events.each { |e| @events << e }
+@new_events.clear
+
 # 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)%>
+%><%= JSON.generate(@events) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request