consul-templaterb 1.26.2 → 1.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc35b5803af2e05001323f77e18be90ec85baa05dd621030a83127cf1b5fd9f1
-  data.tar.gz: f7d3e25054dcd6c1b022e5c4bf58ea902c5c95676aafa936512659eaec3de9a1
+  metadata.gz: eca26ee1958aac8a862d3c1c96b35446ac7a7775f3209095f64d8cd01200fee9
+  data.tar.gz: 15292c1651add5460162cf629814c37aeb9c965daaae0a5bfcb9a083e0c40758
 SHA512:
-  metadata.gz: e1e053e41716e64177917ef8a3ef1360ba82995758bb7dacfafd3bc7fb7a8f5774f107c62cbb7c4340189ea59cab15db936fc27854f6fab1ba487466ad0add3f
-  data.tar.gz: 95c0584f456239478395ceb0d2678e2ec1c7165f2148371f272ab23780148ed6498f419bc8104933d14cd155fcf20403c2b66521e604a3d2f4232bb8373f69c2
+  metadata.gz: a7e04120d50851589cb0e90e45327768b81c2c9954634ca7b1d80d51b88de5e6186402c4f3be0bbc7a67ef220c8950c4117730bf50abaf2c080c5cd3e007d18b
+  data.tar.gz: 9b434745e5e8fb44c955350d38c68a469dc08b249b331800c38e112952757f85713e7ee2e924a3bd62883115443467329774177b98a0193badce3f2dfbb9a4d1

data/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 NEW FEATURES:
 
+## 1.26.3 (April 15, 2020)
+
+BUGFIX:
+
+ * Removed all Criteo specific decorators from Consul-UI
+
 ## 1.26.2 (April 15, 2020)
 
 BUGFIX:

data/lib/consul/async/version.rb

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

data/samples/consul-ui/decorators.js.erb

@@ -1,18 +1,5 @@
-// Utilities
+// Use this file to configure custom decorators for your Consul-UI
 var httpRegexp = new RegExp('^http[s]?://[^ ]+$');
