Merge branch 'master' onto working copy

1 files changed, 48 insertions, 2 deletions

diff --git a/frontend/src/util/available-metrics.js b/frontend/src/util/available-metrics.js
index c8035ddd..ed11f5f7 100644
--- a/frontend/src/util/available-metrics.js
+++ b/frontend/src/util/available-metrics.js
@@ -1,4 +1,50 @@
 export const AVAILABLE_METRICS = [
-    'granted-cpu',
-    'overcommitted-cpu',
+    'total_overcommitted_burst',
+    'total_power_draw',
+    'total_failure_vm_slices',
+    'total_granted_burst',
+    'total_interfered_burst',
+    'total_requested_burst',
+    'mean_cpu_usage',
+    'mean_cpu_demand',
+    'mean_num_deployed_images',
+    'max_num_deployed_images',
+    'total_vms_submitted',
+    'total_vms_queued',
+    'total_vms_finished',
+    'total_vms_failed',
 ]
+
+export const METRIC_NAMES = {
+    total_overcommitted_burst: 'Overcomm. 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 Num. Deployed Images Per Host',
+    max_num_deployed_images: 'Max. Num. Deployed Images Per Host',
+    total_failure_vm_slices: 'Total Num. Failed VM Slices',
+    total_vms_submitted: 'Total Num. VMs Submitted',
+    total_vms_queued: 'Max. Num. VMs Queued',
+    total_vms_finished: 'Max. Num. VMs Finished',
+    total_vms_failed: 'Max. Num. VMs Failed',
+}
+
+export const METRIC_UNITS = {
+    total_overcommitted_burst: 'MFLOP',
+    total_granted_burst: 'MFLOP',
+    total_requested_burst: 'MFLOP',
+    total_interfered_burst: 'MFLOP',
+    total_power_draw: 'Wh',
+    mean_cpu_usage: 'MHz',
+    mean_cpu_demand: 'MHz',
+    mean_num_deployed_images: 'VMs',
+    max_num_deployed_images: 'VMs',
+    total_failure_vm_slices: 'VM Slices',
+    total_vms_submitted: 'VMs',
+    total_vms_queued: 'VMs',
+    total_vms_finished: 'VMs',
+    total_vms_failed: 'VMs',
+}