From 692860393ed19345b90dd6760e70788554ce84c3 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 7 Jul 2015 16:41:33 +0200
Subject: [PATCH] feature #3718: Fix paths for monitoring graphs

---
 .../public/app/tabs/provision-tab/vms/list.js      | 14 +++++++-------
 .../public/app/tabs/vms-tab/panels/capacity.js     |  6 +++---
 .../public/app/tabs/vms-tab/panels/network.js      | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
index 44e1c947a2..5e0eb741f7 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
@@ -376,40 +376,40 @@ define(function(require) {
               timeout: true,
               id: data.ID,
               monitor: {
-                monitor_resources : "CPU,MEMORY,NET_TX,NET_RX"
+                monitor_resources : "MONITORING/CPU,MONITORING/MEMORY,MONITORING/NETTX,MONITORING/NETRX"
               }
             },
             success: function(request, response){
               var vm_graphs = [
                   {
-                      monitor_resources : "CPU",
+                      monitor_resources : "MONITORING/CPU",
                       labels : "Real CPU",
                       humanize_figures : false,
                       div_graph : $(".vm_cpu_graph", context)
                   },
                   {
-                      monitor_resources : "MEMORY",
+                      monitor_resources : "MONITORING/MEMORY",
                       labels : "Real MEM",
                       humanize_figures : true,
                       div_graph : $(".vm_memory_graph", context)
                   },
                   {
                       labels : "Network reception",
-                      monitor_resources : "NET_RX",
+                      monitor_resources : "MONITORING/NETRX",
                       humanize_figures : true,
                       convert_from_bytes : true,
                       div_graph : $(".vm_net_rx_graph", context)
                   },
                   {
                       labels : "Network transmission",
-                      monitor_resources : "NET_TX",
+                      monitor_resources : "MONITORING/NETTX",
                       humanize_figures : true,
                       convert_from_bytes : true,
                       div_graph : $(".vm_net_tx_graph", context)
                   },
                   {
                       labels : "Network reception speed",
-                      monitor_resources : "NET_RX",
+                      monitor_resources : "MONITORING/NETRX",
                       humanize_figures : true,
                       convert_from_bytes : true,
                       y_sufix : "B/s",
@@ -418,7 +418,7 @@ define(function(require) {
                   },
                   {
                       labels : "Network transmission speed",
-                      monitor_resources : "NET_TX",
+                      monitor_resources : "MONITORING/NETTX",
                       humanize_figures : true,
                       convert_from_bytes : true,
                       y_sufix : "B/s",
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js b/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js
index 70f515d468..7643b266b8 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js
@@ -87,19 +87,19 @@ define(function(require) {
       data: {
         id: that.element.ID,
         monitor: {
-          monitor_resources : "CPU,MEMORY"
+          monitor_resources : "MONITORING/CPU,MONITORING/MEMORY"
         }
       },
       success: function(req, response) {
         var vmGraphs = [
           {
-            monitor_resources : "CPU",
+            monitor_resources : "MONITORING/CPU",
             labels : Locale.tr("Real CPU"),
             humanize_figures : false,
             div_graph : $(".vm_cpu_graph")
           },
           {
-            monitor_resources : "MEMORY",
+            monitor_resources : "MONITORING/MEMORY",
             labels : Locale.tr("Real MEM"),
             humanize_figures : true,
             div_graph : $(".vm_memory_graph")
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/network.js b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
index 3e3e9133a1..7acf64a23d 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/network.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
@@ -363,28 +363,28 @@ define(function(require) {
         data: {
           id: that.element.ID,
           monitor: {
-            monitor_resources : "NET_TX,NET_RX"
+            monitor_resources : "MONITORING/NETTX,MONITORING/NETRX"
           }
         },
         success: function(req, response) {
           var vmGraphs = [
             {
               labels : Locale.tr("Network reception"),
-              monitor_resources : "NET_RX",
+              monitor_resources : "MONITORING/NETRX",
               humanize_figures : true,
               convert_from_bytes : true,
               div_graph : $("#vm_net_rx_graph")
             },
             {
               labels : Locale.tr("Network transmission"),
-              monitor_resources : "NET_TX",
+              monitor_resources : "MONITORING/NETTX",
               humanize_figures : true,
               convert_from_bytes : true,
               div_graph : $("#vm_net_tx_graph")
             },
             {
               labels : Locale.tr("Network reception speed"),
-              monitor_resources : "NET_RX",
+              monitor_resources : "MONITORING/NETRX",
               humanize_figures : true,
               convert_from_bytes : true,
               y_sufix : "B/s",
@@ -393,7 +393,7 @@ define(function(require) {
             },
             {
               labels : Locale.tr("Network transmission speed"),
-              monitor_resources : "NET_TX",
+              monitor_resources : "MONITORING/NETTX",
               humanize_figures : true,
               convert_from_bytes : true,
               y_sufix : "B/s",