consul-templaterb 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17ec48b3c3611a4e49e13ef9daaeeb44f3f6cc02768ccdcd579e64c2af1a7ec
-  data.tar.gz: 59300692c12bacfa4e232679fc7568437ebf9fd3ca977161f702b2f1f4666b76
+  metadata.gz: 19a273b406bb2bc529957446c5555ffd0ec2792dffc05d6aeb89b26999f474a6
+  data.tar.gz: d720a5cd38cc5ce993bd952690ac893ed011c661bbdffe7830d1ab15993710a5
 SHA512:
-  metadata.gz: b3356add5c81df85061ed0810ea6775252044e771ca10cce3cec5a60fc22c9e1f2cd5e60707d90c4e939b061baa3c8c97155ffe7e3fa41b16a195730f3ebbd98
-  data.tar.gz: 6f6b3a75a175d7314f8f7b8878c161d283500011beb7b4e21ae9c1a410d326a15ca7d83e135ed4a0a13705995053940036689a6b4cb4f2d249494881013466b1
+  metadata.gz: 056bcf7ee589aa4021ff6eaa83db44fa91fa9ef82f392165e42a06172e4a1502a23a9904cd3f46672b26ed20f707ae549fb86c51d226e90e51d8a052355509ed
+  data.tar.gz: 2a62c016f97c615e8f77b400b8bfc5f60ad0a76b64b7c147f8e03fc6dd130de672b954b8c8378ccf9fb5a829b63735c13cee97df9cef84f7397b6bdbc058396c

data/.travis.yml

@@ -8,8 +8,6 @@ deploy:
   api_key:
     secure: l78H6Ow9HCeEz0hcAP2XCXaGGBNRXZ/QLFPNzwyNmHToko9WqZj6mbiNIcVwZ8aCcZEzFmtcB7m1lC1l+mvot3Snfh4OUErK7EXMLiNxUWybtA4qJqmsb2J8JGS69pTohPKagi1YyRbyVs2tJpM5OVazcNxEQDAVkWVxJuPVz6tsn4rXZsL77nTSVyB6YGKgguRGhtS/3M0ufk1ymOpuk8pxXKaotlYGRXmht2OHW+FDQczTMgqu6jiZubjWlNHVxtYn+CsLYNj1BswzD6fF1uous6nchV0if2QW5N4OJVyZCx3yEQ0RswfI8G1kG/Jm8wd2lSknY2wpnd1qkRnAcFlKBpUv8aQd6SdbSO84GTAOvucgK7Mcf0LRvYSE2FyagaAPFSfMybWd+GS26g5AuRPpkhtsS9ijfdIzpudiF18pvnJ+wQj+hWM/THWowYNyKv9NeckxdrULaHPisA346r5eM/EADOhyEUtPm11PFgcheGjff1H4qXGc9gcm50u6mNNHkWv38oGhAPpRk/bU7qybTKqRKNGWGP0MiT4WVIFXp62/JMY7AmufOdJx5Ca5JVsaWoN4fsS9r3+R+FxvRtV9NOrRJVKKaQhzi4UHEUDQ2hQjpLDijD5L0vUsl6arl+nufTt5G5jp9QvdY7fhYT1mpGgWj0hTBd8Pxsl3N8U=
   gem: consul-templaterb
-  edge:
-    branch: v1.8.47
   on:
     tags: true
     repo: criteo/consul-templaterb

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## (UNRELEASED)
 
+## 1.8.6 (December 19, 2018)
+
+OPTIMIZATIONS:
+
+ * Full rewrite of filtering of consul-timeline to allow handling
+   history of 100k+ records 
+
 ## 1.8.5 (December 18, 2018)
 
 OPTIMIZATIONS:

data/lib/consul/async/version.rb

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

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

@@ -16,15 +16,19 @@
           </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><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" />
+              <div class="input-group-append">
+                <div class="input-group-append">
+                  <span class="input-group-text">
+                    <input title="Auto-Refresh" id="autorefresh-check" type="checkbox" checked>&nbsp;
+                    <span id="numRowsDisplayed" class="lookup badge badge-pill badge-primary">loading&hellip;</span>
+                  </span>
+               </div>
+                <input id="maxRows" title="max rows to display" placeholder="max rows" style="width: 5em !important;" type="number" min="100" max="<%= (ENV['CONSUL_TIMELINE_BUFFER'] || 10000) %>" step="25" value="5000" class="form-control"/>
+              </div>
             </div>
           </div>
           <div id="instances-wrapper">

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

