提交 9fbeb194 编写于 作者: R Rob Franken 提交者: GitHub

Add a info message that the memory usage graph includes caches (#1495)

* Add a info message that the memory usage graph includes caches

* talk about pods not containers

* cleanup some messages

* also add updated translations to messages

* pods don't contain pods
上级 db2abda5
此差异已折叠。
此差异已折叠。
......@@ -15,7 +15,12 @@ limitations under the License.
-->
<kd-content-card ng-if="$ctrl.shouldShowGraph()">
<kd-title>{{$ctrl.graphTitle}}</kd-title>
<kd-title>{{$ctrl.graphTitle}}
<span ng-if="::$ctrl.graphInfo">
<md-icon md-font-library="material-icons">info</md-icon>
<md-tooltip>{{::$ctrl.graphInfo}}</md-tooltip>
</span>
</kd-title>
<kd-content>
<kd-graph metrics="::$ctrl.selectedMetrics"></kd-graph>
</kd-content>
......
......@@ -73,6 +73,7 @@ export const graphCardComponent = {
bindings: {
'metrics': '<',
'graphTitle': '@',
'graphInfo': '@',
'selectedMetricNames': '<',
},
templateUrl: 'common/components/graph/graphcard.html',
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one daemon set.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this daemon set.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.daemonSetDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of daemon sets.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these daemon sets.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.daemonSetList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one deployment.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this deployment.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.deploymentDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of deployments.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these deployments.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.deploymentList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -14,17 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<div layout="row">
<kd-graph-card graph-title="[[CPU usage history|Title for graph card displaying CPU metric of horizontal pod autoscalers.]]"
metrics="::ctrl.horizontalPodAutoscalerList.cumulativeMetrics"
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage history|Title for graph card displaying memory metric of horizontal pod autoscalers.]]"
metrics="::ctrl.horizontalPodAutoscalerList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
</div>
<kd-content-card ng-if="!ctrl.shouldShowZeroState()">
<kd-content>
<kd-horizontal-pod-autoscaler-card-list horizontal-pod-autoscaler-list="::ctrl.horizontalPodAutoscalerList"
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one job.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this job.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.jobDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of jobs.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these jobs.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.jobList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -19,6 +19,7 @@ limitations under the License.
metrics="::ctrl.nodeDetail.metrics" selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one node.]]"
graph-info="[[The memory usage includes caches.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.nodeDetail.metrics" selected-metric-names="'memory/usage'">
</kd-graph-card>
</div>
......
......@@ -19,6 +19,7 @@ limitations under the License.
metrics="$ctrl.nodeList.cumulativeMetrics" selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of nodes.]]"
graph-info="[[The memory usage includes caches.|Help message detailing what is included in the memory usage]]"
metrics="$ctrl.nodeList.cumulativeMetrics" selected-metric-names="'memory/usage'">
</kd-graph-card>
</div>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one pod.]]"
graph-info="[[The memory usage includes the caches in this pod.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.podDetail.metrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of pods.]]"
graph-info="[[The memory usage includes the caches in these pods.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one replica set.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this replica set.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.replicaSetDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of replica sets.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these replica sets.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.replicaSetList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one replication controller.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this replication controller.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.replicationControllerDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of replication controllers.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these replication controllers.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.replicationControllerList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one stateful set.]]"
graph-info="[[The memory usage includes the caches in the pods managed by this stateful set.|Help message detailing what is included in the memory usage]]"
metrics="::ctrl.statefulSetDetail.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of stateful sets.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these stateful sets.|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.statefulSetList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
......@@ -20,6 +20,7 @@ limitations under the License.
selected-metric-names="'cpu/usage_rate'">
</kd-graph-card>
<kd-graph-card graph-title="[[Memory usage|Title for graph card displaying memory metric of one all resources.]]"
graph-info="[[The memory usage includes the caches in the pods managed by these resources. (Does not count pods double because it is mentioned both in the pod list and its controller is mentioned in e.g. a replica set.)|Help message detailing what is included in the memory usage]]"
metrics="::$ctrl.workloads.podList.cumulativeMetrics"
selected-metric-names="'memory/usage'">
</kd-graph-card>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册