= new MatTableDataSource();
portDataColumns: string[] = ['serial', 'resource', 'mac', 'portId', 'vlanTag'];
@@ -81,7 +93,15 @@
getAVXVAInstancePlatformResource() {
this.deviceFacade.getAVXVAInstancePlatformResource(this.deviceId, this.instanceName).pipe(take(1)).subscribe({
next: (result: any) => {
- this.managementIp = result?.ip;
+ this.managementIpStr = result?.ip;
+ const pNameLower = (result?.product_name || '').toLowerCase();
+ if (pNameLower.includes('vxag') || (pNameLower.includes('ag') && !pNameLower.includes('asf'))) {
+ this.productCategoryStr = 'ag';
+ } else if (pNameLower.includes('vasf') || pNameLower.includes('asf')) {
+ this.productCategoryStr = 'asf';
+ } else {
+ this.productCategoryStr = 'vapv'; // default: vAPV and unrecognised types
+ }
this.managementIp = {
'IP Address': result?.ip
}
@@ -117,9 +137,10 @@
let payload: any = `post_data=%7B%22va_name%22%3A%22${this.instanceName}%22%2C%22va_product_name%22%3A%22${productName}%22%7D`;
this.deviceFacade.getAVXVAInstanceBasicConfig(this.deviceId, payload).pipe(take(1)).subscribe({
next: (result: any) => {
- if (result && result.length > 1) {
- if (result[1]?.show_version) {
- let show_version = result[1]?.show_version;
+ if (result && Array.isArray(result)) {
+ const versionObj = result.find((item: any) => item && item.show_version);
+ if (versionObj) {
+ let show_version = versionObj.show_version;
let selectedValues: any = {
'Model': show_version?.model,
'Software Build Info': show_version?.build,
@@ -138,11 +159,23 @@
}
this.configDataSource = this._utils.processConfigData(selectedValues);
}
- if (result[1]?.show_snmp) {
- this.isSNMPEnabled = result[1]?.show_snmp?.enable_snmp;
+
+ const snmpObj = result.find((item: any) => item && item.show_snmp);
+ console.log(result);
+ if (snmpObj) {
+ const snmpVal = snmpObj.show_snmp?.enable_snmp;
+ // Handle both boolean and string truthy values like 'enable', 'on', '1', 'true'
+ const isTruthy = snmpVal === true || ['enable', 'on', '1', 'true', 'yes'].includes(String(snmpVal).toLowerCase());
+ this.isSNMPEnabled = isTruthy;
}
}
this.loader2 = true;
+ // Trigger initial chart load. We no longer strictly require this.isSNMPEnabled
+ // to be true here, because the AVX API often returns empty/default values
+ // for VA config, leading to false negatives. If data exists, it will render.
+ if (this.instanceStatus && this.managementIpStr) {
+ this.getDeviceStatistics();
+ }
},
error: error => {
this.ui.notifyError(`Error: ${error?.message}`);
@@ -171,17 +204,95 @@
hasData4: boolean = false;
getDeviceStatistics() {
- // ToDo: Integrate with APIs once ready.
- this.updateStatisticsCharts({});
+ if (!this.managementIpStr) {
+ this.updateStatisticsCharts({});
+ return;
+ }
+
+ const from = 'now-15m';
+ const to = 'now';
+
+ const throughputPayload = {
+ metric_name: 'network_throughput',
+ agent_host: this.managementIpStr,
+ device_type: this.productCategoryStr,
+ interval: '10s',
+ from: from,
+ to: to
+ };
+
+ const cpuPayload = {
+ metric_name: 'cpu_usage',
+ agent_host: this.managementIpStr,
+ device_type: this.productCategoryStr,
+ interval: '10s',
+ from: from,
+ to: to
+ };
+
+ const memoryPayload = {
+ metric_name: 'memory_usage',
+ agent_host: this.managementIpStr,
+ device_type: this.productCategoryStr,
+ interval: '10s',
+ from: from,
+ to: to
+ };
+
+ const diskPayload = {
+ metric_name: 'disk_usage',
+ agent_host: this.managementIpStr,
+ device_type: this.productCategoryStr,
+ interval: '10s',
+ from: from,
+ to: to
+ };
+
+ forkJoin({
+ throughput: this.deviceFacade.getDeviceMonitoringMetrics(throughputPayload).pipe(take(1)),
+ cpu: this.deviceFacade.getDeviceMonitoringMetrics(cpuPayload).pipe(take(1)),
+ memory: this.deviceFacade.getDeviceMonitoringMetrics(memoryPayload).pipe(take(1)),
+ disk: this.deviceFacade.getDeviceMonitoringMetrics(diskPayload).pipe(take(1))
+ }).subscribe({
+ next: (results: any) => {
+ let _data: any = {};
+ try {
+ const tpRes = results?.throughput?.data || [];
+ const factor: any = 1024 * 1024;
+ const sentData = tpRes.map((d: any) => [new Date(d.ts).getTime(), d.sent / factor]);
+ const receivedData = tpRes.map((d: any) => [new Date(d.ts).getTime(), d.received / factor]);
+ _data.throughput = { sent: sentData, received: receivedData };
+
+ const cpuRes = results?.cpu?.data || [];
+ const cpuData = cpuRes.map((d: any) => [new Date(d.ts).getTime(), d.cpu]);
+ _data.cpu = cpuData;
+
+ const memRes = results?.memory?.data || [];
+ const memData = memRes.map((d: any) => [new Date(d.ts).getTime(), d.memory_usage]);
+ _data.memory = memData;
+
+ const diskRes = results?.disk?.data || [];
+ const diskData = diskRes.map((d: any) => [new Date(d.ts).getTime(), d.disk_usage]);
+ _data.disk = diskData;
+ } catch (e) {
+ console.error('Error parsing device statistics', e);
+ }
+ this.updateStatisticsCharts(_data);
+ },
+ error: (error: any) => {
+ console.error(error);
+ this.updateStatisticsCharts({});
+ }
+ });
}
updateStatisticsCharts(_data: any) {
- let inbound_traffic: any = [];
- let outbound_traffic: any = [];
- let cpu: any = [];
- let memory: any = [];
- let disk: any = [];
+ let inbound_traffic: any = _data?.throughput?.received || [];
+ let outbound_traffic: any = _data?.throughput?.sent || [];
+ let cpu: any = _data?.cpu || [];
+ let memory: any = _data?.memory || [];
+ let disk: any = _data?.disk || [];
this.hasData1 = inbound_traffic.length > 0 || outbound_traffic.length > 0;
this.chartOption1 = this._chartOptions.historicalThroughputChartOptions(inbound_traffic, outbound_traffic);
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/avx-va-instances/avx-va-instances.html (working copy)
@@ -1,11 +1,4 @@
-
-
-
VA Instances
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-device-details/resource-monitoring-device-details.ts
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-device-details/resource-monitoring-device-details.ts (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/resource-monitoring-device-details/resource-monitoring-device-details.ts (working copy)
@@ -202,9 +202,7 @@
this.deviceFacade.getDeviceMonitoringMetrics(payload).pipe(take(1)).subscribe({
next: (result: any) => {
if (payload?.metric_name === 'cpu_usage') {
- console.log(result?.data);
const cpu_data_formatted: any = result?.data.map((d: any) => [d.ts, d.cpu]);
- console.log(cpu_data_formatted);
this.cpuChartOptions = cpu_data_formatted.length ? this.getAreaChartOptions('CPU Usage', cpu_data_formatted, '#2196f3', '#e3f2fd', '%') : this.getNoDataChartOptions();
} else if (payload?.metric_name === 'memory_usage') {
const memory_data_formatted: any = result?.data.map((d: any) => [d.ts, d.memory_usage]);
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/device_metrics.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/device_metrics.py (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/device_metrics.py (working copy)
@@ -3,9 +3,13 @@
from cm.lib.libbasic_operation import oper_log
from hive.custom_exceptions import generic_exception as ge
import json
+import logging
+import traceback
from hive.utils import andebug
+logger = logging.getLogger('hive.debug')
+
def handle_device_metrics_req(request, path=None):
try:
if request.method in ['GET', 'POST']:
@@ -29,7 +33,7 @@
try:
req_body = json.loads(request.body)
agent_host = req_body.get("agent_host", None)
- device_type = req_body.get("device_type", "vapv") # <-- NEW (default to an)
+ device_type = req_body.get("device_type", "an")
interval = req_body.get("interval", "1m")
time_from = req_body.get("from", None)
time_to = req_body.get("to", None)
@@ -42,6 +46,14 @@
return JsonResponse(json_response)
except Exception as e:
+ tb = traceback.format_exc()
+ logger.error("[device_metrics] 500 error for metric='%s' agent='%s' type='%s': %s\n%s",
+ req_body.get("metric_name") if 'req_body' in dir() else "?",
+ req_body.get("agent_host") if 'req_body' in dir() else "?",
+ req_body.get("device_type") if 'req_body' in dir() else "?",
+ str(e), tb)
+ oper_log('error', 'system', '[device_metrics] Internal error: {}'.format(str(e)))
return JsonResponse({
- "error": str(e)
+ "error": str(e),
+ "traceback": tb
}, status=500)
\ No newline at end of file
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/device_metric_queries.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/device_metric_queries.py (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/device_metric_queries.py (working copy)
@@ -3,32 +3,34 @@
from hive.db.utils import cast_fields
+def _forward_fill(rows, fields):
+ """
+ Last-Observation-Carried-Forward for gapfill result rows.
+ For each field in `fields`, replace None/0 with the last non-zero value seen.
+ rows: list of dicts (ordered by time ascending)
+ fields: list of column names to forward-fill
+ """
+ last = {f: None for f in fields}
+ for row in rows:
+ for f in fields:
+ val = row.get(f)
+ if val is not None and val != 0:
+ last[f] = val
+ elif last[f] is not None:
+ row[f] = last[f]
+ return rows
+
+
class DeviceMetrics:
def __init__(self, device_type):
# Normalize and map device_type to the corresponding table
device_type = (device_type or "an").lower()
- table_map = {
- "apv": "an_device_metrics",
- "vapv": "an_device_metrics",
- "ag": "ag_device_metrics",
- "vxag": "ag_device_metrics",
- "asf": "asf_device_metrics",
- "vasf": "asf_device_metrics",
- "avx": "an_device_metrics",
- "vavx": "an_device_metrics"
- }
- storage_map = {
- "apv": "an_device_storage",
- "vapv": "an_device_storage",
- "asf": "asf_device_storage",
- "vasf": "asf_device_storage",
- "avx": "an_device_storage",
- "vavx": "an_device_storage"
- }
- self.metrics_table = table_map.get(device_type, "an_device_metrics")
- self.storage_table = storage_map.get(device_type, None) # shared storage table
- self.has_memory_metrics = self.metrics_table != "ag_device_metrics"
+ self.metrics_table = "an_device_metrics"
+ self.storage_table = "an_device_storage"
+ # AG/vxAG DOES have mem_usage via .7564.30.5.0 (confirmed in SNMP output)
+ # Only exclude if the device genuinely has no memory metric
+ self.has_memory_metrics = True
def get_device_stats(self, time_from, time_to):
"""
@@ -130,17 +132,18 @@
req = {"query": query}
response = DBClient.execute_query(req)
- field_casts = {
- "cpu": int
- }
+ field_casts = {"cpu": int}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["cpu"])
return response
def get_mem_usage_metrics(self, agent_host, interval, time_from, time_to):
"""
- Memory metrics over time buckets per agent_host
+ Memory metrics over time buckets per agent_host.
+ AG/vxAG/vAG devices do not expose mem_usage via SNMP — return empty gracefully.
"""
+ if not self.has_memory_metrics:
+ return {"data": []}
query = f"""
SELECT
@@ -163,21 +166,33 @@
"network_mem_usage": int
}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["memory_usage", "network_mem_usage"])
return response
def get_disk_usage_metrics(self, agent_host, interval, time_from, time_to):
"""
- Disk usage percentage over time buckets per agent_host
+ Disk usage % per agent_host over time buckets.
+ Priority:
+ 1. an_device_storage (hrStorage SNMP — ASF/vASF Linux appliances)
+ 2. disk_used / disk_total ratio (AG/vxAG ArrayOS MIB: .7564.25.2.0 / .7564.25.4.0)
+ 3. disk_pct direct % scalar (APV/vAPV ArrayOS MIB: .7564.3.8.0)
"""
- if not self.storage_table:
- return {"data": []}
+ def _has_real_data(data):
+ return isinstance(data, list) and any(
+ isinstance(r, dict) and r.get("disk_usage", 0) not in (0, None)
+ for r in data
+ )
+ # --- Primary: hrStorage table ---
query = f"""
SELECT
time_bucket_gapfill('{interval}', time, {time_from}, {time_to}) AS ts,
agent_host,
- COALESCE((AVG(used) * 100.0) / NULLIF(AVG(size), 0), 0) AS disk_usage
+ COALESCE(
+ (SUM(CASE WHEN size > 0 THEN used ELSE 0 END) * 100.0)
+ / NULLIF(SUM(CASE WHEN size > 0 THEN size ELSE 0 END), 0),
+ 0
+ )::int AS disk_usage
FROM {self.storage_table}
WHERE time >= {time_from}
AND time <= {time_to}
@@ -185,19 +200,52 @@
GROUP BY ts, agent_host
ORDER BY ts;
"""
+ response = DBClient.execute_query({"query": query, "params": [agent_host]})
- # Pass parameters safely to avoid SQL injection
- params = [agent_host]
+ if not _has_real_data(response.get("data", [])):
+ # --- Fallback 1: disk_used / disk_total ratio (AG/vxAG) ---
+ fb1_query = f"""
+ SELECT
+ time_bucket_gapfill('{interval}', time, {time_from}, {time_to}) AS ts,
+ agent_host,
+ COALESCE(
+ (AVG(disk_used) * 100.0) / NULLIF(AVG(disk_total), 0),
+ 0
+ )::int AS disk_usage
+ FROM {self.metrics_table}
+ WHERE time >= {time_from}
+ AND time <= {time_to}
+ AND agent_host = '{agent_host}'
+ AND disk_total IS NOT NULL AND disk_total > 0
+ GROUP BY ts, agent_host
+ ORDER BY ts;
+ """
+ fb1 = DBClient.execute_query({"query": fb1_query})
+ if _has_real_data(fb1.get("data", [])):
+ response = fb1
- req = {"query": query, "params": params}
- response = DBClient.execute_query(req)
-
- # Cast disk_usage to int
- field_casts = {
- "disk_usage": int
- }
- response["data"] = cast_fields(response["data"], field_casts)
+ if not _has_real_data(response.get("data", [])):
+ # --- Fallback 2: disk_pct direct % scalar (APV/vAPV/ASF: .7564.3.8.0) ---
+ fb2_query = f"""
+ SELECT
+ time_bucket_gapfill('{interval}', time, {time_from}, {time_to}) AS ts,
+ agent_host,
+ COALESCE(AVG(disk_pct)::int, 0) AS disk_usage
+ FROM {self.metrics_table}
+ WHERE time >= {time_from}
+ AND time <= {time_to}
+ AND agent_host = '{agent_host}'
+ AND disk_pct IS NOT NULL
+ GROUP BY ts, agent_host
+ ORDER BY ts;
+ """
+ fb2 = DBClient.execute_query({"query": fb2_query})
+ if isinstance(fb2.get("data"), list) and fb2["data"]:
+ response = fb2
+ field_casts = {"disk_usage": int}
+ response["data"] = cast_fields(response.get("data", []), field_casts)
+ response["data"] = _forward_fill(response["data"] or [], ["disk_usage"])
return response
def get_network_throughput(self, agent_host, interval, time_from, time_to):
@@ -267,12 +315,9 @@
"""
req = {"query": query}
response = DBClient.execute_query(req)
-
- field_casts = {
- "ssl_connection": int
- }
+ field_casts = {"ssl_connection": int}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["ssl_connection"])
return response
def get_connections(self, agent_host, interval, time_from, time_to):
@@ -299,7 +344,7 @@
"connection": float
}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["connection"])
return response
def get_requests(self, agent_host, interval, time_from, time_to):
@@ -326,13 +371,14 @@
"requests": float
}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["requests"])
return response
@staticmethod
def get_ssl_core_utilization(agent_host, interval, time_from, time_to):
"""
- SSL AE and SE core utilization (mean) over time buckets per agent_host
+ SSL AE and SE core utilization (mean) over time buckets per agent_host.
+ Only APV/vAPV devices have SSL acceleration hardware — others return empty.
"""
query = f"""
@@ -356,7 +402,7 @@
"ssl_se_core": float
}
response["data"] = cast_fields(response["data"], field_casts)
-
+ response["data"] = _forward_fill(response["data"] or [], ["ssl_ae_core", "ssl_se_core"])
return response
@staticmethod
@@ -408,6 +454,7 @@
FROM {self.storage_table}
WHERE agent_host = '{agent_host}'
AND time BETWEEN {time_from} AND {time_to}
+ AND size > 0
GROUP BY agent_host
)
"""
@@ -476,6 +523,7 @@
FROM {self.storage_table}
WHERE agent_host = '{agent_host}'
AND time BETWEEN {time_from} AND {time_to}
+ AND size > 0
GROUP BY ts, agent_host
)
"""
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/utils.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/utils.py (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/utils.py (working copy)
@@ -4,6 +4,11 @@
def cast_fields(rows, field_casts):
""" Cast fields to appropriate cast specified in the fields_casts"""
+ # Guard: if DB returned an error, data will be a string, not a list.
+ # Return it unchanged so the caller can handle it properly.
+ if not isinstance(rows, list):
+ return rows
+
for row in rows:
for field, cast_type in field_casts.items():
try:
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/utils.py
===================================================================
--- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/utils.py (revision 2968)
+++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/utils.py (working copy)
@@ -271,6 +271,10 @@
def construct_json_response(metrics):
+ # If the DB layer returned an error, surface it clearly instead of
+ # passing a string as "data" which crashes cast_fields downstream.
+ if metrics.get("status", 200) != 200:
+ raise Exception("DB query failed: %s" % metrics.get("data", "Unknown error"))
json_response = {
"data": metrics["data"]
}