@@ -134,8 +134,6 @@ class ServiceTimeline {
                 }
                 setInterval(sT.reloadDataFromJSON, 10000);
             }, 150);
-        } else {
-            this.performFiltering($('#instance-filter')[0].value);
         }
     }
 
@@ -170,61 +168,6 @@ class ServiceTimeline {
       return span;
     }
 
-    performFiltering(filterValue) {
-        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 == 'All') {
-            serviceTimeline.serviceInstanceFilter = '';
-        }
-        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');
-            }
-            });
-        }
-    }
-
     doFilter() {
         var filterValue = $('#instance-filter')[0].value;
         if (this.refreshTimeout) {
@@ -232,7 +175,7 @@ class ServiceTimeline {
             this.refreshTimeout = null;
         }
         this.refreshTimeout = window.setTimeout(function(){
-            serviceTimeline.performFiltering(filterValue);
+            serviceTimeline.displayEvents(false, filterValue);
         }, 16);
     }
 
@@ -286,48 +229,72 @@ class ServiceTimeline {
       }
 
     displayEvents(firstReload) {
+        var filterValue = $('#instance-filter')[0].value;
+        var serviceName = serviceTimeline.serviceInstanceFilter;
+        var serviceEvaluator = function(){return true};
+        if (serviceName != '' && serviceName != 'All') {
+            serviceEvaluator = function(e){ return e.service === serviceName }
+        }
         var maxRows = document.getElementById("maxRows").value;
         //$("#service-title").html(service['name']);
         var tableBody = $('#all-events > tbody');
         var startIndex = 0;
-        if (firstReload || this.lastEntryLoaded == null) {
-            tableBody.html("");
-        } else {
-            // We first try to find new entries...
-            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);
+        var newDoc = document.createDocumentFragment();
+        var frag = document.createElement('tbody');
+        newDoc.appendChild(frag);
+        var filter = "";
+        var count = 0;
+        if (filterValue != ''){
+            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);
             }
-            for (var i = 0 ; i < this.data.length; i++) {
-                var e = this.data[i];
-                if (lastDisplayedIndex < indexOfTimelineEvent(e)) {
-                    startIndex = i + 1;
-                    console.log('Resuming at ', startIndex, " with ", e);
-                    break;
+            var delegateServiceEvaluator = serviceEvaluator;
+            const fields = ['instance', 'service'];
+            const instance_info_fields = ['node', 'port'];
+            const check_fields = ['name', 'output'];
+            serviceEvaluator = function(e) {
+                var res = delegateServiceEvaluator(e);
+                if (!res) {
+                    return false;
                 }
+                for (var i = 0; i < fields.length; i++) {
+                    var field = fields[i];
+                    if (matcher.test(e[field])){
+                        return true;
+                    }
+                }
+                for (var i = 0; i < instance_info_fields.length; i++) {
+                    var field = instance_info_fields[i];
+                    if (matcher.test(e.instance_info[field])){
+                        return true;
+                    }
+                }
+                for (var checkId in e.instance_info.checks) {
+                    if (matcher.test(checkId)) {
+                        return true;
+                    }
+                    var check = e.instance_info.checks[checkId];
+                    for (var i = 0; i < check_fields.length; i++) {
+                        var field = check_fields[i];
+                        if (matcher.test(check[field])){
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
         }
-        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++) {
+        for (var i = this.data.length - 1 ; i >= 0 && count <= maxRows; i--) {
             var e = this.data[i];
-            lastEntryFound = e;
+            if (!serviceEvaluator(e)) {
+                continue;
+            }
+            count++;
             var row = document.createElement('tr');
             row.setAttribute("class", 'srv-' + e.service);
             var timestamp;
@@ -413,22 +380,14 @@ class ServiceTimeline {
                 }
                 this.buildCell(row, 'td', 'ipercents', this.createBadge(percent + " %", clazz));
             }
-            frag.prepend(row);
+            frag.append(row);
         }
+        $('#numRowsDisplayed').html(count + ' / ' + this.data.length);
         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.")
+        tbody.parentNode.replaceChild(frag, tbody);
+        if (this.data.length > 1) {
+          this.lastEntryLoaded = this.data[this.data.length - 1];
+          console.log("Last entry loaded: ", indexOfTimelineEvent(this.lastEntryLoaded));
         }
     }
 }

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

@@ -61,7 +61,14 @@ class RingBuffer < Array
       super
     else
       shift
+      previous_e = last
+      after = []
+      while !previous_e.nil? && previous_e['idx'] > element['idx']
+        after << pop
+        previous_e = last
+      end
       push(element)
+      push after
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - SRE Core Services