proxmox-mirrors/pmg-gui
1
0
Fork 0
mirror of https://git.proxmox.com/git/pmg-gui synced 2025-08-07 17:13:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

normalize the dashboard graph to per minute

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-10-12 10:09:29 +02:00 committed by Dietmar Maurer
parent c407e16892
commit b79fbba8e4
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
js/Dashboard.js
View File

@ -77,7 +77,8 @@ Ext.define('PMG.Dashboard', {
records.forEach(function(item) { records.forEach(function(item) {
bytes_in += item.data.bytes_in; bytes_in += item.data.bytes_in;
bytes_out += item.data.bytes_out; bytes_out += item.data.bytes_out;
count += item.data.count; // unnormalize
count += (item.data.count*item.data.timespan)/60;
ptime += item.data.ptimesum; ptime += item.data.ptimesum;
}); });
@ -189,14 +190,38 @@ Ext.define('PMG.Dashboard', {
} }
}, },
fields: [ fields: [
{ type: 'integer', name: 'count' }, {
{ type: 'integer', name: 'count_in' }, type: 'number', name: 'count',
{ type: 'integer', name: 'count_out' }, convert: PMG.Utils.convert_field_to_per_min
{ type: 'integer', name: 'spam' }, },
{ type: 'integer', name: 'spam_in' }, {
{ type: 'integer', name: 'spam_out' }, type: 'number', name: 'count_in',
{ type: 'integer', name: 'virus' }, convert: PMG.Utils.convert_field_to_per_min
{ type: 'integer', name: 'virus_in' }, },
{
type: 'number', name: 'count_out',
convert: PMG.Utils.convert_field_to_per_min
},
{
type: 'number', name: 'spam',
convert: PMG.Utils.convert_field_to_per_min
},
{
type: 'number', name: 'spam_in',
convert: PMG.Utils.convert_field_to_per_min
},
{
type: 'number', name: 'spam_out',
convert: PMG.Utils.convert_field_to_per_min
},
{
type: 'number', name: 'virus',
convert: PMG.Utils.convert_field_to_per_min
},
{
type: 'number', name: 'virus_in',
convert: PMG.Utils.convert_field_to_per_min
},
{ type: 'integer', name: 'virus_out' }, { type: 'integer', name: 'virus_out' },
{ type: 'integer', name: 'bytes_in' }, { type: 'integer', name: 'bytes_in' },
{ type: 'integer', name: 'bytes_out' }, { type: 'integer', name: 'bytes_out' },
@ -273,7 +298,7 @@ Ext.define('PMG.Dashboard', {
items: [ items: [
{ {
fields: ['count'], fields: ['count'],
fieldTitles: [ gettext('Mails') ], fieldTitles: [ gettext('Mails / min') ],
seriesConfig: { seriesConfig: {
colors: [ '#00617F' ], colors: [ '#00617F' ],
style: { style: {
@ -288,7 +313,7 @@ Ext.define('PMG.Dashboard', {
}, },
{ {
fields: ['spam'], fields: ['spam'],
fieldTitles: [ gettext('Spam') ], fieldTitles: [ gettext('Spam / min') ],
seriesConfig: { seriesConfig: {
colors: [ '#E67300' ], colors: [ '#E67300' ],
style: { style: {

4
js/Utils.js
View File

@ -129,6 +129,10 @@ Ext.define('PMG.Utils', {
return 'unknown'; return 'unknown';
}, },
convert_field_to_per_min: function(value, record) {
return (value/(record.data.timespan/60));
},
object_editors: { object_editors: {
1000: { 1000: {
xtype: 'proxmoxWindowEdit', xtype: 'proxmoxWindowEdit',