shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #3718: Fix paths for monitoring graphs

Browse Source
This commit is contained in:
Daniel Molina 2015-07-07 16:41:33 +02:00
parent fc5e264e99
commit 692860393e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sunstone/public/app/tabs/provision-tab/vms/list.js
View File

@ -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",

6
src/sunstone/public/app/tabs/vms-tab/panels/capacity.js
View File

@ -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")

10
src/sunstone/public/app/tabs/vms-tab/panels/network.js
View File

@ -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",