Merge branch 'percona:master' into DISTMYSQL-185

Author: y-trudeau

resources/public/css/orchestrator.css

@@ -143,6 +143,10 @@ body {
     cursor: default;
 }
 
+.instance h3 .glyphicon-tags {
+    margin-right: 0.4em;
+}
+
 .instance h3 .instance-glyphs {
     cursor: pointer;
 }

resources/public/js/cluster.js

@@ -1546,25 +1546,27 @@ function Cluster() {
       recoveryListing.append('<li role="separator" class="divider"></li>');
 
       // Suggest successor
-      instance.children.forEach(function(replica) {
-        if (!replica.LogBinEnabled) {
-          return
-        }
-        if (replica.SQLDelay > 0) {
-          return
-        }
-        if (!replica.LogReplicationUpdatesEnabled) {
-          return
-        }
-        if (replica.lastCheckInvalidProblem()) {
-          return
-        }
-        if (replica.notRecentlyCheckedProblem()) {
-          return
-        }
-        recoveryListing.append(
-          '<li><a href="#" data-btn="recover-suggested-successor" data-command="recover-suggested-successor" data-successor-host="' + replica.Key.Hostname + '" data-successor-port="' + replica.Key.Port + '">Recover, try to promote <code>' + replica.title + '</code></a></li>');
-      });
+      if (instance.children) {
+        instance.children.forEach(function(replica) {
+          if (!replica.LogBinEnabled) {
+            return
+          }
+          if (replica.SQLDelay > 0) {
+            return
+          }
+          if (!replica.LogReplicationUpdatesEnabled) {
+            return
+          }
+          if (replica.lastCheckInvalidProblem()) {
+            return
+          }
+          if (replica.notRecentlyCheckedProblem()) {
+            return
+          }
+          recoveryListing.append(
+            '<li><a href="#" data-btn="recover-suggested-successor" data-command="recover-suggested-successor" data-successor-host="' + replica.Key.Hostname + '" data-successor-port="' + replica.Key.Port + '">Recover, try to promote <code>' + replica.title + '</code></a></li>');
+        });
+      }
     }
     if (!instance.isMaster) {
       recoveryListing.append('<li><a href="#" data-btn="auto" data-command="recover-auto">Auto (implies running external hooks/processes)</a></li>');
@@ -1633,7 +1635,6 @@ function Cluster() {
     }
   }
 
-
   function indicateClusterPoolInstances(clusterPoolInstances) {
     var instancesMap = _instancesMap;
     for (var pool in clusterPoolInstances.Details) {
@@ -1676,7 +1677,7 @@ function Cluster() {
     instances.forEach(function(instance) {
       if (instance.isMaster) {
         getData("/api/recently-active-instance-recovery/" + instance.Key.Hostname + "/" + instance.Key.Port, function(recoveries) {
-          if (!recoveries) {
+          if (!recoveries || !recoveries.length) {
             return
           }
           // Result is an array: either empty (no active recovery) or with multiple entries
@@ -1767,7 +1768,7 @@ function Cluster() {
       });
     });
     getData("/api/recently-active-cluster-recovery/" + currentClusterName(), function(recoveries) {
-      if (!recoveries) {
+      if (!recoveries || !recoveries.length) {
         return
       }
       // Result is an array: either empty (no active recovery) or with multiple entries

resources/public/js/orchestrator.js

@@ -385,6 +385,14 @@ function openNodeModal(node) {
   addNodeModalDataAttribute("Agent",
     '<a href="' + appUrl('/web/agent/' + node.Key.Hostname) + '">' + node.Key.Hostname + '</a>');
 
+  var tagsText = "";
+  if (node.hasOwnProperty('tagStrings') && node.tagStrings.length) {
+    node.tagStrings.forEach(function(tag){
+      tagsText = tagsText.concat(tag, '<br>');
+    });
+  }
+  addNodeModalDataAttribute("Tags", tagsText);
+
   $('#node_modal [data-btn]').unbind("click");
 
   $("#beginDowntimeOwner").val(getUserId());
@@ -965,6 +973,18 @@ function renderInstanceElement(popoverElement, instance, renderType) {
       popoverElement.find("h3 div.pull-right").prepend('<span class="glyphicon glyphicon-volume-off" title="' + downtimeMessage + '"></span> ');
     }
 
+    $.get(appUrl("/api/tags/" + instance.Key.Hostname + "/" + instance.Key.Port), function(tagStrings) {
+      if (tagStrings.length) {
+        // Need to remember this. It is used in instance's modal window.
+        instance.tagStrings = tagStrings;
+        var tagsText = "";
+        instance.tagStrings.forEach(function(tag) {
+          tagsText = tagsText.concat(tag, '&#10;');
+        });
+        popoverElement.find("h3 div.pull-right").prepend('<span class="glyphicon glyphicon-tags" title="' + tagsText +'"></span> ');
+      }
+    }, "json");
+
     if (instance.lastCheckInvalidProblem()) {
       instance.renderHint = "fatal";
       indicateLastSeenInStatus = true;