diff --git a/ui/package-lock.json b/ui/package-lock.json
index 6e8f81678cc..781e8018ac0 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -5050,9 +5050,9 @@
"dev": true
},
"ant-design-vue": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.4.tgz",
- "integrity": "sha512-ASRR/rn+ONAeNWd96MzCpReZa4177fdwEBHpgPc/L0Bj/1EakJNN54JacKVXCXxnJt0VI2UXByfgUibpnOQwRQ==",
+ "version": "1.4.6",
+ "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.6.tgz",
+ "integrity": "sha512-01bgC8PM9zh4O5Xf6EHtrk6k3Erup+foVn56tRskQPBf634NhqKxvpKvjQqxeXQNhkCxFYJBO6eWT7gZeHSgUw==",
"requires": {
"@ant-design/icons": "^2.1.1",
"@ant-design/icons-vue": "^2.0.0",
@@ -8040,9 +8040,9 @@
}
},
"core-js": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz",
- "integrity": "sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg=="
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.2.tgz",
+ "integrity": "sha512-bUTfqFWtNKWp73oNIfRkqwYZJeNT3lstzZcAkhhiuvDraRSgOH1/+F9ZklbpR4zpdKuo4cpXN8tKP7s61yjX+g=="
},
"core-js-compat": {
"version": "3.4.1",
diff --git a/ui/package.json b/ui/package.json
index e10e713af90..03c00ea6b0d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -38,9 +38,9 @@
"@fortawesome/free-regular-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/vue-fontawesome": "^0.1.8",
- "ant-design-vue": "~1.4.4",
+ "ant-design-vue": "~1.4.6",
"axios": "^0.19.0",
- "core-js": "^3.4.1",
+ "core-js": "^3.4.2",
"enquire.js": "^2.1.6",
"js-cookie": "^2.2.1",
"lodash.get": "^4.4.2",
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index abbd4af2183..ad190b0ee94 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -80,8 +80,10 @@
-
-
{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz
+
+
+
{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz
+
{{ resource.cputotal }}
@@ -116,17 +118,39 @@
:percent="Number(parseFloat(100.0 * (resource.memorykbs - resource.memoryintfreekbs) / resource.memorykbs).toFixed(2))" />
-
-
{{ parseFloat(resource.memorytotal / (1024.0 * 1024.0 * 1024.0)).toFixed(2) }} GB Memory
+
+
{{ resource.memorytotalgb }} Memory
{{ $t('memoryusedgb') }}
+ :percent="Number(parseFloat(100.0 * parseFloat(resource.memoryusedgb) / parseFloat(resource.memorytotalgb)).toFixed(2))" />
+
+
+ {{ $t('memoryallocatedgb') }}
+
+
+
+
+
{{ resource.memorytotal }} Memory
+
+ {{ $t('memoryused') }}
+
+ :percent="parseFloat(resource.memoryallocated)" />
-
-
{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage
+
+
+
{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage
+
{{ resource.sizegb }}
Read {{ toSize(resource.diskkbsread) }}
Write {{ toSize(resource.diskkbswrite) }}
@@ -147,6 +173,28 @@
Write (IO) {{ resource.diskiowrite }}
+
+
{{ resource.disksizetotalgb }}
+
+ {{ $t('disksizeusedgb') }}
+
+
+
+ {{ $t('disksizeallocatedgb') }}
+
+
+
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index ba12345572a..a4b07a15639 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -34,7 +34,7 @@
-
+
{{ text }}
{{ text }}
diff --git a/ui/src/components/widgets/Console.vue b/ui/src/components/widgets/Console.vue
index 1c3c2ef65d2..daed176e533 100644
--- a/ui/src/components/widgets/Console.vue
+++ b/ui/src/components/widgets/Console.vue
@@ -20,7 +20,7 @@
v-if="['vm', 'systemvm', 'router'].includes($route.meta.name)"
:href="'/client/console?cmd=access&vm=' + resource.id"
target="_blank">
-
+
diff --git a/ui/src/views/dashboard/CapacityDashboard.vue b/ui/src/views/dashboard/CapacityDashboard.vue
index 6ba80be24af..930fddc5a01 100644
--- a/ui/src/views/dashboard/CapacityDashboard.vue
+++ b/ui/src/views/dashboard/CapacityDashboard.vue
@@ -63,9 +63,7 @@
-
-
-
+