Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/system/user_mgmt/__init__.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/system/user_mgmt/__init__.py (revision 2727) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/system/user_mgmt/__init__.py (working copy) @@ -5,7 +5,6 @@ from django.utils.translation import gettext_lazy as _ from cm.lib.postgres_db import DB -from hive.imports.model import * from hive.model.query import clear_cache_all from hive.session import ANSession from hive.model.base import ANModel Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/virtualization/__init__.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/virtualization/__init__.py (revision 2727) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/cm/models/virtualization/__init__.py (working copy) @@ -6,7 +6,6 @@ from cm.lib.communication import call_restapi from cm.lib.postgres_db import DB -from hive.imports.model import * from hive.model.base import * from hive.model.fields.builtin import * from hive.model.action import Action 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 2724) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/device_metric_queries.py (working copy) @@ -17,7 +17,9 @@ COALESCE((last(cpu_usage, time)), 0) AS cpu, COALESCE((last(mem_usage, time)), 0) AS mem, COALESCE((last(net_mem_usage, time)), 0) AS net_mem, - COALESCE((last(connections, time)), 0) AS connections + COALESCE((last(connections, time)), 0) AS connections, + COALESCE(last(total_in, time), 0) AS received, + COALESCE(last(total_out, time), 0) AS sent FROM an_device_metrics WHERE time >= {time_from} AND time <= {time_to} \ No newline at end of file Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/slb_stats_queries.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/slb_stats_queries.py (revision 2724) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/db/slb_stats_queries.py (working copy) @@ -65,7 +65,8 @@ "hits_diff": int, "last_conn_cnt": int, "last_in": float, - "last_out": float + "last_out": float, + "port": int } response["data"] = cast_fields(response["data"], field_casts) return response \ No newline at end of file @@ -334,7 +335,8 @@ "last_req_cnt": int, "last_conn_per_sec": int, "last_in": int, - "last_out": int + "last_out": int, + "port": int } response["data"] = cast_fields(response["data"], field_casts) return response \ No newline at end of file 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 2724) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/services/device_metrics_service.py (working copy) @@ -10,33 +10,31 @@ 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'] json_response = { - "device_stats": device_stats, - "net_throughput": net_throughput + "device_stats": device_stats } return json_response Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py (revision 2724) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/hive/session.py (working copy) @@ -1,6 +1,8 @@ import base64 import time import uuid +import traceback +import json from contextlib import contextmanager from datetime import datetime from datetime import timedelta