From 72dd751e0149bd4ffdf1ff2e174f93dcf9c30eb2 Mon Sep 17 00:00:00 2001 From: loganhz Date: Sat, 9 Mar 2019 11:20:11 -0800 Subject: [PATCH 1/2] Add logic to switch from detail to summary if the number of hosts is greater than 10 https://github.com/rancher/rancher/issues/17038 --- .../components/cluster-dashboard-tabs/component.js | 5 +++++ .../components/cluster-dashboard-tabs/template.hbs | 14 +++++++------- lib/shared/addon/mixins/metrics.js | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/monitoring/addon/components/cluster-dashboard-tabs/component.js b/lib/monitoring/addon/components/cluster-dashboard-tabs/component.js index e42c4d39d..7d81aa7f4 100644 --- a/lib/monitoring/addon/components/cluster-dashboard-tabs/component.js +++ b/lib/monitoring/addon/components/cluster-dashboard-tabs/component.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; +import { get, computed } from '@ember/object'; import layout from './template'; import { inject as service } from '@ember/service'; @@ -9,4 +10,8 @@ export default Component.extend({ layout, classNames: 'row', + + largeScale: computed('scope.currentCluster.nodes.length', function() { + return get(this, 'scope.currentCluster.nodes.length') > 10; + }), }); diff --git a/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs b/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs index ba5491cbb..1a4fae590 100644 --- a/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs +++ b/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs @@ -5,38 +5,38 @@ grafanaUrl=scope.currentCluster.grafanaUrl title=(t "clusterDashboard.sections.cluster") }} - {{cluster-metrics}} + {{cluster-metrics largeScale=largeScale}} {{/metrics-summary}} {{#if scope.currentCluster.isRKE}} - {{#metrics-summary + {{#metrics-summary expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.etcdUrl classNames='mt-20' title=(t "clusterDashboard.sections.etcd") }} - {{etcd-metrics}} + {{etcd-metrics largeScale=largeScale}} {{/metrics-summary}} {{/if}} - {{#metrics-summary + {{#metrics-summary expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.k8sUrl classNames='mt-20' title=(t "clusterDashboard.sections.k8s") }} - {{k8s-metrics}} + {{k8s-metrics largeScale=largeScale}} {{/metrics-summary}} - {{#metrics-summary + {{#metrics-summary expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.rancherUrl classNames='mt-20 mb-20' title=(t "clusterDashboard.sections.rancher" appName=settings.appName) }} - {{rancher-metrics noDataLabel='clusterDashboard.noRancherComponents'}} + {{rancher-metrics largeScale=largeScale noDataLabel='clusterDashboard.noRancherComponents'}} {{/metrics-summary}} {{/accordion-list}} \ No newline at end of file diff --git a/lib/shared/addon/mixins/metrics.js b/lib/shared/addon/mixins/metrics.js index 27f9fa3b1..1bb6f554e 100644 --- a/lib/shared/addon/mixins/metrics.js +++ b/lib/shared/addon/mixins/metrics.js @@ -229,13 +229,14 @@ export default Mixin.create({ projectScope: false, metricParams: null, timeOutAnchor: null, + largeScale: false, init() { this._super(...arguments); set(this, 'state', { loading: false, - detail: true, + detail: !get(this, 'largeScale'), noGraphs: false, isCustom: false, from: null, From 15cd5d7be4c502fef99c5ad64064110fc5c69ad4 Mon Sep 17 00:00:00 2001 From: loganhz Date: Sat, 9 Mar 2019 11:23:30 -0800 Subject: [PATCH 2/2] Update template format --- .../addon/components/cluster-dashboard-tabs/template.hbs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs b/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs index 1a4fae590..2e04eebde 100644 --- a/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs +++ b/lib/monitoring/addon/components/cluster-dashboard-tabs/template.hbs @@ -13,7 +13,7 @@ expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.etcdUrl - classNames='mt-20' + classNames="mt-20" title=(t "clusterDashboard.sections.etcd") }} {{etcd-metrics largeScale=largeScale}} @@ -24,7 +24,7 @@ expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.k8sUrl - classNames='mt-20' + classNames="mt-20" title=(t "clusterDashboard.sections.k8s") }} {{k8s-metrics largeScale=largeScale}} @@ -34,9 +34,9 @@ expandAll=al.expandAll expandFn=expandFn grafanaUrl=grafana.rancherUrl - classNames='mt-20 mb-20' + classNames="mt-20 mb-20" title=(t "clusterDashboard.sections.rancher" appName=settings.appName) }} - {{rancher-metrics largeScale=largeScale noDataLabel='clusterDashboard.noRancherComponents'}} + {{rancher-metrics largeScale=largeScale noDataLabel="clusterDashboard.noRancherComponents"}} {{/metrics-summary}} {{/accordion-list}} \ No newline at end of file