From e7c8d8f9007d4347724e068ae88ef6ef981e8250 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Fri, 30 Aug 2019 17:35:41 +0800
Subject: [PATCH 1/5] Hide k8s role taints

---
 lib/shared/addon/mixins/cattle-transitioning-resource.js | 8 +++++---
 lib/shared/addon/utils/constants.js                      | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/shared/addon/mixins/cattle-transitioning-resource.js b/lib/shared/addon/mixins/cattle-transitioning-resource.js
index 37e92e3b3..faeb131b9 100644
--- a/lib/shared/addon/mixins/cattle-transitioning-resource.js
+++ b/lib/shared/addon/mixins/cattle-transitioning-resource.js
@@ -719,9 +719,11 @@ export default Mixin.create({
     const out = [];
     const taints = get(this, 'nodeTaints') || get(this, 'taints') || [];
 
-    taints.forEach((taint) => {
-      out.push(`${ get(taint, 'key') }${ get(taint, 'value') ? `=${ get(taint, 'value')  }` : '' }:${ get(taint, 'effect') }`);
-    });
+    taints
+      .filter((taint) => !C.TAINT_PREFIX_TO_IGNORE.find((L) => taint.key.startsWith(L)))
+      .forEach((taint) => {
+        out.push(`${ get(taint, 'key') }${ get(taint, 'value') ? `=${ get(taint, 'value')  }` : '' }:${ get(taint, 'effect') }`);
+      });
 
     return out;
   }),
diff --git a/lib/shared/addon/utils/constants.js b/lib/shared/addon/utils/constants.js
index c3451f9d6..8ab4699d0 100644
--- a/lib/shared/addon/utils/constants.js
+++ b/lib/shared/addon/utils/constants.js
@@ -560,6 +560,10 @@ C.LABELS_TO_IGNORE = [
 
 C.LABEL_ISTIO_RULE = 'io.rancher.istio';
 
+C.TAINT_PREFIX_TO_IGNORE = [
+  'node-role.kubernetes.io/',
+];
+
 C.LABEL_PREFIX_TO_IGNORE = [
   'io.cattle.lifecycle.',
   'beta.kubernetes.io/',

From bae8f1cca8b2a01bcd2faea7f07ac1660cf0428d Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Fri, 30 Aug 2019 17:45:57 +0800
Subject: [PATCH 2/5] Make k8s taints readonly

---
 lib/shared/addon/components/node-taints/component.js | 8 +++++---
 lib/shared/addon/components/node-taints/template.hbs | 4 ++++
 lib/shared/addon/utils/constants.js                  | 6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/shared/addon/components/node-taints/component.js b/lib/shared/addon/components/node-taints/component.js
index 4657820dd..cf0ce7a39 100644
--- a/lib/shared/addon/components/node-taints/component.js
+++ b/lib/shared/addon/components/node-taints/component.js
@@ -2,6 +2,7 @@ import {  get, set, observer } from '@ember/object';
 import Component from '@ember/component';
 import layout from './template';
 import EmberObject from '@ember/object';
+import C from 'ui/utils/constants';
 
 const NO_SCHEDULE = 'NoSchedule';
 const NO_EXECUTE = 'NoExecute';
@@ -82,9 +83,10 @@ export default Component.extend({
   initTaints() {
     set(this, 'taints', (get(this, 'model.nodeTaints') || get(this, 'model.taints') || []).map((taint) => {
       return {
-        key:    get(taint, 'key'),
-        value:  get(taint, 'value'),
-        effect: get(taint, 'effect'),
+        key:      get(taint, 'key'),
+        value:    get(taint, 'value'),
+        effect:   get(taint, 'effect'),
+        readonly: C.LABEL_PREFIX_TO_IGNORE.find((L) => get(taint, 'key').startsWith(L))
       }
     }));
   },
diff --git a/lib/shared/addon/components/node-taints/template.hbs b/lib/shared/addon/components/node-taints/template.hbs
index 1b637ae14..3075fc173 100644
--- a/lib/shared/addon/components/node-taints/template.hbs
+++ b/lib/shared/addon/components/node-taints/template.hbs
@@ -39,6 +39,7 @@
               class="form-control input-sm"
               type="text"
               value=taint.key
+              disabled=taint.readonly
               placeholder=(t "formNodeTaints.key.placeholder")
             }}
           </td>
@@ -50,6 +51,7 @@
               class="form-control input-sm"
               type="text"
               value=taint.value
+              disabled=taint.readonly
               placeholder=(t "formNodeTaints.value.placeholder")
             }}
           </td>
