consul-templaterb 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304b95f065eeb5380e20568ab0d157b011b02e2990bcad5badffdc9cdbd74463
-  data.tar.gz: e3e520457339beea59c4d0caf4f21b42457ad67fb163d5f2a93ce227b0bb5602
+  metadata.gz: ced33aa72d9f144f338dd896e962ad57577f0580a590a7cf9c4151ddf4f9c12c
+  data.tar.gz: 27627d161c46451eeb383d3d69797004eb3d2b9c7fda4d74e50315c332c5b9e9
 SHA512:
-  metadata.gz: 6cf440dbc49f9f9834eae4fee2f8377e7dbcd06362ca8a7bf4ca0525d62ac5e426c2069f571a76e82081db10a43c55faea2c4a31050015cb4b5e060905d81017
-  data.tar.gz: 83a6958a169229cbb598a93440852f824e5cc8c65c6e2b751146e36e5371e8c6cc8bafd3bedfd2862e2323d2047eaa01ad6abc86c54bfbf4543034f61082b8e4
+  metadata.gz: 57472c838bcd831aced8a7331b058ea8a87bc4a50b1a61b5e62b6dd46dd7ac48712b626c374f5643d5ef2a7627fe9d268f05559af395d978a3ac35dcd74e28e5
+  data.tar.gz: '063973ff971f13077e2b8e8c41a93d107662b1154286933ad0211320f1a8bcb3d42ed0482ecebf3822fe545b8a6a24c2c48b4d7770df39aa75f426759de668f2'

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.5.7 (November 12, 2018)
+
+NEW FEATURES:
+
+ * Services can be favorited in samples/consul-ui. Favorited services are kept on top of the list for easier finding.
+
 ## 1.5.6 (September 30, 2018)
 
 IMPROVEMENTS:

data/lib/consul/async/stats.rb

@@ -25,14 +25,14 @@ module Consul
         @errors += 1
       end
 
-      def bytes_per_sec
-        diff = (Time.now.utc - start)
+      def bytes_per_sec(now = Time.now.utc)
+        diff = (now - start)
         diff = 1 if diff < 1
         (body_bytes / diff).round(0)
       end
 
-      def bytes_per_sec_human
-        "#{Utilities.bytes_to_h(bytes_per_sec)}/s"
+      def bytes_per_sec_human(now = Time.now.utc)
+        "#{Utilities.bytes_to_h(bytes_per_sec(now))}/s"
       end
 
       def body_bytes_human

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.5.6'.freeze
+    VERSION = '1.5.7'.freeze
   end
 end

data/samples/consul-ui/css/style.css

@@ -18,6 +18,26 @@
   overflow: hidden;
 }
 
+#service-list .favorite {
+  width: 20px;
+  height: 20px;
+  border: 0;
+  color: #f7d800;
+  cursor: pointer;
+  font-size: 1.3em;
+  vertical-align: middle;
+  line-height: 1;
+  background-color: transparent;
+}
+
+#service-list .favorite::before {
+  content: '☆';
+}
+
+#service-list .favorite.favorited::before {
+  content: '★';
+}
+
 .weights {
   float: right;
 }

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

