diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index c84ae3ad950..0906c2fb345 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -1,4 +1,16 @@ { + "MEMORY": "MEMORY", + "CPU": "CPU", + "STORAGE": "STORAGE USED", + "STORAGE_ALLOCATED": "STORAGE ALLOCATED", + "VIRTUAL_NETWORK_PUBLIC_IP": "PUBLIC IP", + "PRIVATE_IP": "MANAGEMENT IP", + "DIRECT_ATTACHED_PUBLIC_IP": "SHARED NETWORK IP", + "SECONDARY_STORAGE": "SECONDARY STORAGE", + "CAPACITY_TYPE_LOCAL_STORAGE": "LOCAL STORAGE", + "VLAN": "VLAN/VNI", + "GPU": "GPU", + "CPU_CORE": "CPU CORES", "Accounts": "Accounts", "Affinity Groups": "Affinity Groups", "Alerts": "Alerts", diff --git a/ui/src/views/dashboard/CapacityDashboard.vue b/ui/src/views/dashboard/CapacityDashboard.vue index f3081d89de3..c125ad461b6 100644 --- a/ui/src/views/dashboard/CapacityDashboard.vue +++ b/ui/src/views/dashboard/CapacityDashboard.vue @@ -64,10 +64,15 @@ :key="stat.type">
-

{{ stat.name }}

- +

{{ $t(stat.name) }}

+
- +
@@ -134,6 +139,30 @@ export default { }, 1000) }, methods: { + getStatus (value) { + if (value > 85) { + return 'exception' + } + if (value > 75) { + return 'active' + } + return 'normal' + }, + displayData (dataType, value) { + switch (dataType) { + case 'CPU': + value = parseFloat(value / 1000.0, 10).toFixed(2) + ' GHz' + break + case 'MEMORY': + case 'STORAGE': + case 'STORAGE_ALLOCATED': + case 'SECONDARY_STORAGE': + case 'CAPACITY_TYPE_LOCAL_STORAGE': + value = parseFloat(value / (1024 * 1024 * 1024.0), 10).toFixed(2) + ' GB' + break + } + return value + }, fetchData () { this.listZones() this.listEvents()