@@ -61,12 +63,14 @@
               classNames="form-control input-sm"
               content=effects
               value=taint.effect
+              disabled=taint.readonly
             }}
           </td>
 
           <td class="text-right">
             <button
               class="btn bg-primary btn-sm"
+              disabled={{taint.readonly}}
               {{action "removeTaint" taint}}
             >
               <i class="icon icon-minus"/>
diff --git a/lib/shared/addon/utils/constants.js b/lib/shared/addon/utils/constants.js
index 8ab4699d0..8077275a4 100644
--- a/lib/shared/addon/utils/constants.js
+++ b/lib/shared/addon/utils/constants.js
@@ -564,6 +564,12 @@ C.TAINT_PREFIX_TO_IGNORE = [
   'node-role.kubernetes.io/',
 ];
 
+C.READONLY_TAINT_PREFIX = [
+  'node-role.kubernetes.io/',
+  'node.kubernetes.io/',
+  'node.cloudprovider.kubernetes.io/'
+];
+
 C.LABEL_PREFIX_TO_IGNORE = [
   'io.cattle.lifecycle.',
   'beta.kubernetes.io/',

From 37dd827c04ee8af33b2be3b24826d72a48829761 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Fri, 30 Aug 2019 17:49:02 +0800
Subject: [PATCH 3/5] Sort display taints

---
 lib/shared/addon/mixins/cattle-transitioning-resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/shared/addon/mixins/cattle-transitioning-resource.js b/lib/shared/addon/mixins/cattle-transitioning-resource.js
index faeb131b9..79f72374b 100644
--- a/lib/shared/addon/mixins/cattle-transitioning-resource.js
+++ b/lib/shared/addon/mixins/cattle-transitioning-resource.js
@@ -725,6 +725,6 @@ export default Mixin.create({
         out.push(`${ get(taint, 'key') }${ get(taint, 'value') ? `=${ get(taint, 'value')  }` : '' }:${ get(taint, 'effect') }`);
       });
 
-    return out;
+    return out.sort();
   }),
 });

From 5b01163b1ba5fef78eacafbe589948bd7d16cb57 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Fri, 30 Aug 2019 18:05:55 +0800
Subject: [PATCH 4/5] Show role info in node detail view

---
 lib/monitoring/addon/node-detail/template.hbs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/monitoring/addon/node-detail/template.hbs b/lib/monitoring/addon/node-detail/template.hbs
index c16803205..eb2472061 100644
--- a/lib/monitoring/addon/node-detail/template.hbs
+++ b/lib/monitoring/addon/node-detail/template.hbs
@@ -3,10 +3,11 @@
     <h1 class="vertical-middle">
       {{t 'hostsPage.hostPage.header.title' name=model.node.displayName}}{{copy-to-clipboard clipboardText=model.node.displayName size="small"}}
     </h1>
