2 files changed, 74 insertions, 1 deletions

diff --git a/frontend/src/util/available-metrics.js b/frontend/src/util/available-metrics.js
index ed11f5f7..807bc0c1 100644
--- a/frontend/src/util/available-metrics.js
+++ b/frontend/src/util/available-metrics.js
@@ -15,7 +15,7 @@ export const AVAILABLE_METRICS = [
     'total_vms_failed',
 ]
 
-export const METRIC_NAMES = {
+export const METRIC_NAMES_SHORT = {
     total_overcommitted_burst: 'Overcomm. CPU Cycles',
     total_granted_burst: 'Granted CPU Cycles',
     total_requested_burst: 'Requested CPU Cycles',
@@ -32,6 +32,23 @@ export const METRIC_NAMES = {
     total_vms_failed: 'Max. Num. VMs Failed',
 }
 
+export const METRIC_NAMES = {
+    total_overcommitted_burst: 'Overcommitted CPU Cycles',
+    total_granted_burst: 'Granted CPU Cycles',
+    total_requested_burst: 'Requested CPU Cycles',
+    total_interfered_burst: 'Interfered CPU Cycles',
+    total_power_draw: 'Total Power Consumption',
+    mean_cpu_usage: 'Mean Host CPU Usage',
+    mean_cpu_demand: 'Mean Host CPU Demand',
+    mean_num_deployed_images: 'Mean Number of Deployed Images Per Host',
+    max_num_deployed_images: 'Maximum Number Deployed Images Per Host',
+    total_failure_vm_slices: 'Total Number Failed VM Slices',
+    total_vms_submitted: 'Total Number VMs Submitted',
+    total_vms_queued: 'Maximum Number VMs Queued',
+    total_vms_finished: 'Maximum Number VMs Finished',
+    total_vms_failed: 'Maximum Number VMs Failed',
+}
+
 export const METRIC_UNITS = {
     total_overcommitted_burst: 'MFLOP',
     total_granted_burst: 'MFLOP',
diff --git a/frontend/src/util/unit-specifications.js b/frontend/src/util/unit-specifications.js
index 43c45b7e..28479edd 100644
--- a/frontend/src/util/unit-specifications.js
+++ b/frontend/src/util/unit-specifications.js
@@ -13,6 +13,27 @@ export const CPU_UNITS = {
         numberOfCores: 2,
         energyConsumptionW: 50,
     },
+    'cpu-3': {
+        _id: 'cpu-3',
+        name: 'Intel® Xeon® E-2224G',
+        clockRateMhz: 3500,
+        numberOfCores: 4,
+        energyConsumptionW: 71,
+    },
+    'cpu-4': {
+        _id: 'cpu-4',
+        name: 'Intel® Xeon® E-2244G',
+        clockRateMhz: 3800,
+        numberOfCores: 8,
+        energyConsumptionW: 71,
+    },
+    'cpu-5': {
+        _id: 'cpu-5',
+        name: 'Intel® Xeon® E-2246G',
+        clockRateMhz: 3600,
+        numberOfCores: 12,
+        energyConsumptionW: 80,
+    },
 }
 
 export const GPU_UNITS = {
@@ -23,6 +44,13 @@ export const GPU_UNITS = {
         numberOfCores: 200,
         energyConsumptionW: 250,
     },
+    'gpu-2': {
+        _id: 'gpu-2',
+        name: 'NVIDIA Tesla V100',
+        clockRateMhz: 1200,
+        numberOfCores: 5120,
+        energyConsumptionW: 250,
+    },
 }
 
 export const MEMORY_UNITS = {
@@ -33,6 +61,27 @@ export const MEMORY_UNITS = {
         sizeMb: 4000,
         energyConsumptionW: 10,
     },
+    'memory-2': {
+        _id: 'memory-2',
+        name: 'Samsung PC DRAM M393A2K43BB1-CRC',
+        speedMbPerS: 2400,
+        sizeMb: 16000,
+        energyConsumptionW: 10,
+    },
+    'memory-3': {
+        _id: 'memory-3',
+        name: 'Crucial MTA18ASF4G72PDZ-3G2E1',
+        speedMbPerS: 3200,
+        sizeMb: 32000,
+        energyConsumptionW: 10,
+    },
+    'memory-4': {
+        _id: 'memory-4',
+        name: 'Crucial MTA9ASF2G72PZ-3G2E1',
+        speedMbPerS: 3200,
+        sizeMb: 16000,
+        energyConsumptionW: 10,
+    },
 }
 
 export const STORAGE_UNITS = {
@@ -43,4 +92,11 @@ export const STORAGE_UNITS = {
         sizeMb: 250000,
         energyConsumptionW: 10,
     },
+    'storage-2': {
+        _id: 'storage-2',
+        name: 'Western Digital MTA9ASF2G72PZ-3G2E1',
+        speedMbPerS: 6000,
+        sizeMb: 4000000,
+        energyConsumptionW: 10,
+    },
 }