+
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-ssl-vpn-details/resource-monitoring-ssl-vpn-details.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-ssl-vpn-details/resource-monitoring-ssl-vpn-details.ts (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-ssl-vpn-details/resource-monitoring-ssl-vpn-details.ts (working copy)
@@ -1,10 +1,13 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, DestroyRef, inject, OnInit} from '@angular/core';
import {SharedModule} from '../../../shared/shared-module';
import {ActivatedRoute, Router} from '@angular/router';
import {DeviceService} from '../../../services/device-service';
import {NotificationService} from '../../../services/notification';
import {EChartsOption} from 'echarts';
import {take} from 'rxjs/operators';
+import {ChartOptions} from '../../../services/chart-options';
+import {TimeFilter, TimeRange} from '../../common/time-filter/time-filter';
+import {MatDialog} from '@angular/material/dialog';
@Component({
selector: 'app-resource-monitoring-ssl-vpn-details',
@@ -24,11 +27,18 @@
'Audit Monitoring',
];
+ currentFrom: string | Date = 'now-15m';
+ currentTo: string | Date = 'now';
+ currentInterval: number = 10;
+ private destroyRef = inject(DestroyRef);
+
constructor(
private _route: ActivatedRoute,
private _router: Router,
private _device: DeviceService,
private _notification: NotificationService,
+ private _chartOptions: ChartOptions,
+ private _dialog: MatDialog,
) {
}
@@ -51,64 +61,61 @@
this._router.navigate(['/monitoring/resources'], {state: {}});
}
- startTime: string = "now-15m";
- endTime: string = "now";
-
getBasicMonitoringMetrics() {
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'login_status'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'net_throughput'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'tunnel_status'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'l3_vpn_throughput'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'l3_client_app_throughput'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'l7_request_status'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'l7_client_throughput'
})
this.getSSLVPNMonitoringMetrics({
agent_host: this.deviceIp,
vsite_id: this.serviceName,
- from: this.startTime,
- to: this.endTime,
+ from: this.currentFrom,
+ to: this.currentTo,
stat_name: 'l7_server_throughput'
})
}
@@ -147,26 +154,7 @@
});
}
}
-
- this.loginStatusChartOptions = {
- tooltip: {
- trigger: 'item',
- formatter: '{a}
{b}: {c}'
- },
- series: [
- {
- name: 'Status',
- type: 'pie',
- radius: [25, 75],
- center: ['50%', '50%'],
- roseType: 'area',
- itemStyle: {
- borderRadius: 8
- },
- data: data_formatted
- }
- ]
- };
+ this.loginStatusChartOptions = this._chartOptions.distributionChartOptions('Status', data_formatted)
} else if (payload?.stat_name === 'tunnel_status') {
let hits: any = {};
if (result?.data.length > 0) {
@@ -182,220 +170,34 @@
});
}
}
- this.l3TunnelStatusChartOptions = {
- tooltip: {
- trigger: 'item',
- formatter: '{a}
{b}: {c}'
- },
- series: [
- {
- name: 'Status',
- type: 'pie',
- radius: [25, 75],
- center: ['50%', '50%'],
- roseType: 'area',
- itemStyle: {
- borderRadius: 8
- },
- data: data_formatted
- }
- ]
- };
+ this.l3TunnelStatusChartOptions = this._chartOptions.distributionChartOptions('Status', data_formatted)
} else if (payload?.stat_name === 'net_throughput') {
let network = result?.data;
const sent_formatted = network
.filter((d: any) => d.sent !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.sent)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.nw_sent)]);
const received_formatted = network
.filter((d: any) => d.received !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.received)]);
-
- this.clientThroughputChartOptions = {
- tooltip: {
- trigger: 'axis',
- formatter: (params: any) => {
- if (!params.length) return '';
- const date = new Date(params[0].value[0]);
- const formattedTime = date.toLocaleTimeString('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
- let tooltipContent = `Time: ${formattedTime}
`;
- params.forEach((item: any) => {
- tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1].toFixed(2)} bps
`;
- });
- return tooltipContent;
- }
- },
- legend: {data: ['Sent', 'Received']},
- xAxis: {type: 'time', name: 'Time'},
- yAxis: {
- type: 'value',
- name: 'bps',
- axisLabel: {
- formatter: (value: number) => {
- if (value >= 1000000000) {
- return (value / 1000000000).toFixed(1) + 'B';
- }
- if (value >= 1000000) {
- return (value / 1000000).toFixed(1) + 'M';
- }
- if (value >= 1000) {
- return (value / 1000).toFixed(1) + 'K';
- }
- return value.toString();
- }
- }
- },
- series: [
- {
- name: 'Sent',
- type: 'line',
- data: sent_formatted,
- showSymbol: false,
- smooth: true
- },
- {
- name: 'Received',
- type: 'line',
- data: received_formatted,
- showSymbol: false,
- smooth: true
- }
- ]
- };
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.nw_recv)]);
+ this.serverThroughputChartOptions = this._chartOptions.historicalThroughputChartOptions(received_formatted, sent_formatted);
} else if (payload?.stat_name === 'l3_vpn_throughput') {
let network = result?.data;
const sent_formatted = network
.filter((d: any) => d.sent !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.sent)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.vpn_sent)]);
const received_formatted = network
.filter((d: any) => d.received !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.received)]);
-
- this.l3VPNThroughputChartOptions = {
- tooltip: {
- trigger: 'axis',
- formatter: (params: any) => {
- if (!params.length) return '';
- const date = new Date(params[0].value[0]);
- const formattedTime = date.toLocaleTimeString('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
- let tooltipContent = `Time: ${formattedTime}
`;
- params.forEach((item: any) => {
- tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1].toFixed(2)} bps
`;
- });
- return tooltipContent;
- }
- },
- legend: {data: ['Sent', 'Received']},
- xAxis: {type: 'time', name: 'Time'},
- yAxis: {
- type: 'value',
- name: 'bps',
- axisLabel: {
- formatter: (value: number) => {
- if (value >= 1000000000) {
- return (value / 1000000000).toFixed(1) + 'B';
- }
- if (value >= 1000000) {
- return (value / 1000000).toFixed(1) + 'M';
- }
- if (value >= 1000) {
- return (value / 1000).toFixed(1) + 'K';
- }
- return value.toString();
- }
- }
- },
- series: [
- {
- name: 'Sent',
- type: 'line',
- data: sent_formatted,
- showSymbol: false,
- smooth: true
- },
- {
- name: 'Received',
- type: 'line',
- data: received_formatted,
- showSymbol: false,
- smooth: true
- }
- ]
- };
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.vpn_recv)]);
+ this.l3VPNThroughputChartOptions = this._chartOptions.historicalThroughputChartOptions(received_formatted, sent_formatted);
} else if (payload?.stat_name === 'l3_client_app_throughput') {
let network = result?.data;
const sent_formatted = network
.filter((d: any) => d.sent !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.sent)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.client_app_sent)]);
const received_formatted = network
.filter((d: any) => d.received !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.received)]);
-
- this.l3ClientThroughputChartOptions = {
- tooltip: {
- trigger: 'axis',
- formatter: (params: any) => {
- if (!params.length) return '';
- const date = new Date(params[0].value[0]);
- const formattedTime = date.toLocaleTimeString('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
- let tooltipContent = `Time: ${formattedTime}
`;
- params.forEach((item: any) => {
- tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1].toFixed(2)} bps
`;
- });
- return tooltipContent;
- }
- },
- legend: {data: ['Sent', 'Received']},
- xAxis: {type: 'time', name: 'Time'},
- yAxis: {
- type: 'value',
- name: 'bps',
- axisLabel: {
- formatter: (value: number) => {
- if (value >= 1000000000) {
- return (value / 1000000000).toFixed(1) + 'B';
- }
- if (value >= 1000000) {
- return (value / 1000000).toFixed(1) + 'M';
- }
- if (value >= 1000) {
- return (value / 1000).toFixed(1) + 'K';
- }
- return value.toString();
- }
- }
- },
- series: [
- {
- name: 'Sent',
- type: 'line',
- data: sent_formatted,
- showSymbol: false,
- smooth: true
- },
- {
- name: 'Received',
- type: 'line',
- data: received_formatted,
- showSymbol: false,
- smooth: true
- }
- ]
- };
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.client_app_recv)]);
+ this.l3ClientThroughputChartOptions = this._chartOptions.historicalThroughputChartOptions(received_formatted, sent_formatted);
} else if (payload?.stat_name === 'l7_request_status') {
let request_stats = result?.data;
let hits: any = {};
@@ -412,155 +214,27 @@
});
}
}
- this.l7RequestStatusChartOptions = {
- tooltip: {
- trigger: 'item',
- formatter: '{a}
{b}: {c}'
- },
- series: [
- {
- name: 'Status',
- type: 'pie',
- radius: [25, 75],
- center: ['50%', '50%'],
- roseType: 'area',
- itemStyle: {
- borderRadius: 8
- },
- data: data_formatted
- }
- ]
- };
+ this.l7RequestStatusChartOptions = this._chartOptions.distributionChartOptions('Status', data_formatted);
} else if (payload?.stat_name === 'l7_client_throughput') {
let network = result?.data;
const sent_formatted = network
.filter((d: any) => d.sent !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.sent)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.client_sent)]);
const received_formatted = network
.filter((d: any) => d.received !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.received)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.client_recv)]);
- this.l7ClientThroughputChartOptions = {
- tooltip: {
- trigger: 'axis',
- formatter: (params: any) => {
- if (!params.length) return '';
- const date = new Date(params[0].value[0]);
- const formattedTime = date.toLocaleTimeString('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
- let tooltipContent = `Time: ${formattedTime}
`;
- params.forEach((item: any) => {
- tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1].toFixed(2)} bps
`;
- });
- return tooltipContent;
- }
- },
- legend: {data: ['Sent', 'Received']},
- xAxis: {type: 'time', name: 'Time'},
- yAxis: {
- type: 'value',
- name: 'bps',
- axisLabel: {
- formatter: (value: number) => {
- if (value >= 1000000000) {
- return (value / 1000000000).toFixed(1) + 'B';
- }
- if (value >= 1000000) {
- return (value / 1000000).toFixed(1) + 'M';
- }
- if (value >= 1000) {
- return (value / 1000).toFixed(1) + 'K';
- }
- return value.toString();
- }
- }
- },
- series: [
- {
- name: 'Sent',
- type: 'line',
- data: sent_formatted,
- showSymbol: false,
- smooth: true
- },
- {
- name: 'Received',
- type: 'line',
- data: received_formatted,
- showSymbol: false,
- smooth: true
- }
- ]
- };
+ this.l7ClientThroughputChartOptions = this._chartOptions.historicalThroughputChartOptions(received_formatted, sent_formatted);
} else if (payload?.stat_name === 'l7_server_throughput') {
let network = result?.data;
const sent_formatted = network
.filter((d: any) => d.sent !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.sent)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.server_sent)]);
const received_formatted = network
.filter((d: any) => d.received !== null)
- .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.received)]);
+ .map((d: any) => [new Date(d.ts).getTime(), parseFloat(d.server_recv)]);
- this.l7ServerThroughputChartOptions = {
- tooltip: {
- trigger: 'axis',
- formatter: (params: any) => {
- if (!params.length) return '';
- const date = new Date(params[0].value[0]);
- const formattedTime = date.toLocaleTimeString('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
- let tooltipContent = `Time: ${formattedTime}
`;
- params.forEach((item: any) => {
- tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1].toFixed(2)} bps
`;
- });
- return tooltipContent;
- }
- },
- legend: {data: ['Sent', 'Received']},
- xAxis: {type: 'time', name: 'Time'},
- yAxis: {
- type: 'value',
- name: 'bps',
- axisLabel: {
- formatter: (value: number) => {
- if (value >= 1000000000) {
- return (value / 1000000000).toFixed(1) + 'B';
- }
- if (value >= 1000000) {
- return (value / 1000000).toFixed(1) + 'M';
- }
- if (value >= 1000) {
- return (value / 1000).toFixed(1) + 'K';
- }
- return value.toString();
- }
- }
- },
- series: [
- {
- name: 'Sent',
- type: 'line',
- data: sent_formatted,
- showSymbol: false,
- smooth: true
- },
- {
- name: 'Received',
- type: 'line',
- data: received_formatted,
- showSymbol: false,
- smooth: true
- }
- ]
- };
+ this.l7ServerThroughputChartOptions = this._chartOptions.historicalThroughputChartOptions(received_formatted, sent_formatted);
}
},
error: (error: { message: string; }) => {
@@ -569,4 +243,26 @@
}
})
}
+
+ openTimeFilterDialog(): void {
+ const dialogRef = this._dialog.open(TimeFilter, {
+ width: '600px',
+ data: {
+ initialFrom: this.currentFrom,
+ initialTo: this.currentTo,
+ initialInterval: this.currentInterval
+ }
+ });
+
+ dialogRef.componentInstance.applyRange.subscribe((result: TimeRange) => {
+ if (result) {
+ this.currentFrom = result.from;
+ this.currentTo = result.to;
+ this.currentInterval = result.interval || 10;
+ this.getBasicMonitoringMetrics()
+ }
+ });
+
+ dialogRef.afterClosed().subscribe(() => {});
+ }
}
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (working copy)
@@ -170,6 +170,7 @@
GET_APV_VS_MONITORING_METRICS_URL: `${PREFIX}/apv/slb/virtual_stats`,
GET_APV_RS_MONITORING_METRICS_URL: `${PREFIX}/apv/slb/real_stats`,
GET_SSL_VPN_MONITORING_METRICS_URL: `${PREFIX}/ssl_vpn_stats`,
+ GET_LLB_MONITORING_METRICS_URL: `${PREFIX}/llb_stats`,
GET_STORAGE_URL: `${PREFIX}/log/storage`,
GET_STORAGE_CLEANUP_CONFIG_URL: `${PREFIX}/storage/crontab`,
UPDATE_STORAGE_CLEANUP_CONFIG_URL: `${PREFIX}/storage/crontab`,
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/chart-options.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/chart-options.ts (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/chart-options.ts (working copy)
@@ -234,11 +234,15 @@
name: 'Sent',
type: 'line',
data: outbound,
+ showSymbol: false,
+ smooth: true
},
{
name: 'Received',
type: 'line',
data: inbound,
+ showSymbol: false,
+ smooth: true
}
]
}
@@ -297,6 +301,109 @@
}
}
+ plotSingleLineChartOptions(labels: any, data: any, color: any = '#008ac5'): EChartsOption {
+ return {
+ grid: {
+ left: '7%',
+ right: '1%',
+ bottom: '1%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ formatter: (params: any) => {
+ const date = new Date(params[0].value[0]);
+ const formattedTime = date.toLocaleTimeString('en-US', {
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit',
+ hour12: false
+ });
+ let tooltipContent = `Time: ${formattedTime}
`;
+ params.forEach((item: any) => {
+ tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1]}
`;
+ });
+ return tooltipContent;
+ }
+ },
+ legend: {
+ data: [labels?.label]
+ },
+ xAxis: {
+ type: 'time',
+ name: 'Time'
+ },
+ yAxis: {
+ type: 'value',
+ name: labels?.unit,
+ min: 0
+ },
+ series: [
+ {
+ name: labels?.label,
+ type: 'line',
+ data: data,
+ color: color,
+ showSymbol: false,
+ smooth: true
+ }
+ ]
+ }
+ }
+
+ plotDoubleLineChartOptions(labels: any, data: any, colors: any[] = ['#008ac5', '#E0E0E0']): EChartsOption {
+ return {
+ grid: {
+ left: '7%',
+ right: '1%',
+ bottom: '1%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ formatter: (params: any) => {
+ const date = new Date(params[0].value[0]);
+ const formattedTime = date.toLocaleTimeString('en-US', {
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit',
+ hour12: false
+ });
+ let tooltipContent = `Time: ${formattedTime}
`;
+ params.forEach((item: any) => {
+ tooltipContent += `${item.marker} ${item.seriesName}: ${item.value[1]}
`;
+ });
+ return tooltipContent;
+ }
+ },
+ legend: {
+ data: [labels?.label[0], labels?.label[1]]
+ },
+ xAxis: {
+ type: 'time',
+ name: 'Time'
+ },
+ yAxis: {
+ type: 'value',
+ name: labels?.unit
+ },
+ series: [
+ {
+ name: labels?.label[0],
+ type: 'line',
+ data: data,
+ color: colors[0],
+ },
+ {
+ name: labels?.label[1],
+ type: 'line',
+ data: data,
+ color: colors[1]
+ }
+ ]
+ }
+ }
+
historicalDiskIOChartOptions(disk_io_data: any): EChartsOption {
return {
grid: {
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/device-service.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/device-service.ts (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/device-service.ts (working copy)
@@ -642,4 +642,13 @@
]
);
}
+
+ getLLBMonitoringMetrics(payload: any) {
+ return this.http.post(URLS.GET_LLB_MONITORING_METRICS_URL, payload, {
+ csrf: true,
+ isFormData: false,
+ csrfInFormData: true
+ }
+ );
+ }
}
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (working copy)
@@ -3,6 +3,7 @@
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router';
+
// FontAwesome Imports
import {FaIconLibrary, FontAwesomeModule} from '@fortawesome/angular-fontawesome';
import * as solidIcons from '@fortawesome/free-solid-svg-icons';
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss (working copy)
@@ -427,3 +427,8 @@
mat-card-title {
font-size: medium !important;
}
+
+.time-filter {
+ margin-top: 8px !important;
+ margin-bottom: 8px !important;
+}
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/ssl_vpn_stat_queries.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/ssl_vpn_stat_queries.py (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/ssl_vpn_stat_queries.py (working copy)
@@ -1,5 +1,4 @@
from hive.db.db_client import DBClient
-from hive.utils import andebug
from hive.db.utils import cast_fields
@@ -14,6 +13,7 @@
if agent_host:
query = f"""
SELECT DISTINCT ON (id, agent_host, ip)
+ id as vsite_name, agent_host,
CAST(active_sessions AS BIGINT)
FROM ag_virtual_site_stats
WHERE agent_host = '{agent_host}'
@@ -23,6 +23,7 @@
else:
query = f"""
SELECT DISTINCT ON (id, agent_host, ip)
+ id as vsite_name, agent_host,
CAST(active_sessions AS BIGINT)
FROM ag_virtual_site_stats
WHERE time > now() - interval '20 seconds'
@@ -33,6 +34,8 @@
response = DBClient.execute_query(req)
field_casts = {
+ "id": str,
+ "agent_host": str,
"active_sessions": int
}
response["data"] = cast_fields(response["data"], field_casts)
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/device_metrics_service.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/device_metrics_service.py (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/device_metrics_service.py (working copy)
@@ -1,37 +1,35 @@
from hive.db.device_metric_queries import DeviceMetrics
from hive.services.utils import construct_json_response, convert_time
-from hive.utils import andebug
def fetch_device_metrics(agent_host, interval, metric_name, time_from, time_to):
time_from = convert_time(time_from, "now() - interval '15 minutes'")
time_to = convert_time(time_to, "now()")
- json_response = {}
if metric_name and metric_name == 'cpu_usage':
metrics = DeviceMetrics.get_cpu_usage_metrics(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name and metric_name == 'memory_usage':
metrics = DeviceMetrics.get_mem_usage_metrics(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name and metric_name == 'disk_usage':
metrics = DeviceMetrics.get_disk_usage_metrics(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name and metric_name == 'network_throughput':
metrics = DeviceMetrics.get_network_throughput(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name == "ssl_connections":
metrics = DeviceMetrics.get_ssl_connections(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name == "connections":
metrics = DeviceMetrics.get_connections(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name == "requests":
metrics = DeviceMetrics.get_requests(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
elif metric_name == "ssl_core_utilization":
metrics = DeviceMetrics.get_ssl_core_utilization(agent_host, interval, time_from, time_to)
- json_response = construct_json_response(json_response, metrics)
+ json_response = construct_json_response(metrics)
else:
device_stats = DeviceMetrics.get_device_stats(time_from, time_to)['data']
net_throughput = DeviceMetrics.get_throughput_data(interval, time_from, time_to)['data']
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/ssl_vpn_stat_service.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/ssl_vpn_stat_service.py (revision 2726)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/ssl_vpn_stat_service.py (working copy)
@@ -1,13 +1,11 @@
from hive.db.ssl_vpn_stat_queries import SSLVpnStatQueries
from hive.services.utils import construct_json_response, convert_time
-from hive.utils import andebug
def fetch_ssl_vpn_stats(agent_host, vsite_id, interval, stat_name, time_from, time_to):
time_from = convert_time(time_from, "now() - interval '15 minutes'")
time_to = convert_time(time_to, "now()")
- json_response = {}
if stat_name == 'login_status':
stats = SSLVpnStatQueries.get_login_stats(agent_host, vsite_id, interval, time_from, time_to)
elif stat_name == 'net_throughput':
@@ -26,5 +24,5 @@
stats = SSLVpnStatQueries.get_l7_server_throughput(agent_host, vsite_id, interval, time_from, time_to)
else:
stats = SSLVpnStatQueries.get_active_sessions(agent_host)
- json_response = construct_json_response(json_response, stats)
- return json_response
\ No newline at end of file
+ json_response = construct_json_response(stats)
+ return json_response