+
+
+
+
+
+
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Hits | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Connections | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Received (Mbps) | +
+ |
+ Sent (Mbps) | +
+ |
+
|---|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Hits | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Connections | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Received (Mbps) | +
+ |
+ Sent (Mbps) | +
+ |
+
|---|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Hits | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Connections | +{{ element?.value }} | +
|---|---|---|
| No results found. | +
| Top | +{{ i + 1 }} | +Service Name | +{{ element?.name }} | +Received (Mbps) | +
+ |
+ Sent (Mbps) | +
+ |
+
|---|---|---|---|
| No results found. | +
{{devices.length - connectedDevices}} device(s) offline
+{{ devices.length - connectedDevices }} device(s) offline
} @else { } @@ -24,7 +24,7 @@Active Services
@@ -69,9 +69,14 @@ (click)="enlargeSystemLoad()"> -| No. | {{ i | globalSerial }} | 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 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (working copy) @@ -159,6 +159,10 @@ UPDATE_SLB_REAL_SERVICE_URL: `${PREFIX}/real_service`, GET_SYSTEM_LATEST_METRICS_URL: `${PREFIX}/system-metrics-latest`, GET_SYSTEM_HISTORICAL_METRICS_URL: `${PREFIX}/system-metrics-history`, + GET_DEVICES_METRICS_URL: `${PREFIX}/devices-metrics`, + GET_TOP_APV_VIRTUAL_METRICS_URL: `${PREFIX}/top-apv-virtual-metrics`, + GET_TOP_APV_REAL_METRICS_URL: `${PREFIX}/top-apv-real-metrics`, + GET_TOP_APV_LLB_METRICS_URL: `${PREFIX}/top-apv-llb-metrics`, // AVX GET_AVX_DEVICES_URL: `${PREFIX}/api/cm/virtualization/Host/_get_list_data`, ADD_AVX_DEVICE_URL: `${PREFIX}/api/cm/virtualization/Host/_add`, Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (revision 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (working copy) @@ -457,5 +457,37 @@ getHistoricalSystemMetrics() { return this.http.get(URLS.GET_SYSTEM_HISTORICAL_METRICS_URL); + } + + getConnectedDevicesMetrics(payload: any) { + return this.http.post(URLS.GET_DEVICES_METRICS_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); + } + + getTopAPVVirtualServicesMetrics(payload: any) { + return this.http.post(URLS.GET_TOP_APV_VIRTUAL_METRICS_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); + } + + getTopAPVRealServicesMetrics(payload: any) { + return this.http.post(URLS.GET_TOP_APV_REAL_METRICS_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); } + + getTopAPVLLBMetrics(payload: any) { + return this.http.post(URLS.GET_TOP_APV_LLB_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 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (working copy) @@ -37,6 +37,8 @@ faClockRotateLeft, faRepeat, faCircleInfo, + faArrowUpLong, + faArrowDownLong, } from '@fortawesome/free-solid-svg-icons'; import { faBell, @@ -227,6 +229,8 @@ faClockRotateLeft, faRepeat, faCircleInfo, + faArrowUpLong, + faArrowDownLong, ); } } 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 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss (working copy) @@ -72,6 +72,25 @@ padding: 3px; position: relative; z-index: 20; + --table-bg: transparent; + .an-table { + background: var(--table-bg); + + .mat-cell, + .mat-header-cell, + [mat-cell], + [mat-header-cell], + .mat-row, + .mat-header-row, + [mat-row], + [mat-header-row] { + background: var(--table-bg); + + &:hover { + background: var(--table-bg); + } + } + } } /* Filter container with high specificity */ Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/apv_services_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/apv_services_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/apv_services_metrics.py (working copy) @@ -0,0 +1,87 @@ +from django.http import JsonResponse + +from cm.lib.libbasic_operation import oper_log +from hive.custom_exceptions import generic_exception as ge +from hive.services.apv_services_metrics import get_top_apv_virtual_services_metrics, get_top_apv_real_services_metrics, \ + get_top_llb_metrics + + +def handle_get_top_apv_virtual_services_metrics(request, path=None): + try: + if request.method != 'POST': + return JsonResponse({ + 'error': 400, + 'message': "Invalid HTTP method" + }, status=400) + + payload = getattr(request, 'json', {}) or {} + agent_hosts = payload.get('agent_host', None) + if agent_hosts is not None: + if isinstance(agent_hosts, str): + agent_hosts = [agent_hosts] + + services_metrics = get_top_apv_virtual_services_metrics(agent_hosts) + + return JsonResponse(services_metrics, safe=False) + + except ge.GenericError as e: + oper_log('error', 'system', str(e)) + return ge.handle_exception(e) + except Exception as e: + msg = f'Exception while getting top apv virtual services metrics: {str(e)}' + oper_log('error', 'system', msg) + raise ge.GenericError(500, msg) + + +def handle_get_top_apv_real_services_metrics(request, path=None): + try: + if request.method != 'POST': + return JsonResponse({ + 'error': 400, + 'message': "Invalid HTTP method" + }, status=400) + + payload = getattr(request, 'json', {}) or {} + agent_hosts = payload.get('agent_host', None) + if agent_hosts is not None: + if isinstance(agent_hosts, str): + agent_hosts = [agent_hosts] + + services_metrics = get_top_apv_real_services_metrics(agent_hosts) + + return JsonResponse(services_metrics, safe=False) + + except ge.GenericError as e: + oper_log('error', 'system', str(e)) + return ge.handle_exception(e) + except Exception as e: + msg = f'Exception while getting top apv real services metrics: {str(e)}' + oper_log('error', 'system', msg) + raise ge.GenericError(500, msg) + + +def handle_get_top_llb_metrics(request, path=None): + try: + if request.method != 'POST': + return JsonResponse({ + 'error': 400, + 'message': "Invalid HTTP method" + }, status=400) + + payload = getattr(request, 'json', {}) or {} + agent_hosts = payload.get('agent_host', None) + if agent_hosts is not None: + if isinstance(agent_hosts, str): + agent_hosts = [agent_hosts] + + services_metrics = get_top_llb_metrics(agent_hosts) + + return JsonResponse(services_metrics, safe=False) + + except ge.GenericError as e: + oper_log('error', 'system', str(e)) + return ge.handle_exception(e) + except Exception as e: + msg = f'Exception while getting top apv llb metrics: {str(e)}' + oper_log('error', 'system', msg) + raise ge.GenericError(500, msg) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/devices_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/devices_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/devices_metrics.py (working copy) @@ -0,0 +1,34 @@ +from django.http import JsonResponse + +from cm.lib.libbasic_operation import oper_log +from hive.custom_exceptions import generic_exception as ge +from hive.services.devices_metrics import get_top_devices_metrics +from hive.utils import andebug + + +def handle_get_top_devices_metrics(request, path=None): + try: + if request.method != 'POST': + return JsonResponse({ + 'error': 400, + 'message': "Invalid HTTP method" + }, status=400) + + payload = getattr(request, 'json', {}) or {} + agent_hosts = payload.get('agent_host', None) + if agent_hosts is not None: + if isinstance(agent_hosts, str): + agent_hosts = [agent_hosts] + + devices_metrics = get_top_devices_metrics(agent_hosts) + + return JsonResponse(devices_metrics, safe=False) + + except ge.GenericError as e: + oper_log('error', 'system', str(e)) + return ge.handle_exception(e) + except Exception as e: + andebug('an.model.cli', e) + msg = f'Exception while getting latest metrics: {str(e)}' + oper_log('error', 'system', msg) + raise ge.GenericError(500, msg) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/system_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/system_metrics.py (revision 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/controller/system_metrics.py (working copy) @@ -1,6 +1,5 @@ -import json +from django.http import JsonResponse -from django.http import HttpResponse, JsonResponse from cm.lib.libbasic_operation import oper_log from hive.custom_exceptions import generic_exception as ge from hive.services.system_metrics import get_latest_system_metrics, get_historical_system_metrics Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/apv_services_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/apv_services_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/apv_services_metrics.py (working copy) @@ -0,0 +1,58 @@ +class VirtualServicesMetrics: + def __init__(self, metric, agent_host, service_name, value, received=None, sent=None): + self.metric = metric # "connections", "requests", or "network" + self.agent_host = agent_host + self.service_name = service_name + self.value = float(value) if value is not None else None + self.received = int(received) if received is not None else None + self.sent = int(sent) if sent is not None else None + + def to_dict(self): + return { + 'metric': self.metric, + 'agent_host': self.agent_host, + 'service_name': self.service_name, + 'value': self.value, + 'received': self.received, + 'sent': self.sent + } + + +class RealServicesMetrics: + def __init__(self, metric, agent_host, service_name, value, received=None, sent=None): + self.metric = metric # "connections", "hits", or "network" + self.agent_host = agent_host + self.service_name = service_name + self.value = float(value) if value is not None else None + self.received = int(received) if received is not None else None + self.sent = int(sent) if sent is not None else None + + def to_dict(self): + return { + 'metric': self.metric, + 'agent_host': self.agent_host, + 'service_name': self.service_name, + 'value': self.value, + 'received': self.received, + 'sent': self.sent + } + + +class LLBMetrics: + def __init__(self, metric, agent_host, link_name, value, received=None, sent=None): + self.metric = metric # "hits", "connections", "throughput" + self.agent_host = agent_host + self.link_name = link_name + self.value = float(value) if value is not None else None + self.received = int(received) if received is not None else None + self.sent = int(sent) if sent is not None else None + + def to_dict(self): + return { + "metric": self.metric, + "agent_host": self.agent_host, + "link_name": self.link_name, + "value": self.value, + "received": self.received, + "sent": self.sent + } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/db_client.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/db_client.py (revision 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/db_client.py (working copy) @@ -1,10 +1,26 @@ +import os + import psycopg2 -import json -import time from hive.custom_exceptions import generic_exception as ge +DB_HOST = os.environ.get("TIMESCALEDB_HOST", "localhost") +DB_NAME = os.environ.get("TIMESCALEDB_DB", "amp_ts") +DB_USER = os.environ.get("TIMESCALEDB_USER", "amp_ts_user") +DB_PASSWORD = os.environ.get("TIMESCALEDB_PASSWORD", "Array@123$") +DB_PORT = int(os.environ.get("TIMESCALEDB_PORT", 5432)) + +# ToDo: Implement Connection Pool +def get_db_connection(): + return psycopg2.connect( + host=DB_HOST, + dbname=DB_NAME, + user=DB_USER, + password=DB_PASSWORD + ) + + class DBClient: def __init__(self): @@ -22,13 +38,7 @@ conn = None cur = None try: - conn = psycopg2.connect( - dbname="amp_ts", - user="amp_ts_user", - password="Array@123$", - host="localhost", - port=5432 - ) + conn = get_db_connection() cur = conn.cursor() # Execute query (with params if provided) @@ -38,9 +48,9 @@ cur.execute(req_dict["query"]) rows = cur.fetchall() - colnames = [desc[0] for desc in cur.description] - result = [dict(zip(colnames, row)) for row in rows] - + col_names = [desc[0] for desc in cur.description] + result = [dict(zip(col_names, row)) for row in rows] + # ToDo: Remove the HTTP Status Code notion from DB layer and add proper Exception Handlers. return { "status": 200, "message": "success", @@ -68,3 +78,25 @@ cur.close() if conn: conn.close() + + +def with_db_connection(func): + def wrapper(*args, **kwargs): + conn = None + cur = None + try: + conn = get_db_connection() + cur = conn.cursor() + result = func(cur, *args, **kwargs) + conn.commit() + return result + except (Exception, psycopg2.DatabaseError) as error: + # ToDo: Integrate with Exception handlers once available. + print(f"Error in {func.__name__}: {error}") + finally: + if cur: + cur.close() + if conn: + conn.close() + + return wrapper Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/devices_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/devices_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/devices_metrics.py (working copy) @@ -0,0 +1,16 @@ +class DevicesMetrics: + def __init__(self, metric, agent_host, value, total_in=None, total_out=None): + self.metric = metric # "cpu", "memory", or "network" + self.agent_host = agent_host + self.value = float(value) if value is not None else None + self.total_in = int(total_in) if total_in is not None else None + self.total_out = int(total_out) if total_out is not None else None + + def to_dict(self): + return { + 'metric': self.metric, + 'agent_host': self.agent_host, + 'value': self.value, + 'total_in': self.total_in, + 'total_out': self.total_out + } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics_database.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics.py (working copy) @@ -0,0 +1,72 @@ +class SystemMetrics: + def __init__(self, time, host, cpu_percent=None, mem_percent=None, disk_io_percent=None, read_speed=None, + write_speed=None): + self.time = time + self.host = host + self.cpu_percent = cpu_percent + self.mem_percent = mem_percent + self.disk_io_percent = disk_io_percent + self.read_speed = read_speed + self.write_speed = write_speed + + def to_dict(self): + data = {'time': self.time.isoformat() if self.time else None, 'host': self.host} + + if self.cpu_percent is not None: + data['cpu_percent'] = float(round(self.cpu_percent, 2)) + + if self.mem_percent is not None: + data['mem_percent'] = float(round(self.mem_percent, 2)) + + if self.disk_io_percent is not None: + data['disk_io_percent'] = float(round(self.disk_io_percent, 2)) + + if self.read_speed is not None: + data['read_speed'] = float(round(self.read_speed, 2)) + + if self.write_speed is not None: + data['write_speed'] = float(round(self.write_speed, 2)) + + return data + + +class DiskMetrics: + def __init__(self, time, host, device, path, total, used, free, used_percent): + self.time = time + self.host = host + self.device = device + self.path = path + self.total = total + self.used = used + self.free = free + self.used_percent = used_percent + + def to_dict(self): + return { + 'time': self.time.isoformat() if self.time else None, + 'host': self.host, + 'device': self.device, + 'path': self.path, + 'total_bytes': float(self.total), + 'used_bytes': float(self.used), + 'free_bytes': float(self.free), + 'used_percent': float(round(self.used_percent, 2)) + } + + +class NetworkMetrics: + def __init__(self, time, host, interface, bytes_sent_bps, bytes_recv_bps): + self.time = time + self.host = host + self.interface = interface + self.bytes_sent_bps = bytes_sent_bps + self.bytes_recv_bps = bytes_recv_bps + + def to_dict(self): + return { + 'time': self.time.isoformat() if self.time else None, + 'host': self.host, + 'interface': self.interface, + 'bytes_sent_bps': float(round(self.bytes_sent_bps, 2)) if self.bytes_sent_bps is not None else None, + 'bytes_recv_bps': float(round(self.bytes_recv_bps, 2)) if self.bytes_recv_bps is not None else None + } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics_database.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics_database.py (revision 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/system_metrics_database.py (nonexistent) @@ -1,109 +0,0 @@ -import psycopg2 -import os - -from hive.utils import andebug - -DB_HOST = os.environ.get("TIMESCALEDB_HOST", "localhost") -DB_NAME = os.environ.get("TIMESCALEDB_DB", "amp_ts") -DB_USER = os.environ.get("TIMESCALEDB_USER", "amp_ts_user") -DB_PASSWORD = os.environ.get("TIMESCALEDB_PASSWORD", "Array@123$") - - -class SystemMetrics: - def __init__(self, time, host, cpu_percent=None, mem_percent=None, disk_io_percent=None, read_speed=None, - write_speed=None): - self.time = time - self.host = host - self.cpu_percent = cpu_percent - self.mem_percent = mem_percent - self.disk_io_percent = disk_io_percent - self.read_speed = read_speed - self.write_speed = write_speed - - def to_dict(self): - data = {'time': self.time.isoformat() if self.time else None, 'host': self.host} - - if self.cpu_percent is not None: - data['cpu_percent'] = float(round(self.cpu_percent, 2)) - - if self.mem_percent is not None: - data['mem_percent'] = float(round(self.mem_percent, 2)) - - if self.disk_io_percent is not None: - data['disk_io_percent'] = float(round(self.disk_io_percent, 2)) - - if self.read_speed is not None: - data['read_speed'] = float(round(self.read_speed, 2)) - - if self.write_speed is not None: - data['write_speed'] = float(round(self.write_speed, 2)) - - return data - - -class DiskMetrics: - def __init__(self, time, host, device, path, total, used, free, used_percent): - self.time = time - self.host = host - self.device = device - self.path = path - self.total = total - self.used = used - self.free = free - self.used_percent = used_percent - - def to_dict(self): - return { - 'time': self.time.isoformat() if self.time else None, - 'host': self.host, - 'device': self.device, - 'path': self.path, - 'total_bytes': float(self.total), - 'used_bytes': float(self.used), - 'free_bytes': float(self.free), - 'used_percent': float(round(self.used_percent, 2)) - } - - -class NetworkMetrics: - def __init__(self, time, host, interface, bytes_sent_bps, bytes_recv_bps): - self.time = time - self.host = host - self.interface = interface - self.bytes_sent_bps = bytes_sent_bps - self.bytes_recv_bps = bytes_recv_bps - - def to_dict(self): - return { - 'time': self.time.isoformat() if self.time else None, - 'host': self.host, - 'interface': self.interface, - 'bytes_sent_bps': float(round(self.bytes_sent_bps, 2)) if self.bytes_sent_bps is not None else None, - 'bytes_recv_bps': float(round(self.bytes_recv_bps, 2)) if self.bytes_recv_bps is not None else None - } - - -def get_db_connection(): - return psycopg2.connect( - host=DB_HOST, - dbname=DB_NAME, - user=DB_USER, - password=DB_PASSWORD - ) - - -def with_db_connection(func): - def wrapper(*args, **kwargs): - conn = None - try: - conn = get_db_connection() - result = func(conn, *args, **kwargs) - return result - except (Exception, psycopg2.DatabaseError) as error: - andebug('an.model.cli', error) - print(f"Error in {func.__name__}: {error}") - finally: - if conn: - conn.close() - - return wrapper Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/__init__.py (added) =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/__init__.py (revision 0) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/__init__.py (revision 0) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/apv_services_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/apv_services_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/apv_services_metrics.py (working copy) @@ -0,0 +1,363 @@ +from hive.db.apv_services_metrics import VirtualServicesMetrics, RealServicesMetrics, LLBMetrics +from hive.db.db_client import with_db_connection + + +class VirtualServicesMetricsRepo: + @staticmethod + @with_db_connection + def get_top_virtual_services_metrics(cur, agent_hosts=None, interval_seconds=20, limit=5): + """ + Fetch top Hits, Connections, and Network metrics from apv_virtual_stats + - agent_hosts: optional list of agent hosts to filter + - interval_seconds: look-back interval for metrics + - limit: top N metrics per category + """ + # Build agent_host filter + host_filter = "" + params = [] + if agent_hosts: + placeholders = ','.join(['%s'] * len(agent_hosts)) + host_filter = f"AND agent_host IN ({placeholders})" + params.extend(agent_hosts) + + _query = f""" + WITH HitsDeltas AS ( + SELECT + ServerId AS service_name, + agent_host, + MAX(total_hits) - MIN(total_hits) AS hits + FROM apv_virtual_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + GROUP BY ServerId, agent_host + ), + HitsTop AS ( + SELECT + 'hits' AS metric, + agent_host, + service_name, + hits AS value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM HitsDeltas + ORDER BY hits DESC + LIMIT {limit} + ), + ConnLatest AS ( + SELECT DISTINCT ON (ServerId, agent_host) + ServerId AS service_name, + agent_host, + ConnCnt + FROM apv_virtual_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + ORDER BY ServerId, agent_host, time DESC + ), + ConnTop AS ( + SELECT + 'connections' AS metric, + agent_host, + service_name, + ConnCnt AS value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM ConnLatest + ORDER BY ConnCnt DESC + LIMIT {limit} + ), + NetLatest AS ( + SELECT DISTINCT ON (ServerId, agent_host) + ServerId AS service_name, + agent_host, + InBytePerSec, + OutBytePerSec + FROM apv_virtual_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + ORDER BY ServerId, agent_host, time DESC + ), + NetTop AS ( + SELECT + 'network' AS metric, + agent_host, + service_name, + (InBytePerSec + OutBytePerSec) AS value, + InBytePerSec AS received, + OutBytePerSec AS sent + FROM NetLatest + ORDER BY (InBytePerSec + OutBytePerSec) DESC + LIMIT {limit} + ) + SELECT * + FROM ( + SELECT * FROM HitsTop + UNION ALL + SELECT * FROM ConnTop + UNION ALL + SELECT * FROM NetTop + ) t + ORDER BY metric, value DESC; + """ + + cur.execute(_query, params) + rows = cur.fetchall() + cur.close() + + # Convert rows to VirtualServicesMetrics objects + metrics_list = [] + for row in rows: + metric_obj = VirtualServicesMetricsRepo.parse_virtual_service_metric(row) + if metric_obj: + metrics_list.append(metric_obj) + return metrics_list + + @staticmethod + def parse_virtual_service_metric(row): + if not row: + return None + metric, agent_host, service_name, value, received, sent = row + return VirtualServicesMetrics( + metric=metric, + agent_host=agent_host, + service_name=service_name, + value=value, + received=received, + sent=sent + ) + + +class RealServicesMetricsRepo: + @staticmethod + @with_db_connection + def get_top_real_services_metrics(cur, agent_hosts=None, interval_seconds=20, limit=5): + """ + Fetch top Requests, Connections, and Network metrics from apv_real_stats + - agent_hosts: optional list of agent hosts to filter + - interval_seconds: look-back interval for metrics + - limit: top N metrics per category + """ + # Build agent_host filter + host_filter = "" + params = [] + if agent_hosts: + placeholders = ','.join(['%s'] * len(agent_hosts)) + host_filter = f"AND agent_host IN ({placeholders})" + params.extend(agent_hosts) + + _query = f""" + WITH ReqLatest AS ( + SELECT DISTINCT ON (real_server_id, agent_host) + real_server_id AS service_name, + agent_host, + rs_cnt_of_req AS value + FROM apv_real_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + ORDER BY real_server_id, agent_host, time DESC + ), + ReqTop AS ( + SELECT + 'requests' AS metric, + agent_host, + service_name, + value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM ReqLatest + ORDER BY value DESC + LIMIT {limit} + ), + ConnLatest AS ( + SELECT DISTINCT ON (real_server_id, agent_host) + real_server_id AS service_name, + agent_host, + rs_conn_per_sec AS value + FROM apv_real_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + ORDER BY real_server_id, agent_host, time DESC + ), + ConnTop AS ( + SELECT + 'connections' AS metric, + agent_host, + service_name, + value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM ConnLatest + ORDER BY value DESC + LIMIT {limit} + ), + NetLatest AS ( + SELECT DISTINCT ON (real_server_id, agent_host) + real_server_id AS service_name, + agent_host, + rs_in_byte_per_sec AS received, + rs_out_byte_per_sec AS sent, + (rs_in_byte_per_sec + rs_out_byte_per_sec) AS value + FROM apv_real_stats + WHERE time >= NOW() - INTERVAL '{interval_seconds} seconds' + {host_filter} + ORDER BY real_server_id, agent_host, time DESC + ), + NetTop AS ( + SELECT + 'network' AS metric, + agent_host, + service_name, + value, + received * 8 AS received, + sent * 8 AS sent + FROM NetLatest + ORDER BY value DESC + LIMIT {limit} + ) + SELECT * + FROM ( + SELECT * FROM ReqTop + UNION ALL + SELECT * FROM ConnTop + UNION ALL + SELECT * FROM NetTop + ) t + ORDER BY metric, value DESC; + """ + + cur.execute(_query, params) + rows = cur.fetchall() + cur.close() + + metrics_list = [] + for row in rows: + metric_obj = RealServicesMetricsRepo.parse_real_service_metric(row) + if metric_obj: + metrics_list.append(metric_obj) + return metrics_list + + @staticmethod + def parse_real_service_metric(row): + if not row: + return None + metric, agent_host, service_name, value, received, sent = row + return RealServicesMetrics( + metric=metric, + agent_host=agent_host, + service_name=service_name, + value=value, + received=received, + sent=sent + ) + + +class LLBMetricsRepo: + @staticmethod + @with_db_connection + def get_top_llb_metrics(cur, interval_seconds=20, limit=5, agent_hosts=None): + # Build agent_host filter + host_filter = "" + params = {"interval": interval_seconds, "limit": limit} + if agent_hosts: + host_filter = "AND agent_host = ANY(%(agent_hosts)s)" + params["agent_hosts"] = agent_hosts + + query = f""" + WITH HitsDeltas AS ( + SELECT + link_name, + agent_host, + MAX(link_hits) - MIN(link_hits) AS hits + FROM apv_llb_stats + WHERE time >= NOW() - INTERVAL '%(interval)s seconds' {host_filter} + GROUP BY link_name, agent_host + ), + HitsTop AS ( + SELECT + 'hits' AS metric, + agent_host, + link_name, + hits AS value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM HitsDeltas + ORDER BY hits DESC + LIMIT %(limit)s + ), + ConnLatest AS ( + SELECT DISTINCT ON (link_name, agent_host) + link_name, + agent_host, + link_conn AS conn + FROM apv_llb_stats + WHERE time >= NOW() - INTERVAL '%(interval)s seconds' {host_filter} + ORDER BY link_name, agent_host, time DESC + ), + ConnTop AS ( + SELECT + 'connections' AS metric, + agent_host, + link_name, + conn AS value, + NULL::bigint AS received, + NULL::bigint AS sent + FROM ConnLatest + ORDER BY conn DESC + LIMIT %(limit)s + ), + NetLatest AS ( + SELECT DISTINCT ON (link_name, agent_host) + link_name, + agent_host, + (link_bandwid_in * 8) AS received, + (link_bandwid_out * 8) AS sent, + ((link_bandwid_in * 8) + (link_bandwid_out * 8)) AS total + FROM apv_llb_stats + WHERE time >= NOW() - INTERVAL '%(interval)s seconds' {host_filter} + ORDER BY link_name, agent_host, time DESC + ), + NetTop AS ( + SELECT + 'throughput' AS metric, + agent_host, + link_name, + total AS value, + received, + sent + FROM NetLatest + ORDER BY total DESC + LIMIT %(limit)s + ) + SELECT * + FROM ( + SELECT * FROM HitsTop + UNION ALL + SELECT * FROM ConnTop + UNION ALL + SELECT * FROM NetTop + ) t + ORDER BY metric, value DESC; + """ + + cur.execute(query, params) + rows = cur.fetchall() + + metrics_list = [] + for row in rows: + metric_obj = LLBMetricsRepo.parse_llb_metric(row) + if metric_obj: + metrics_list.append(metric_obj) + return metrics_list + + @staticmethod + def parse_llb_metric(row): + if not row: + return None + metric, agent_host, link_name, value, received, sent = row + return LLBMetrics( + metric=metric, + agent_host=agent_host, + link_name=link_name, + value=value, + received=received, + sent=sent + ) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/devices_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/devices_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/devices_metrics.py (working copy) @@ -0,0 +1,138 @@ +from hive.db.db_client import with_db_connection +from hive.db.devices_metrics import DevicesMetrics + + +class DevicesMetricsRepo: + @staticmethod + @with_db_connection + def get_top_devices_metrics(cur, agent_hosts=None, interval_seconds=30, limit=5): + """ + Fetch top CPU, Memory, and Network metrics with optional filtering by agent_hosts. + Network throughput calculation is aligned with InfluxDB: + - Time-bucketed (10s) + - Non-negative deltas + - Latest bucket per host + """ + # Build the agent_host filter for LatestMetrics CTE + metrics_where = "" + metrics_params = [] + if agent_hosts: + placeholders = ','.join(['%s'] * len(agent_hosts)) + metrics_where = f"WHERE agent_host IN ({placeholders})" + metrics_params.extend(agent_hosts) + + # Build the network WHERE clause + network_clauses = [] + network_params = [] + if agent_hosts: + placeholders = ','.join(['%s'] * len(agent_hosts)) + network_clauses.append(f"agent_host IN ({placeholders})") + network_params.extend(agent_hosts) + # Always include time filter + network_clauses.append(f"time >= NOW() - INTERVAL '{interval_seconds} seconds'") + network_where = "" + if network_clauses: + network_where = "WHERE " + " AND ".join(network_clauses) + + _query = f""" + WITH LatestMetrics AS ( + SELECT + agent_host, + cpu_usage, + net_mem_usage, + total_in, + total_out, + time, + ROW_NUMBER() OVER(PARTITION BY agent_host ORDER BY time DESC) AS rn + FROM an_device_metrics + {metrics_where} + ), + NetworkBuckets AS ( + SELECT + agent_host, + time_bucket('10 seconds', time) AS bucket_time, + MAX(total_in) AS total_in, + MAX(total_out) AS total_out + FROM an_device_metrics + {network_where} + GROUP BY agent_host, time_bucket('10 seconds', time) + ), + NetworkDeltas AS ( + SELECT + agent_host, + bucket_time, + GREATEST(total_in - LAG(total_in) OVER (PARTITION BY agent_host ORDER BY bucket_time), 0) / 10.0 AS received, + GREATEST(total_out - LAG(total_out) OVER (PARTITION BY agent_host ORDER BY bucket_time), 0) / 10.0 AS sent + FROM NetworkBuckets + ), + LatestNetworkRates AS ( + SELECT + agent_host, + received, + sent, + (received + sent) AS total, + ROW_NUMBER() OVER (PARTITION BY agent_host ORDER BY bucket_time DESC) AS rn + FROM NetworkDeltas + ), + CpuTop AS ( + SELECT 'cpu' AS metric, agent_host, cpu_usage AS value, + NULL::bigint AS total_in, NULL::bigint AS total_out + FROM LatestMetrics + WHERE rn = 1 + ORDER BY cpu_usage DESC + LIMIT {limit} + ), + MemTop AS ( + SELECT 'memory' AS metric, agent_host, net_mem_usage AS value, + NULL::bigint AS total_in, NULL::bigint AS total_out + FROM LatestMetrics + WHERE rn = 1 + ORDER BY net_mem_usage DESC + LIMIT {limit} + ), + NetTop AS ( + SELECT 'network' AS metric, agent_host, NULL::bigint AS value, + received AS total_in, sent AS total_out + FROM LatestNetworkRates + WHERE rn = 1 + ORDER BY total DESC + LIMIT {limit} + ) + SELECT * + FROM ( + SELECT * FROM CpuTop + UNION ALL + SELECT * FROM MemTop + UNION ALL + SELECT * FROM NetTop + ) t + ORDER BY metric, value DESC; + """ + + # Combine parameters for execution + params = metrics_params + network_params + + cur.execute(_query, params) + rows = cur.fetchall() + cur.close() + + # Convert rows to DevicesMetrics objects + metrics_list = [] + for row in rows: + metric_obj = DevicesMetricsRepo.parse_host_metric(row) + if metric_obj: + metrics_list.append(metric_obj) + return metrics_list + + @staticmethod + def parse_host_metric(row): + if not row: + return None + metric, agent_host, value, total_in, total_out = row + return DevicesMetrics( + metric=metric, + agent_host=agent_host, + value=value, + total_in=total_in, + total_out=total_out + ) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/system_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/system_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/repositories/system_metrics.py (working copy) @@ -0,0 +1,264 @@ +from hive.db.db_client import with_db_connection +from hive.db.system_metrics import SystemMetrics, NetworkMetrics, DiskMetrics + + +class SystemMetricsRepo: + @staticmethod + @with_db_connection + def get_latest_cpu(cur, host="AN"): + cpu_query = "SELECT time, host, 100 - usage_idle as cpu_percent FROM cpu WHERE time IN (SELECT max(time) FROM cpu WHERE host = %s) AND host = %s AND cpu = 'cpu-total' ORDER BY time DESC LIMIT 1;" + cur.execute(cpu_query, (host, host)) + result = cur.fetchone() + cur.close() + if result: + time, host, cpu_percent = result + return SystemMetrics(time=time, host=host, cpu_percent=cpu_percent) + return None + + @staticmethod + @with_db_connection + def get_latest_disk_io(cur, host="AN"): + disk_query = """ + SELECT + bucket_time, + ROUND(LEAST((SUM(io_time_total_ms) * 100.0 / 60000), 100), 2) AS disk_io_percent, + ROUND(SUM(read_bytes_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS read_speed_bps, + ROUND(SUM(write_bytes_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS write_speed_bps + FROM ( + SELECT + time_bucket('1 minute', time) AS bucket_time, + GREATEST(io_time::BIGINT - LAG(io_time) OVER (PARTITION BY host ORDER BY time), 0) AS io_time_total_ms, + GREATEST(read_bytes::BIGINT - LAG(read_bytes) OVER (PARTITION BY host ORDER BY time), 0) AS read_bytes_diff, + GREATEST(write_bytes::BIGINT - LAG(write_bytes) OVER (PARTITION BY host ORDER BY time), 0) AS write_bytes_diff, + EXTRACT(EPOCH FROM (time - LAG(time) OVER (PARTITION BY host ORDER BY time))) AS time_diff_sec + FROM diskio + WHERE host = %s + ) sub + WHERE io_time_total_ms IS NOT NULL + GROUP BY bucket_time + ORDER BY bucket_time DESC + LIMIT 1; + """ + cur.execute(disk_query, (host,)) + result = cur.fetchone() + cur.close() + if result: + time, disk_io_percent, read_speed, write_speed = result + return SystemMetrics(time=time, host=host, disk_io_percent=disk_io_percent, read_speed=read_speed, + write_speed=write_speed) + return None + + @staticmethod + @with_db_connection + def get_latest_memory(cur, host="AN"): + mem_query = "SELECT time, host, used_percent as mem_percent FROM mem WHERE time IN (SELECT max(time) FROM mem WHERE host = %s) AND host = %s ORDER BY time DESC LIMIT 1;" + cur.execute(mem_query, (host, host)) + result = cur.fetchone() + cur.close() + if result: + time, host, mem_percent = result + return SystemMetrics(time=time, host=host, mem_percent=mem_percent) + return None + + @staticmethod + @with_db_connection + def get_latest_disk_usage(cur, host="AN"): + disk_query = """ + SELECT time, + host, + device, + path, + total, + used, + free, + used_percent + FROM disk + WHERE (host, device, time) IN (SELECT host, + device, + MAX(time) + FROM disk + WHERE host = %s + AND path NOT LIKE 'tmpfs' + GROUP BY host, device) + ORDER BY device ASC; \ + """ + + cur.execute(disk_query, (host,)) + results = cur.fetchall() + cur.close() + metrics_list = [] + for time, host, device, path, total, used, free, used_percent in results: + metrics_list.append(DiskMetrics( + time=time, + host=host, + device=device, + path=path, + total=total, + used=used, + free=free, + used_percent=used_percent + )) + return [m.to_dict() for m in metrics_list] + + @staticmethod + @with_db_connection + def get_latest_throughput(cur, host="AN"): + net_query = """ + SELECT + bucket_time, + interface, + ROUND(SUM(bytes_sent_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_sent_bps, + ROUND(SUM(bytes_recv_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_recv_bps + FROM ( + SELECT + time_bucket('1 minute', time) AS bucket_time, + interface, + GREATEST(bytes_sent::BIGINT - LAG(bytes_sent) OVER (PARTITION BY host, interface ORDER BY time), 0) AS bytes_sent_diff, + GREATEST(bytes_recv::BIGINT - LAG(bytes_recv) OVER (PARTITION BY host, interface ORDER BY time), 0) AS bytes_recv_diff, + EXTRACT(EPOCH FROM (time - LAG(time) OVER (PARTITION BY host, interface ORDER BY time))) AS time_diff_sec + FROM net + WHERE host = %s AND interface NOT LIKE 'lo' AND interface NOT LIKE 'all' + ) sub + WHERE bytes_sent_diff IS NOT NULL + GROUP BY bucket_time, interface + ORDER BY bucket_time DESC + LIMIT 1; + """ + cur.execute(net_query, (host,)) + results = cur.fetchall() + cur.close() + + metrics_list = [] + for time, interface, bytes_sent, bytes_recv in results: + metrics_list.append(NetworkMetrics( + time=time, + host=host, + interface=interface, + bytes_sent_bps=bytes_sent, + bytes_recv_bps=bytes_recv + )) + return [m.to_dict() for m in metrics_list] + + @staticmethod + @with_db_connection + def get_historical_cpu(cur, bucket_interval, start_time, end_time, host='AN'): + cpu_query = """ + SELECT time_bucket(%s, time) AS bucket_time, + last(100 - usage_idle, time) AS cpu_usage + FROM cpu + WHERE time BETWEEN %s AND %s + AND host = %s + AND cpu = 'cpu-total' + GROUP BY bucket_time + ORDER BY bucket_time ASC; \ + """ + cur.execute(cpu_query, (bucket_interval, start_time, end_time, host)) + results = cur.fetchall() + cur.close() + + metrics_list = [] + for time_bucket, usage in results: + metrics_list.append(SystemMetrics( + time=time_bucket, + host=host, + cpu_percent=usage + )) + return [m.to_dict() for m in metrics_list] + + @staticmethod + @with_db_connection + def get_historical_memory(cur, bucket_interval, start_time, end_time, host='AN'): + mem_query = """ + SELECT time_bucket(%s, time) AS bucket_time, + last(used_percent, time) AS mem_usage + FROM mem + WHERE time BETWEEN %s AND %s + AND host = %s + GROUP BY bucket_time + ORDER BY bucket_time ASC; \ + """ + cur.execute(mem_query, (bucket_interval, start_time, end_time, host)) + results = cur.fetchall() + cur.close() + + metrics_list = [] + for time_bucket, usage in results: + metrics_list.append(SystemMetrics( + time=time_bucket, + host=host, + mem_percent=usage + )) + return [m.to_dict() for m in metrics_list] + + @staticmethod + @with_db_connection + def get_historical_disk_io(cur, bucket_interval, start_time, end_time, host='AN'): + disk_io_query = """ + SELECT bucket_time, + ROUND(LEAST((disk_io_total_ms * 100.0 / 60000), 100), 2) AS disk_io_percent + FROM (SELECT time_bucket('1 minute', time) AS bucket_time, + SUM(GREATEST(io_time::BIGINT - prev_io_time::BIGINT, 0)) AS disk_io_total_ms + FROM (SELECT time, + io_time, + LAG(io_time) OVER (PARTITION BY host ORDER BY time) AS prev_io_time + FROM diskio + WHERE host = %s + AND time BETWEEN %s AND %s) sub + WHERE prev_io_time IS NOT NULL + GROUP BY bucket_time) final + ORDER BY bucket_time ASC; \ + """ + cur.execute(disk_io_query, (host, start_time, end_time)) + results = cur.fetchall() + cur.close() + + metrics_list = [] + for time_bucket, usage in results: + metrics_list.append(SystemMetrics( + time=time_bucket, + host=host, + disk_io_percent=usage + )) + return [m.to_dict() for m in metrics_list] + + @staticmethod + @with_db_connection + def get_historical_throughput(cur, bucket_interval, start_time, end_time, host='AN'): + net_query = """ + SELECT bucket_time, + interface, + ROUND(SUM(bytes_sent_diff) * 8 / GREATEST(1, SUM(time_diff_sec)), + 2) AS bytes_sent_bps, + ROUND(SUM(bytes_recv_diff) * 8 / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_recv_bps + FROM (SELECT time_bucket('1 minute', time) AS bucket_time, + interface, + GREATEST(bytes_sent::BIGINT - + LAG(bytes_sent) OVER (PARTITION BY host, interface ORDER BY time), + 0) AS bytes_sent_diff, + GREATEST(bytes_recv::BIGINT - + LAG(bytes_recv) OVER (PARTITION BY host, interface ORDER BY time), + 0) AS bytes_recv_diff, + EXTRACT(EPOCH FROM + (time - LAG(time) OVER (PARTITION BY host, interface ORDER BY time))) AS time_diff_sec + FROM net + WHERE host = %s + AND interface NOT LIKE 'lo' AND interface NOT LIKE 'all' + AND time BETWEEN %s AND %s) sub + WHERE bytes_sent_diff IS NOT NULL + GROUP BY bucket_time, interface + ORDER BY bucket_time ASC; \ + """ + cur.execute(net_query, (host, start_time, end_time)) + results = cur.fetchall() + cur.close() + + metrics_list = [] + for time, interface, bytes_sent, bytes_recv in results: + metrics_list.append(NetworkMetrics( + time=time, + host=host, + interface=interface, + bytes_sent_bps=bytes_sent, + bytes_recv_bps=bytes_recv + )) + return [m.to_dict() for m in metrics_list] Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/apv_services_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/apv_services_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/apv_services_metrics.py (working copy) @@ -0,0 +1,77 @@ +from hive.repositories.apv_services_metrics import VirtualServicesMetricsRepo, RealServicesMetricsRepo, LLBMetricsRepo + + +def sanitize_metrics(metrics_list): + sanitized = [] + for m in metrics_list: + d = m.to_dict() if hasattr(m, "to_dict") else dict(m) + if d['metric'] in ('connections', 'requests', 'hits'): + d.pop('received', None) + d.pop('sent', None) + elif d['metric'] == 'network': + d.pop('value', None) + sanitized.append(d) + return sanitized + + +def get_top_apv_virtual_services_metrics(agent_hosts=None, interval=30, limit=5): + """ + Wrapper to fetch top devices' metrics. + + :param agent_hosts: list of hostnames to filter (or None for all) + :param interval: interval in seconds for network rate calculation + :param limit: top N hosts per metric + :return: list of dicts representing metrics + """ + metrics_objects = VirtualServicesMetricsRepo.get_top_virtual_services_metrics( + agent_hosts=agent_hosts, + interval_seconds=interval, + limit=limit + ) + + metrics_list = [m.to_dict() for m in metrics_objects] + + metrics_list = sanitize_metrics(metrics_list) + return metrics_list + + +def get_top_apv_real_services_metrics(agent_hosts=None, interval=30, limit=5): + """ + Wrapper to fetch top devices' metrics. + + :param agent_hosts: list of hostnames to filter (or None for all) + :param interval: interval in seconds for network rate calculation + :param limit: top N hosts per metric + :return: list of dicts representing metrics + """ + metrics_objects = RealServicesMetricsRepo.get_top_real_services_metrics( + agent_hosts=agent_hosts, + interval_seconds=interval, + limit=limit + ) + + metrics_list = [m.to_dict() for m in metrics_objects] + + metrics_list = sanitize_metrics(metrics_list) + return metrics_list + + +def get_top_llb_metrics(agent_hosts=None, interval=30, limit=5): + """ + Wrapper to fetch top devices' metrics. + + :param agent_hosts: list of hostnames to filter (or None for all) + :param interval: interval in seconds for network rate calculation + :param limit: top N hosts per metric + :return: list of dicts representing metrics + """ + metrics_objects = LLBMetricsRepo.get_top_llb_metrics( + agent_hosts=agent_hosts, + interval_seconds=interval, + limit=limit + ) + + metrics_list = [m.to_dict() for m in metrics_objects] + + metrics_list = sanitize_metrics(metrics_list) + return metrics_list Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/devices_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/devices_metrics.py (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/devices_metrics.py (working copy) @@ -0,0 +1,36 @@ +from hive.repositories.devices_metrics import DevicesMetricsRepo + + +def sanitize_metrics(metrics_list): + sanitized = [] + for m in metrics_list: + d = m.to_dict() if hasattr(m, "to_dict") else dict(m) + if d['metric'] in ('cpu', 'memory'): + d.pop('total_in', None) + d.pop('total_out', None) + elif d['metric'] == 'network': + d.pop('value', None) + sanitized.append(d) + return sanitized + + +def get_top_devices_metrics(agent_hosts=None, interval=30, limit=5): + """ + Wrapper to fetch top devices' metrics. + + :param agent_hosts: list of hostnames to filter (or None for all) + :param interval: interval in seconds for network rate calculation + :param limit: top N hosts per metric + :return: list of dicts representing metrics + """ + metrics_objects = DevicesMetricsRepo.get_top_devices_metrics( + agent_hosts=agent_hosts, + interval_seconds=interval, + limit=limit + ) + + # Convert DevicesMetrics objects to dictionaries for JSON + metrics_list = [m.to_dict() for m in metrics_objects] + + metrics_list = sanitize_metrics(metrics_list) + return metrics_list Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/system_metrics.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/system_metrics.py (revision 2706) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/system_metrics.py (working copy) @@ -1,325 +1,64 @@ from datetime import datetime, timedelta, timezone -from tzlocal import get_localzone -from hive.db.system_metrics_database import with_db_connection -from hive.db.system_metrics_database import SystemMetrics, DiskMetrics, NetworkMetrics -from hive.utils import andebug +from hive.repositories.system_metrics import SystemMetricsRepo -# ToDo: Add data access layer and reuse the db_client. -# --- LATEST METRICS FUNCTIONS --- - -@with_db_connection -def _get_latest_cpu_metrics(conn, host='AN'): - cur = conn.cursor() - # The query now directly calculates 100 - usage_idle - cpu_query = "SELECT time, host, 100 - usage_idle as cpu_percent FROM cpu WHERE time IN (SELECT max(time) FROM cpu WHERE host = %s) AND host = %s AND cpu = 'cpu-total' ORDER BY time DESC LIMIT 1;" - cur.execute(cpu_query, (host, host)) - result = cur.fetchone() - cur.close() - if result: - time, host, cpu_percent = result - return SystemMetrics(time=time, host=host, cpu_percent=cpu_percent) - return None - - -@with_db_connection -def _get_latest_diskio_metrics(conn, host='AN'): - cur = conn.cursor() - disk_query = """ - SELECT - bucket_time, - ROUND(LEAST((SUM(io_time_total_ms) * 100.0 / 60000), 100), 2) AS disk_io_percent, - ROUND(SUM(read_bytes_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS read_speed_bps, - ROUND(SUM(write_bytes_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS write_speed_bps - FROM ( - SELECT - time_bucket('1 minute', time) AS bucket_time, - GREATEST(io_time::BIGINT - LAG(io_time) OVER (PARTITION BY host ORDER BY time), 0) AS io_time_total_ms, - GREATEST(read_bytes::BIGINT - LAG(read_bytes) OVER (PARTITION BY host ORDER BY time), 0) AS read_bytes_diff, - GREATEST(write_bytes::BIGINT - LAG(write_bytes) OVER (PARTITION BY host ORDER BY time), 0) AS write_bytes_diff, - EXTRACT(EPOCH FROM (time - LAG(time) OVER (PARTITION BY host ORDER BY time))) AS time_diff_sec - FROM diskio - WHERE host = %s - ) sub - WHERE io_time_total_ms IS NOT NULL - GROUP BY bucket_time - ORDER BY bucket_time DESC - LIMIT 1; - """ - cur.execute(disk_query, (host,)) - result = cur.fetchone() - cur.close() - if result: - time, disk_io_percent, read_speed, write_speed = result - return SystemMetrics(time=time, host=host, disk_io_percent=disk_io_percent, read_speed=read_speed, - write_speed=write_speed) - return None - - -@with_db_connection -def _get_latest_mem_metrics(conn, host='AN'): - cur = conn.cursor() - # The query now directly selects used_percent - mem_query = "SELECT time, host, used_percent as mem_percent FROM mem WHERE time IN (SELECT max(time) FROM mem WHERE host = %s) AND host = %s ORDER BY time DESC LIMIT 1;" - cur.execute(mem_query, (host, host)) - result = cur.fetchone() - cur.close() - if result: - time, host, mem_percent = result - return SystemMetrics(time=time, host=host, mem_percent=mem_percent) - return None - - -@with_db_connection -def _get_latest_disk_metrics(conn, host='AN'): - cur = conn.cursor() - disk_query = """ - SELECT time, - host, - device, - path, - total, - used, - free, - used_percent - FROM disk - WHERE (host, device, time) IN (SELECT host, - device, - MAX(time) - FROM disk - WHERE host = %s - AND path NOT LIKE 'tmpfs' - GROUP BY host, device) - ORDER BY device ASC; \ - """ - - cur.execute(disk_query, (host,)) - results = cur.fetchall() - cur.close() - metrics_list = [] - for time, host, device, path, total, used, free, used_percent in results: - metrics_list.append(DiskMetrics( - time=time, - host=host, - device=device, - path=path, - total=total, - used=used, - free=free, - used_percent=used_percent - )) - return [m.to_dict() for m in metrics_list] - - -@with_db_connection -def _get_latest_net_metrics(conn, host='AN'): - cur = conn.cursor() - net_query = """ - SELECT - bucket_time, - interface, - ROUND(SUM(bytes_sent_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_sent_bps, - ROUND(SUM(bytes_recv_diff) / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_recv_bps - FROM ( - SELECT - time_bucket('1 minute', time) AS bucket_time, - interface, - GREATEST(bytes_sent::BIGINT - LAG(bytes_sent) OVER (PARTITION BY host, interface ORDER BY time), 0) AS bytes_sent_diff, - GREATEST(bytes_recv::BIGINT - LAG(bytes_recv) OVER (PARTITION BY host, interface ORDER BY time), 0) AS bytes_recv_diff, - EXTRACT(EPOCH FROM (time - LAG(time) OVER (PARTITION BY host, interface ORDER BY time))) AS time_diff_sec - FROM net - WHERE host = %s AND interface NOT LIKE 'lo' AND interface NOT LIKE 'all' - ) sub - WHERE bytes_sent_diff IS NOT NULL - GROUP BY bucket_time, interface - ORDER BY bucket_time DESC - LIMIT 1; - """ - cur.execute(net_query, (host,)) - results = cur.fetchall() - cur.close() - - metrics_list = [] - for time, interface, bytes_sent, bytes_recv in results: - metrics_list.append(NetworkMetrics( - time=time, - host=host, - interface=interface, - bytes_sent_bps=bytes_sent, - bytes_recv_bps=bytes_recv - )) - return [m.to_dict() for m in metrics_list] - - -def get_latest_system_metrics(host='AN'): - cpu_metrics = _get_latest_cpu_metrics(host=host) - mem_metrics = _get_latest_mem_metrics(host=host) - diskio_metrics = _get_latest_diskio_metrics(host=host) - disk_metrics = _get_latest_disk_metrics(host=host) - net_metrics = _get_latest_net_metrics(host=host) +def get_latest_system_metrics(): + cpu_metrics = SystemMetricsRepo.get_latest_cpu() + mem_metrics = SystemMetricsRepo.get_latest_memory() + disk_io_metrics = SystemMetricsRepo.get_latest_disk_io() + disk_metrics = SystemMetricsRepo.get_latest_disk_usage() + net_metrics = SystemMetricsRepo.get_latest_throughput() return { 'cpu': cpu_metrics.to_dict() if cpu_metrics else None, 'memory': mem_metrics.to_dict() if mem_metrics else None, - 'diskio': diskio_metrics.to_dict() if diskio_metrics else None, + 'disk_io': disk_io_metrics.to_dict() if disk_io_metrics else None, 'disk_usage': disk_metrics, 'net_metrics': net_metrics } # --- LAST 1HOUR METRICS FUNCTIONS --- -@with_db_connection -def _get_historical_cpu_metrics(conn, host='AN', hours=1): - cur = conn.cursor() +def _get_historical_cpu_metrics(hours=1): now_utc_aware = datetime.now(timezone.utc) end_time = now_utc_aware.replace(tzinfo=None) start_time = end_time - timedelta(hours=hours) bucket_interval = '1 minute' - cpu_query = """ - SELECT time_bucket(%s, time) AS bucket_time, - last(100 - usage_idle, time) AS cpu_usage - FROM cpu - WHERE time BETWEEN %s AND %s - AND host = %s - AND cpu = 'cpu-total' - GROUP BY bucket_time - ORDER BY bucket_time ASC; \ - """ - cur.execute(cpu_query, (bucket_interval, start_time, end_time, host)) - results = cur.fetchall() - cur.close() + return SystemMetricsRepo.get_historical_cpu(bucket_interval, start_time, end_time) - metrics_list = [] - for time_bucket, usage in results: - metrics_list.append(SystemMetrics( - time=time_bucket, - host=host, - cpu_percent=usage - )) - return [m.to_dict() for m in metrics_list] - -@with_db_connection -def _get_historical_mem_metrics(conn, host='AN', hours=1): - cur = conn.cursor() +def _get_historical_mem_metrics(hours=1): now_utc_aware = datetime.now(timezone.utc) end_time = now_utc_aware.replace(tzinfo=None) start_time = end_time - timedelta(hours=hours) bucket_interval = '1 minute' - mem_query = """ - SELECT time_bucket(%s, time) AS bucket_time, - last(used_percent, time) AS mem_usage - FROM mem - WHERE time BETWEEN %s AND %s - AND host = %s - GROUP BY bucket_time - ORDER BY bucket_time ASC; \ - """ - cur.execute(mem_query, (bucket_interval, start_time, end_time, host)) - results = cur.fetchall() - cur.close() + return SystemMetricsRepo.get_historical_memory(bucket_interval, start_time, end_time) - metrics_list = [] - for time_bucket, usage in results: - metrics_list.append(SystemMetrics( - time=time_bucket, - host=host, - mem_percent=usage - )) - return [m.to_dict() for m in metrics_list] - -@with_db_connection -def _get_historical_diskio_metrics(conn, host='AN', hours=1): - cur = conn.cursor() +def _get_historical_disk_io_metrics(hours=1): now_utc_aware = datetime.now(timezone.utc) end_time = now_utc_aware.replace(tzinfo=None) start_time = end_time - timedelta(hours=hours) bucket_interval = '1 minute' - diskio_query = """ - SELECT bucket_time, - ROUND(LEAST((disk_io_total_ms * 100.0 / 60000), 100), 2) AS disk_io_percent - FROM (SELECT time_bucket('1 minute', time) AS bucket_time, - SUM(GREATEST(io_time::BIGINT - prev_io_time::BIGINT, 0)) AS disk_io_total_ms - FROM (SELECT time, - io_time, - LAG(io_time) OVER (PARTITION BY host ORDER BY time) AS prev_io_time - FROM diskio - WHERE host = %s - AND time BETWEEN %s AND %s) sub - WHERE prev_io_time IS NOT NULL - GROUP BY bucket_time) final - ORDER BY bucket_time ASC; \ - """ - cur.execute(diskio_query, (host, start_time, end_time)) - results = cur.fetchall() - cur.close() + return SystemMetricsRepo.get_historical_disk_io(bucket_interval, start_time, end_time) - metrics_list = [] - for time_bucket, usage in results: - metrics_list.append(SystemMetrics( - time=time_bucket, - host=host, - disk_io_percent=usage - )) - return [m.to_dict() for m in metrics_list] - -@with_db_connection -def _get_historical_net_metrics(conn, host='AN', hours=1): - cur = conn.cursor() +def _get_historical_net_metrics(hours=1): now_utc_aware = datetime.now(timezone.utc) end_time = now_utc_aware.replace(tzinfo=None) start_time = end_time - timedelta(hours=hours) bucket_interval = '1 minute' - net_query = """ - SELECT bucket_time, - interface, - ROUND(SUM(bytes_sent_diff) * 8 / GREATEST(1, SUM(time_diff_sec)), - 2) AS bytes_sent_bps, - ROUND(SUM(bytes_recv_diff) * 8 / GREATEST(1, SUM(time_diff_sec)), 2) AS bytes_recv_bps - FROM (SELECT time_bucket('1 minute', time) AS bucket_time, - interface, - GREATEST(bytes_sent::BIGINT - - LAG(bytes_sent) OVER (PARTITION BY host, interface ORDER BY time), - 0) AS bytes_sent_diff, - GREATEST(bytes_recv::BIGINT - - LAG(bytes_recv) OVER (PARTITION BY host, interface ORDER BY time), - 0) AS bytes_recv_diff, - EXTRACT(EPOCH FROM - (time - LAG(time) OVER (PARTITION BY host, interface ORDER BY time))) AS time_diff_sec - FROM net - WHERE host = %s - AND interface NOT LIKE 'lo' AND interface NOT LIKE 'all' - AND time BETWEEN %s AND %s) sub - WHERE bytes_sent_diff IS NOT NULL - GROUP BY bucket_time, interface - ORDER BY bucket_time ASC; \ - """ - cur.execute(net_query, (host, start_time, end_time)) - results = cur.fetchall() - cur.close() + return SystemMetricsRepo.get_historical_throughput(bucket_interval, start_time, end_time) - metrics_list = [] - for time, interface, bytes_sent, bytes_recv in results: - metrics_list.append(NetworkMetrics( - time=time, - host=host, - interface=interface, - bytes_sent_bps=bytes_sent, - bytes_recv_bps=bytes_recv - )) - return [m.to_dict() for m in metrics_list] - -def get_historical_system_metrics(host='AN'): - cpu_metrics = _get_historical_cpu_metrics(host=host) - mem_metrics = _get_historical_mem_metrics(host=host) - diskio_metrics = _get_historical_diskio_metrics(host=host) - net_metrics = _get_historical_net_metrics(host=host) +def get_historical_system_metrics(): + cpu_metrics = _get_historical_cpu_metrics() + mem_metrics = _get_historical_mem_metrics() + disk_io_metrics = _get_historical_disk_io_metrics() + net_metrics = _get_historical_net_metrics() return { 'cpu_history': cpu_metrics, 'mem_history': mem_metrics, - 'diskio_history': diskio_metrics, + 'disk_io_history': disk_io_metrics, 'net_history': net_metrics }
|---|