@@ -13,6 +13,7 @@ class ConsulService {
     this.serviceFilterCount = 0;
     this.showProxiesInList = false;
     var cs = this
+    this.loadFavorites();
     window.setTimeout(function(){
       cs.showTags($('#showTagsInList:checked').length > 0);
       cs.showProxies($('#showProxiesInList:checked').length > 0);
@@ -75,6 +76,9 @@ class ConsulService {
     }
     this.serviceList.html('');
     this.serviceFilterCount = 0;
+
+    let idx = 0;
+    let lastFav = null;
     for (var serviceName in this.data.services) {
       var service = this.data.services[serviceName];
       var serviceStatus = buildServiceStatus(service);
@@ -84,6 +88,8 @@ class ConsulService {
       listItem.setAttribute('onfocus','consulService.onClickServiceName(this)');
       listItem.setAttribute('onclick','consulService.onClickServiceName(this)');
       listItem.setAttribute('value',serviceName);
+      listItem.setAttribute('data-fav', this.favorites[serviceName] ? 1 : 0);
+      listItem.setAttribute('data-index', idx);
       var listItemClass = 'list-group-item list-group-item-action';
 
       var statuses = document.createElement('div');
@@ -105,6 +111,9 @@ class ConsulService {
       }
 
       statuses.appendChild(createBadge('badge-dark', (serviceStatus['total'] || 0)));
+
+      statuses.append(this.buildFavButton(serviceName));
+
       listItem.appendChild(statuses);
       if (!!service['kind']) {
         var kind = document.createElement('div');
@@ -129,7 +138,18 @@ class ConsulService {
 
       listItem.appendChild(serviceTagsItem);
       this.serviceFilterCount += 1;
-      this.serviceList.append(listItem);
+
+      if (this.favorites[serviceName] && lastFav) {
+        lastFav.after(listItem);
+        lastFav = listItem;
+      } else if (this.favorites[serviceName] && !lastFav) {
+        this.serviceList.prepend(listItem);
+        lastFav = listItem;
+      } else {
+        this.serviceList.append(listItem);
+      }
+
+      idx++;
     }
     this.serviceFilterCounter.html(this.serviceFilterCount);
     resizeWrapper('service-wrapper', 'service-list');
@@ -250,6 +270,86 @@ class ConsulService {
       hljs.highlightBlock(block);
     });
   }
+
+  loadFavorites() {
+    const all = (localStorage.getItem('favorite_services') || '').split(',').filter(e => e != '');
+    this.favorites = {}
+    for (var i in all) {
+      this.favorites[all[i]] = true;
+    }
+  }
+
+  saveFavorites() {
+    let str = "";
+    for (var i in this.favorites) {
+      if (!this.favorites[i]) {
+        continue;
+      }
+      str == "" || (str += ",");
+      str += i;
+    }
+    localStorage.setItem('favorite_services', str);
+  }
+
+  buildFavButton(serviceName) {
+    const btn = document.createElement('button');
+    btn.className = 'favorite';
+    btn.setAttribute('title', 'Add/Remove from favorites');
+
+    if (this.favorites[serviceName]) {
+      btn.className += ' favorited';
+    }
+
+    $(btn).click(e => {
+      this.toggleFav(serviceName, !this.favorites[serviceName]);
+    });
+    return btn;
+  }
+
+  toggleFav(serviceName, fav) {
+    this.favorites[serviceName] = fav;
+
+    let el = this.serviceList.find('[value="' + serviceName + '"]');
+    if (!el.length) {
+      return;
+    }
+
+    if (fav) {
+      el.find('.favorite').addClass('favorited');
+    } else {
+      el.find('.favorite').removeClass('favorited');
+    }
+    el.attr('data-fav', fav ? 1 : 0);
+
+    const elIdx = parseInt(el.attr('data-index'));
+
+    let prev = fav ? null : this.serviceList.find('[data-fav="1"]').last();
+    const others = this.serviceList.find('[data-fav="' + (fav ? 1 : 0) + '"]');
+    for (var i = 0; i < others.length; i++) {
+      const idx = parseInt($(others[i]).attr("data-index"));
+      if (idx < elIdx) {
+        prev = $(others[i]);
+      } else if (idx > elIdx) {
+        break;
+      }
+    };
+
+    if (!prev || !prev.length) {
+      this.serviceList.prepend(el);
+    } else {
+      prev.after(el);
+    }
+
+    // if favorited, scroll to element new position
+    if (fav) {
+      const container = $('#service-wrapper');
+      const top = el.position().top;
+      const scroll = container.scrollTop();
+      container.scrollTop(scroll + el.offset().top - container.offset().top);
+    }
+
+    this.saveFavorites();
+  }
 }
 
 $( window ).resize(resizeAll);

data/samples/metrics.erb

@@ -71,7 +71,8 @@ consul_services_count <%= service_count %> <%= services(tag: service_tag_filter)
 
 <%
   json_backends = {}
-  now = Time.now.utc.to_i * 1000
+  now = Time.now.utc
+  now_ms = now.to_i * 1000
   backends.each_pair do |service_name, service_info|
     last_update = service_info[:stats].last_success_or_error.to_i * 1000
     service_info[:state].each_pair do |state_name, state_count|
@@ -86,7 +87,7 @@ consul_services_count <%= service_count %> <%= services(tag: service_tag_filter)
 <%
     end
 %>consul_service_stats_requests_bytes{service="<%= service_name %>"} <%= service_info[:stats].body_bytes %> <%= last_update %>
-consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= service_info[:stats].bytes_per_sec %> <%= now %>
+consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= service_info[:stats].bytes_per_sec(now) %> <%= now_ms %>
 
 <%
   end

metadata

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