diff --git a/i18n/messages-en.xtb b/i18n/messages-en.xtb index 5006f48ad5a22a4dc58fe8a410b04fee3b7fb90d..0d5d8ad14e1ff37019ac9c4e504d6ec522a7a8a4 100644 --- a/i18n/messages-en.xtb +++ b/i18n/messages-en.xtb @@ -118,6 +118,7 @@ There are currently no Services with the same label selector as this Daemon Set. There is nothing to display here There are currently no Pods scheduled on this Daemon Set. + The memory usage includes the caches in the pods managed by this daemon set. Details Name Pods status @@ -147,6 +148,7 @@ Daemon Set CPU usage Memory usage + The memory usage includes the caches in the pods managed by these daemon sets. Created at Deployment CPU usage @@ -159,6 +161,7 @@ There is nothing to display here This Deployment does not have any old replica sets There is nothing to display here + The memory usage includes the caches in the pods managed by this deployment. Details Name Max surge: {{ $ctrl.deployment.rollingUpdateStrategy.maxSurge}} @@ -189,6 +192,7 @@ Deployment CPU usage Memory usage + The memory usage includes the caches in the pods managed by these deployments. Created at No Would you like to deploy anyway? @@ -389,6 +393,7 @@ Memory usage There is nothing to display here There are currently no Pods managed by this Job. + The memory usage includes the caches in the pods managed by this job. Details Details active @@ -413,6 +418,7 @@ Job CPU usage Memory usage + The memory usage includes the caches in the pods managed by these jobs. Logs from in Logs from @@ -437,6 +443,7 @@ Memory usage There is nothing to display here There are currently no Pods scheduled on this Node. + The memory usage includes caches. Details Phase Kernel Version @@ -461,6 +468,7 @@ Age CPU usage Memory usage + The memory usage includes caches. Created at No error data available Persistent Volume Claim @@ -562,6 +570,7 @@ Unknown creator CPU usage Memory usage + The memory usage includes the caches in this pod. Details Status View logs @@ -589,6 +598,7 @@ Pod CPU usage Memory usage + The memory usage includes the caches in these pods. Terminated: Waiting: Started at UTC @@ -605,6 +615,7 @@ There are currently no Services with the same label selector as this Replica Set. There is nothing to display here There are currently no Horizontal Pod Autoscalers targeting this Replica Set. + The memory usage includes the caches in the pods managed by this replica set. Details Selector {{::$ctrl.replicaSet.podInfo.running}} running @@ -634,6 +645,7 @@ Replica Set CPU usage Memory usage + The memory usage includes the caches in the pods managed by these replica sets. Edit number of pods Scale Replication Controller @@ -645,6 +657,7 @@ There are currently no Pods managed by this Replication Controller. There is nothing to display here There are currently no Horizontal Pod Autoscalers targeting this Replica Set. + The memory usage includes the caches in the pods managed by this replication controller. Details Label selector {{::$ctrl.replicationController.podInfo.failed}} failed @@ -689,6 +702,7 @@ Replication Controller CPU usage Memory usage + The memory usage includes the caches in the pods managed by these replication controllers. Created at Resource limits Type @@ -741,6 +755,7 @@ Memory usage There is nothing to display here There are currently no Pods managed by this Stateful Set. + The memory usage includes the caches in the pods managed by this stateful set. Details Labels {{ $ctrl.statefulSet.podInfo.failed}} failed @@ -768,6 +783,7 @@ Stateful Set CPU usage Memory usage + The memory usage includes the caches in the pods managed by these stateful sets. Created at - days @@ -785,4 +801,5 @@ Unknown Server Error CPU usage Memory usage + 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.) diff --git a/i18n/messages-ja.xtb b/i18n/messages-ja.xtb index ac6d0d4eb10e2e2226996df3ee8ac811cf5afc24..28a0a59725507277d057576acca15b0e1f1b652d 100644 --- a/i18n/messages-ja.xtb +++ b/i18n/messages-ja.xtb @@ -170,6 +170,7 @@ このデーモンセットと同じラベルセレクターのサービスはありません ポッド このデーモンセットにスケジュールされたポッドはありません + The memory usage includes the caches in the pods managed by this daemon set. 表示するものがありません このデーモンセットにスケジュールされたポッドはありません 詳細 @@ -211,6 +212,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these daemon sets. CPU使用量の履歴 イベント メモリー使用量の履歴 @@ -263,6 +265,7 @@ このデプロイメントに古いレプリカセットはありません 表示するものがありません 水平ポッドオートスケーラー + The memory usage includes the caches in the pods managed by this deployment. 表示するものがありません 詳細 名前 @@ -303,6 +306,7 @@ CPU使用量の履歴 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these deployments. デプロイメント CPU使用量の履歴 詳細 @@ -600,6 +604,7 @@ ポッド このジョブに管理されているポッドはありません。 表示するものがありません + The memory usage includes the caches in the pods managed by this job. このジョブに選択されたポッドはありません。 リソース詳細 詳細 @@ -636,6 +641,7 @@ CPU使用量の履歴 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these jobs. 完了 詳細 CPU使用量の履歴 @@ -755,6 +761,7 @@ このノードにスケジュールされたポッドはありません。 表示するものがありません このノードにスケジュールされたポッドはありません + The memory usage includes caches. 詳細 段階 カーネルバージョン @@ -788,6 +795,7 @@ CPU使用量の履歴 メモリー使用量 メモリー使用量の履歴 + The memory usage includes caches. CPU 上限(コア数) CPU 要件(コア数) 割り当てリソース @@ -1054,6 +1062,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in this pod. ポッド 詳細 状態 @@ -1097,6 +1106,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in these pods. 1つ以上のポッドがエラーです。 1つ以上のポッドが待機状態です。 ポッド @@ -1248,6 +1258,7 @@ このレプリカセットをターゲットとしている水平ポッドオートスケーラーはありません。 表示するものがありません このレプリカセットをターゲットとしている水平ポッドオートスケーラーはありません。 + The memory usage includes the caches in the pods managed by this replica set. 詳細 セレクター {{::$ctrl.replicaSet.podInfo.running}} 起動中 @@ -1289,6 +1300,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these replica sets. ポッド数の編集 スケール レプリケーションコントローラ @@ -1310,6 +1322,7 @@ このレプリカセットをターゲットとしている水平ポッドオートスケーラーはありません。 表示するものがありません このレプリケーションコントローラに選択されたポッドはありません。 + The memory usage includes the caches in the pods managed by this replication controller. このレプリカセットをターゲットとしている水平ポッドオートスケーラーはありません。 詳細 ラベルセレクター @@ -1367,6 +1380,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these replication controllers. CPU使用量の履歴 メモリー使用量の履歴 CPU使用量の履歴 @@ -1523,6 +1537,7 @@ There are currently no Pods managed by this Stateful Set. There are currently no Pods managed by this Stateful Set. 表示するものがありません + The memory usage includes the caches in the pods managed by this stateful set. このステートフルセットに選択されたポッドはありません。 詳細 ラベル @@ -1561,6 +1576,7 @@ CPU使用量 メモリー使用量 メモリー使用量の履歴 + The memory usage includes the caches in the pods managed by these stateful sets. に作成 - @@ -1592,6 +1608,7 @@ メモリー使用量 すべてのリソースのCPUメトリックを表示するグラフカードタイトル デーモンセット + 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.) デプロイメント ステートフルセット ペットセット diff --git a/src/app/frontend/common/components/graph/graphcard.html b/src/app/frontend/common/components/graph/graphcard.html index e254c52a7fab311bd34330bb50521f53e972e24c..7f0c2b653a613483585bb1c533102ef84aac3ecf 100644 --- a/src/app/frontend/common/components/graph/graphcard.html +++ b/src/app/frontend/common/components/graph/graphcard.html @@ -15,7 +15,12 @@ limitations under the License. --> - {{$ctrl.graphTitle}} + {{$ctrl.graphTitle}} + + info + {{::$ctrl.graphInfo}} + + diff --git a/src/app/frontend/common/components/graph/graphcard_component.js b/src/app/frontend/common/components/graph/graphcard_component.js index d44e86b62e259c0cdff7987426e98e151017ef09..349ad8d3c3bbfc56fe06faba069841d76a83175c 100644 --- a/src/app/frontend/common/components/graph/graphcard_component.js +++ b/src/app/frontend/common/components/graph/graphcard_component.js @@ -73,6 +73,7 @@ export const graphCardComponent = { bindings: { 'metrics': '<', 'graphTitle': '@', + 'graphInfo': '@', 'selectedMetricNames': '<', }, templateUrl: 'common/components/graph/graphcard.html', diff --git a/src/app/frontend/daemonsetdetail/daemonsetdetail.html b/src/app/frontend/daemonsetdetail/daemonsetdetail.html index b25ef35be481b67327f93f3621d151fb3e210372..9f27f9f66cddf5031a6ea6531b77ce68987d6801 100644 --- a/src/app/frontend/daemonsetdetail/daemonsetdetail.html +++ b/src/app/frontend/daemonsetdetail/daemonsetdetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/daemonsetlist/daemonsetlist.html b/src/app/frontend/daemonsetlist/daemonsetlist.html index 3ebdf2aa9c3f7bd8d90fa50b56ae0ed71c66a8ae..e5365f0bc4be1d272cae1c54f41375914ad95997 100644 --- a/src/app/frontend/daemonsetlist/daemonsetlist.html +++ b/src/app/frontend/daemonsetlist/daemonsetlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/deploymentdetail/deploymentdetail.html b/src/app/frontend/deploymentdetail/deploymentdetail.html index 00736b9ce848aeb97863ed31281f84a9bfb2b299..4a4c9d156b7965fda4ebff8f5ca61edae85e26db 100644 --- a/src/app/frontend/deploymentdetail/deploymentdetail.html +++ b/src/app/frontend/deploymentdetail/deploymentdetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/deploymentlist/deploymentlist.html b/src/app/frontend/deploymentlist/deploymentlist.html index e90ade0924074fd546a0c6668c4e4d94be65f7e2..46c272432d3c4050dc264a3c82a1b3af13bb03d9 100644 --- a/src/app/frontend/deploymentlist/deploymentlist.html +++ b/src/app/frontend/deploymentlist/deploymentlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalerlist.html b/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalerlist.html index 20e2e2e8afc6041341557f41139af30bcc694f69..be77001d57083db8fdf7339f6c532db5150d0e7d 100644 --- a/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalerlist.html +++ b/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalerlist.html @@ -14,17 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -
- - - - -
- diff --git a/src/app/frontend/joblist/joblist.html b/src/app/frontend/joblist/joblist.html index ef2039e1ce91d87b31e330590d9b03d0d7fe76d2..e9c7b2a17e7b159032f7b3576d2ad576af09977a 100644 --- a/src/app/frontend/joblist/joblist.html +++ b/src/app/frontend/joblist/joblist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/nodedetail/nodedetail.html b/src/app/frontend/nodedetail/nodedetail.html index 694fd5f44d83bedf19dd323f08f7931e8124622a..9c42f9ec9398d8dcbf19df564428c5c9acd67519 100644 --- a/src/app/frontend/nodedetail/nodedetail.html +++ b/src/app/frontend/nodedetail/nodedetail.html @@ -19,6 +19,7 @@ limitations under the License. metrics="::ctrl.nodeDetail.metrics" selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/nodelist/nodelist.html b/src/app/frontend/nodelist/nodelist.html index c40aca3f013cd6ff919d73ca29616c04b1ebe29c..f8fd8e4f0c699f6fdd181a66ef3b75746454e2e5 100644 --- a/src/app/frontend/nodelist/nodelist.html +++ b/src/app/frontend/nodelist/nodelist.html @@ -19,6 +19,7 @@ limitations under the License. metrics="$ctrl.nodeList.cumulativeMetrics" selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/poddetail/poddetail.html b/src/app/frontend/poddetail/poddetail.html index b43fde0d919c1f5275cc17a618ee19905c0ac6c3..fe84287170ec1e283b2a5186c55bd129a2243b6f 100644 --- a/src/app/frontend/poddetail/poddetail.html +++ b/src/app/frontend/poddetail/poddetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/podlist/podlist.html b/src/app/frontend/podlist/podlist.html index 5eb9f326c2178086f2cf5f7b630d782ab0f09ab6..ed21e9205aced92ae7bed6b1b66a44c1a2eeef3c 100644 --- a/src/app/frontend/podlist/podlist.html +++ b/src/app/frontend/podlist/podlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/replicasetdetail/replicasetdetail.html b/src/app/frontend/replicasetdetail/replicasetdetail.html index 153cb8b02ad80820fea98cf019bb4db2e0b3677a..a4bc92505d8ead04a26ed907df15794910c53ee2 100644 --- a/src/app/frontend/replicasetdetail/replicasetdetail.html +++ b/src/app/frontend/replicasetdetail/replicasetdetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/replicasetlist/replicasetlist.html b/src/app/frontend/replicasetlist/replicasetlist.html index 80ce72558e8ba6ae0303d6daa2f8cddca333a5f1..b23f2147652ec504e81a1089f5af23aca481488a 100644 --- a/src/app/frontend/replicasetlist/replicasetlist.html +++ b/src/app/frontend/replicasetlist/replicasetlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html b/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html index 40974f8cc37f1f0a375dcc98fb8367251aaf3670..b9cf5d6add984f1f176c39bb74c034650b710f68 100644 --- a/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html +++ b/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/replicationcontrollerlist/replicationcontrollerlist.html b/src/app/frontend/replicationcontrollerlist/replicationcontrollerlist.html index 9df662e4fe197bd813172b8f1426f371dc50edb1..b5bcff0747cef80004e79664310be7185731c461 100644 --- a/src/app/frontend/replicationcontrollerlist/replicationcontrollerlist.html +++ b/src/app/frontend/replicationcontrollerlist/replicationcontrollerlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/statefulsetdetail/statefulsetdetail.html b/src/app/frontend/statefulsetdetail/statefulsetdetail.html index c41f6cb554f7cf42ea1426fabbcba27ec38524df..2668ef002afa999d11ed29ce810d196e072321a7 100644 --- a/src/app/frontend/statefulsetdetail/statefulsetdetail.html +++ b/src/app/frontend/statefulsetdetail/statefulsetdetail.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/statefulsetlist/statefulsetlist.html b/src/app/frontend/statefulsetlist/statefulsetlist.html index f59b2e5f160d097eb029d295492a5e820e399f7a..f4198e2b30c861cbd14b27ccb58063fde9576bf6 100644 --- a/src/app/frontend/statefulsetlist/statefulsetlist.html +++ b/src/app/frontend/statefulsetlist/statefulsetlist.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'"> diff --git a/src/app/frontend/workloads/workloads.html b/src/app/frontend/workloads/workloads.html index 2a378bfccf7cc9bb65469e3858ba18932e248354..bb9fef6e087354c78a2027c71208fdecb625ad6b 100644 --- a/src/app/frontend/workloads/workloads.html +++ b/src/app/frontend/workloads/workloads.html @@ -20,6 +20,7 @@ limitations under the License. selected-metric-names="'cpu/usage_rate'">