From 3805fb8f262e49fdca899127d97defc0714b66cd Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Fri, 12 Aug 2022 01:23:33 +0000 Subject: [PATCH] expose more fields in search amidaware/tacticalrmm-web@93dbc74e334373cb2ad188bdeaec194fa8e351c6 closes #652 --- api/tacticalrmm/agents/serializers.py | 13 +++++++++++++ api/tacticalrmm/agents/views.py | 3 ++- api/tacticalrmm/tacticalrmm/constants.py | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/api/tacticalrmm/agents/serializers.py b/api/tacticalrmm/agents/serializers.py index 3c79a7c0..aaf9082f 100644 --- a/api/tacticalrmm/agents/serializers.py +++ b/api/tacticalrmm/agents/serializers.py @@ -90,6 +90,11 @@ class AgentTableSerializer(serializers.ModelSerializer): last_seen = serializers.ReadOnlyField() pending_actions_count = serializers.ReadOnlyField() has_patches_pending = serializers.ReadOnlyField() + cpu_model = serializers.ReadOnlyField() + graphics = serializers.ReadOnlyField() + local_ips = serializers.ReadOnlyField() + make_model = serializers.ReadOnlyField() + physical_disks = serializers.ReadOnlyField() def get_alert_template(self, obj): @@ -141,6 +146,14 @@ class AgentTableSerializer(serializers.ModelSerializer): "plat", "goarch", "has_patches_pending", + "version", + "operating_system", + "public_ip", + "cpu_model", + "graphics", + "local_ips", + "make_model", + "physical_disks", ] depth = 2 diff --git a/api/tacticalrmm/agents/views.py b/api/tacticalrmm/agents/views.py index 239d0e73..9e77f85e 100644 --- a/api/tacticalrmm/agents/views.py +++ b/api/tacticalrmm/agents/views.py @@ -30,6 +30,7 @@ from scripts.models import Script from scripts.tasks import handle_bulk_command_task, handle_bulk_script_task from tacticalrmm.constants import ( AGENT_DEFER, + AGENT_TABLE_DEFER, AGENT_STATUS_OFFLINE, AGENT_STATUS_ONLINE, AgentHistoryType, @@ -115,7 +116,7 @@ class GetAgents(APIView): Agent.objects.filter_by_role(request.user) # type: ignore .filter(monitoring_type_filter) .filter(client_site_filter) - .defer(*AGENT_DEFER) + .defer(*AGENT_TABLE_DEFER) .select_related( "site__server_policy", "site__workstation_policy", diff --git a/api/tacticalrmm/tacticalrmm/constants.py b/api/tacticalrmm/tacticalrmm/constants.py index b9db0508..56d99ccc 100644 --- a/api/tacticalrmm/tacticalrmm/constants.py +++ b/api/tacticalrmm/tacticalrmm/constants.py @@ -240,6 +240,14 @@ AGENT_DEFER = ( "modified_time", ) +AGENT_TABLE_DEFER = ( + "services", + "created_by", + "created_time", + "modified_by", + "modified_time", +) + ONLINE_AGENTS = ( "pk", "agent_id",