-{{!--     <div class="vertical-middle">
-      <label class="acc-label vertical-middle p-0">{{t 'hostsPage.hostPage.hostname'}}:</label>
-      {{model.node.hostname}} {{copy-to-clipboard clipboardText=model.node.hostname size="small"}}
-    </div> --}}
+    {{#each model.node.displayRoles as |role|}}
+      <span class="badge badge-xs vertical-middle bg-info">
+        {{role}}
+      </span>
+    {{/each}}
   </div>
   <div class="right-buttons">
     {{badge-state model=model.node}}

From 6e5875ef9babdb697a1e88b289ee696f80d19cc8 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Fri, 30 Aug 2019 18:57:01 +0800
Subject: [PATCH 5/5] Show warning for node has disk pressure

---
 app/models/cluster.js                         | 42 ++++++++++++++++++-
 .../components/cluster-dashboard/template.hbs |  9 +---
 lib/monitoring/translations/en-us.yaml        |  4 ++
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/app/models/cluster.js b/app/models/cluster.js
index 19c184fec..06def7edb 100644
--- a/app/models/cluster.js
+++ b/app/models/cluster.js
@@ -10,6 +10,7 @@ import { resolve } from 'rsvp';
 import C from 'ui/utils/constants';
 import { isEmpty } from '@ember/utils';
 import moment from 'moment';
+const TRUE = 'True';
 
 export default Resource.extend(Grafana, ResourceUsage, {
   globalStore: service(),
@@ -274,11 +275,46 @@ export default Resource.extend(Grafana, ResourceUsage, {
     return get(this, 'nodes').filter( (n) => C.ACTIVEISH_STATES.indexOf(get(n, 'state')) === -1 );
   }),
 
-  displayWarnings: computed('provider', 'inactiveNodes.[]', 'unhealthyComponents.[]', function() {
+  unhealthyNodes: computed('nodes.@each.conditions', function() {
+    const out = [];
+
+    (get(this, 'nodes') || []).forEach((n) => {
+      const conditions = get(n, 'conditions');
+      const outOfDisk = conditions.find((c) => c.type === 'OutOfDisk');
+      const diskPressure = conditions.find((c) => c.type === 'DiskPressure');
+      const memoryPressure = conditions.find((c) => c.type === 'MemoryPressure');
+
+      if ( outOfDisk && get(outOfDisk, 'status') === TRUE ) {
+        out.push({
+          displayName: get(n, 'displayName'),
+          error:       'outOfDisk'
+        });
+      }
+
+      if ( diskPressure && get(diskPressure, 'status') === TRUE ) {
+        out.push({
+          displayName: get(n, 'displayName'),
+          error:       'diskPressure'
+        });
+      }
+
+      if ( memoryPressure && get(memoryPressure, 'status') === TRUE ) {
+        out.push({
+          displayName: get(n, 'displayName'),
+          error:       'memoryPressure'
+        });
+      }
+    });
+
+    return out;
+  }),
+
+  displayWarnings: computed('unhealthyNodes.[]', 'provider', 'inactiveNodes.[]', 'unhealthyComponents.[]', function() {
     const intl = get(this, 'intl');
     const out = [];
     const unhealthyComponents = get(this, 'unhealthyComponents') || [];
     const inactiveNodes = get(this, 'inactiveNodes') || [];
+    const unhealthyNodes = get(this, 'unhealthyNodes') || [];
     const provider = get(this, 'provider');
 
     const grayOut = C.GRAY_OUT_SCHEDULER_STATUS_PROVIDERS.indexOf(provider) > -1;
@@ -294,6 +330,10 @@ export default Resource.extend(Grafana, ResourceUsage, {
       out.pushObject(intl.t('clusterDashboard.alert.node', { node: get(node, 'displayName') }))
     });
 
+    unhealthyNodes.forEach((node) => {
+      out.pushObject(intl.t(`clusterDashboard.alert.nodeCondition.${ get(node, 'error') }`, { node: get(node, 'displayName') }))
+    });
+
     return out;
   }),
 
diff --git a/lib/monitoring/addon/components/cluster-dashboard/template.hbs b/lib/monitoring/addon/components/cluster-dashboard/template.hbs
index b6b52c82f..405901cbf 100644
--- a/lib/monitoring/addon/components/cluster-dashboard/template.hbs
+++ b/lib/monitoring/addon/components/cluster-dashboard/template.hbs
@@ -89,14 +89,9 @@
 
   {{#unless hideManagerAndSchedulerStatus}}
     <div class="row">
-      {{#each unhealthyComponents as |component|}}
+      {{#each cluster.displayWarnings as |warning|}}
         {{#banner-message icon="icon-alert" color="text-left bg-error mt-30"}}
-          <p>{{t "clusterDashboard.alert.component" component=component.name}}</p>
-        {{/banner-message}}
-      {{/each}}
-      {{#each inactiveNodes as |node|}}
-        {{#banner-message icon="icon-alert" color="text-left bg-error mt-30"}}
-          <p>{{t "clusterDashboard.alert.node" node=node.displayName}}</p>
+          <p>{{warning}}</p>
         {{/banner-message}}
       {{/each}}
     </div>
diff --git a/lib/monitoring/translations/en-us.yaml b/lib/monitoring/translations/en-us.yaml
index fa2be7cb5..68c37e063 100644
--- a/lib/monitoring/translations/en-us.yaml
+++ b/lib/monitoring/translations/en-us.yaml
@@ -86,6 +86,10 @@ clusterDashboard:
   alert:
     node: "Alert: Node {node} is not active."
     component: "Alert: Component {component} is unhealthy."
+    nodeCondition:
+      outOfDisk: "Alert: Node {node} is out of disk."
+      diskPressure: "Alert: Node {node} has disk pressure."
+      memoryPressure: "Alert: Node {node} has memory pressure."
   liveTitle: "{used} of {total} Used"
   reserved: Reserved