-var dc = "<%= ENV['CRITEO_DC'] || 'par'%>";
-var env = "<%= ENV['CRITEO_ENV'] || 'preprod'%>";
-
-var availability_url = 'https://grafana.crto.in/d/xFX5gCnWz/service-availability?var-datacenter=' + dc + '&var-service=';
-if (env == 'preprod') {
-  availability_url = 'https://grafana.preprod.crto.in/d/E0ANGjnZz/service-availability?var-datacenter=' + dc + '&var-service=';
-}
-var swagger_url = 'https://swaggercatalogapp.' + dc + '.' + env + '.crto.in/explore/swagger?key=';
-var slack_url = 'https://criteo.slack.com/app_redirect?channel=';
-
-var rackguru_url = 'https://rackguru.' + env + '.crto.in/serial/';
-
-var asapi_url = 'https://idm.' + env + '.crto.in/tool/multiGroupInfo/'
 
 function url_decorator(key, value) {
   var e = document.createElement('a');
@@ -26,27 +13,7 @@ function usefullLinksGenerator(instance, serviceName, node_meta_info) {
     top.className = 'instance-links';
 
     var usefullLinks = [
-        {
-            title: "Trigger security scan",
-            iconClassName: "fas fa-shield-alt",
-            href: "https://security.crto.in/#/scan/?ip=" + instance.addr
-        },
-        {
-            title: "Availability Graph",
-            iconClassName: "fas fa-chart-area",
-            href: availability_url + serviceName
-        },
     ];
-    if (node_meta_info!= null) {
-      var serial = node_meta_info['serial_number'];
-      if (serial != null) {
-        usefullLinks.push({
-            title: "RackGuru",
-            iconClassName: "fas fa-server",
-            href: rackguru_url + serial
-        });
-      }
-    }
     var first = true;
     for (let usefullLink of usefullLinks) {
         link = document.createElement('a');
@@ -134,19 +101,6 @@ function groups_decorator(instance, key, value, serviceName) {
   return span;
 }
 
-/**
- * Decorates with a slack channel link
- */
-function slack_channel(instance, key, value, serviceName) {
-  var sName = value;
-  if (sName.startsWith('#')) {
-    sName = sName.substring(1);
-  }
-  return build_link(slack_url + encodeURIComponent(sName), '#'+ sName);
-}
-
-const start_regexp = /(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/
-
 function decorateIsoDate(value, formated) {
   const parsed  = Date.parse(formated);
   if (isNaN(parsed)) {
@@ -163,55 +117,6 @@ function decorateIsoDate(value, formated) {
 // This is the list of function called
 // When a service meta is found
 var registered_decorators = {
-    alert_availability_slack_channel: slack_channel,
-    gerrit_repository: function(instance, key, value, serviceName) {
-      return build_link('https://review.crto.in/#/q/' + value, value);
-    },
-    version: function(instance, key, value, serviceName) {
-      var asInt = parseInt(value);
-      if (asInt < 10000) {
-        return document.createTextNode(value);
-      }
-      if (instance.sMeta['CRITEO_APP_POOL'] != null) {
-          return build_link("https://devtools.crto.in/log.html?moab=cs&im=nb-to&range=100%2C" + asInt, value);
-      } else {
-          var tUrl = "https://devtools.crto.in/log.html?moab=j&im=nb-to&range=100%2C" + asInt;
-          if (instance.sMeta['jvm_artifact'] != null) {
-            tUrl += '&with-dependencies=true&artifacts=' + encodeURIComponent(instance.sMeta['jvm_artifact']);
-          }
-          return build_link(tUrl, value);
-      }
-    },
-    MESOS_TERM_DEBUG_GRANTED_TO: groups_decorator,
-    OWNERS: groups_decorator,
-    marathon_app_id: function(instance, key, value, serviceName) {
-      var app_name = value;
-      if (app_name[0] != '/') {
-        app_name = '/' + app_name;
-      }
-      if (instance.sMeta && instance.sMeta['marathon_ui']) {
-        return build_link(instance.sMeta['marathon_ui'] + '/#/apps/' + encodeURIComponent(app_name), value);
-      } else {
-        // non decorated value
-        return document.createTextNode(value);
-      }
-    },
-    marathon_app_version: function(instance, key, value, serviceName) {
-      return decorateIsoDate(value, value);
-    },
-    slack_channel: slack_channel,
-    start: function(instance, key, value, serviceName) {
-        const reg = start_regexp.exec(value);
-        if (reg != null) {
-          var formated = reg[1] + '-' + reg[2] + '-' + reg[3] + 'T' + reg[4] + ':' + reg[5] + ':' + reg[6] + 'Z';
-          return decorateIsoDate(value, formated);
-        } else {
-          return document.createTextNode(value);
-        }
-    },
-    swagger_key: function(instance, key, value, serviceName) {
-        return build_link(swagger_url + encodeURIComponent(value), value);
-    },
 }
 
 function service_meta_semantics_decorator(instance, key, value, serviceName) {
@@ -286,85 +191,11 @@ function nodeMetaGenerator(nodeMetaTags, serviceMetaIfAny) {
  * it does not have to return anything.
  */
 function navBarDecorator(navbar) {
-  if (typeof consulManager === 'undefined') {
-    // Timepicker is not supported on this page
-    return;
-  }
-  var timepicker_container = document.createElement('div');
-  timepicker_container.innerHTML = `
-              <div class="row">
-                <button type="button" disabled class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="Data returned is the closest available to request" id="currently-displayed-data-date">
-                  Pick a date to see data from the past
-                </button>
-                <div class="col-sm-14">
-                  <div class="form-group">
-                    <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
-                      <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-                      <div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
-                        <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              `;
-
-  navbar.appendChild(timepicker_container);
-  var script= document.createElement('script');
-  script.type='text/javascript';
-  // TODO(g.seux): extract code to another file and set "source" on script element
-  script.innerHTML = `
-                    $('#datetimepicker1').datetimepicker({
-                      format: 'DD/MM/YYYY HH:mm:ss Z',  // default format does not allow to select seconds
-                      sideBySide: true, // display date+time on the same widget
-                      useCurrent: true // by default, select current date
-                    });
-                  $("#datetimepicker1").on("change.datetimepicker", function (e) {
-                    console.log("Will fetch data from date " + e.date);
-                    console.log("will clean existing data");
-                    consulManager.clean().then(function(result) {
-                      switch(consulManager.constructor.name) {
-                        case "ConsulServiceManager":
-                          backup_type = 'consul_services';
-                          break;
-                        case "ConsulKeysManager":
-                          backup_type  = 'consul_keys'
-                          break;
-                        case "ConsulNodesManager":
-                          backup_type = 'consul_nodes'
-                          break;
-                        default:
-                          console.log("Unknown " + consulManager.constructor.name + " type");
-                      }
-                      if (e.date) {
-                        console.log("Will replace data by closest snapshot to " + e.date);
-                        var target_url = "https://consul-info-timeline-history.<%= ENV['CRITEO_DC'] %>.<%= ENV['CRITEO_ENV']%>.crto.in/backup/" + backup_type + "/" + e.date / 1000;
-                      } else {
-                        console.log("Will restore to local version");
-                        var target_url = defaultConsulManager.resourceURL;
-                      }
-                      if (typeof(defaultConsulManager) == 'undefined') {
-                        // store first manager to be able to restore it
-                        defaultConsulManager = consulManager
-                      }
-                      consulManager = new consulManager.constructor(target_url);
-                    });
-                  });
-  `;
-  navbar.appendChild(script);
 }
 
-
 /**
  * fetchedResponseDecorator is called with http response when a resource is fetched by any instance of ConsulUIManager
  * it does not have to return anything.
  */
 async function fetchedResponseDecorator(httpResponse) {
-  const data_date = await httpResponse.headers.get('X-Consul-Snapshot-Timestamp');
-  current_date_display = $('#currently-displayed-data-date');
-  if (data_date > 0) {
-    current_date_display.html("Data is a snapshot from: " + moment.unix(data_date).format('DD/MM/YYYY HH:mm:ss Z'));
-  } else {
-    current_date_display.html("Pick a date to see data from the past");
-  }
-}
+}

metadata

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