From 712845c4ab708d28b5d9f77c0c97b8e9e9aa88ba Mon Sep 17 00:00:00 2001 From: silversword411 Date: Sat, 30 Aug 2025 00:59:40 -0400 Subject: [PATCH] Remove outdated Antivirus Report v1.1 template and add new versions (v1.3 and v1.3 by Client) with enhanced features, including improved layout, filtering options, and sorting capabilities. --- index.json | 16 ++++++++++++---- ... Install date_by Client descending v1.5.json | 17 +++++++++++++++++ ...Agent TRMM Install date_descending v1.3.json | 15 --------------- ...Agent TRMM Install date_descending v1.5.json | 15 +++++++++++++++ templates/Antivirus Report v1.1.json | 17 ----------------- templates/Antivirus Report v1.3.json | 15 +++++++++++++++ templates/Antivirus Report_by Client v1.3.json | 17 +++++++++++++++++ 7 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 templates/Agent TRMM Install date_by Client descending v1.5.json delete mode 100644 templates/Agent TRMM Install date_descending v1.3.json create mode 100644 templates/Agent TRMM Install date_descending v1.5.json delete mode 100644 templates/Antivirus Report v1.1.json create mode 100644 templates/Antivirus Report v1.3.json create mode 100644 templates/Antivirus Report_by Client v1.3.json diff --git a/index.json b/index.json index 579370d..8875b91 100644 --- a/index.json +++ b/index.json @@ -20,8 +20,12 @@ "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Specs.json" }, { - "name": "Agent TRMM Install date_descending v1.3", - "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20TRMM%20Install%20date_descending%20v1.3.json" + "name": "Agent TRMM Install date_by Client descending v1.5", + "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20TRMM%20Install%20date_by%20Client%20descending%20v1.5.json" + }, + { + "name": "Agent TRMM Install date_descending v1.5", + "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20TRMM%20Install%20date_descending%20v1.5.json" }, { "name": "Agent Uptime_By Client (html) v1.5", @@ -148,8 +152,12 @@ "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report.json" }, { - "name": "Antivirus Report v1.1", - "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report%20v1.1.json" + "name": "Antivirus Report v1.3", + "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report%20v1.3.json" + }, + { + "name": "Antivirus Report_by Client v1.3", + "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report_by%20Client%20v1.3.json" }, { "name": "Audit Logs (csv)", diff --git a/templates/Agent TRMM Install date_by Client descending v1.5.json b/templates/Agent TRMM Install date_by Client descending v1.5.json new file mode 100644 index 0000000..3beadfd --- /dev/null +++ b/templates/Agent TRMM Install date_by Client descending v1.5.json @@ -0,0 +1,17 @@ +{ + "base_template": { + "name": "TRMM_Base v1", + "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" + }, + "template": { + "name": "Agent TRMM Install date_by Client descending v1.5", + "template_css": "", + "template_md": "{% block content %}\r\n\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

TRMM Agents Installation Report

\r\n

Client: All | Site: All

\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agents %}\r\n {% if item.site__client__name not in clients %}{% set _ = clients.append(item.site__client__name) %}{% endif %}\r\n {% if item.site__name not in sites %}{% set _ = sites.append(item.site__name) %}{% endif %}\r\n{% endfor %}\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for item in data_sources.agents %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
\r\n
\r\n Client\r\n
\r\n \r\n 		\r\n
\r\n Site\r\n
\r\n \r\n 		\r\n
Agent
\r\n 		\r\n
User
\r\n 		\r\n
Installation Date
\r\n
{{ item.site__client__name }}{{ item.site__name }}{{ item.hostname }}{{ item.last_logged_in_user }}\r\n {% if item.created_time %}{{ item.created_time.strftime('%Y-%m-%d %H:%M') }}{% else %}N/A{% endif %}\r\n
\r\n
\r\n\r\n\r\n{% endblock %}", + "type": "html", + "depends_on": [ + "client" + ], + "template_variables": "data_sources:\r\n agents:\r\n model: agent\r\n select_related:\r\n - site\r\n - site__client\r\n only:\r\n - hostname\r\n - last_logged_in_user\r\n - created_time\r\n - site__name\r\n - site__client__name\r\n order_by:\r\n - -created_time\r\n filter:\r\n site__client_id: \"{{client.id}}\"\r\nreport_run_timestamp: !now" + }, + "assets": [] +} \ No newline at end of file diff --git a/templates/Agent TRMM Install date_descending v1.3.json b/templates/Agent TRMM Install date_descending v1.3.json deleted file mode 100644 index 7d10033..0000000 --- a/templates/Agent TRMM Install date_descending v1.3.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "base_template": { - "name": "TRMM_Base v1", - "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" - }, - "template": { - "name": "Agent TRMM Install date_descending v1.3", - "template_css": "", - "template_md": "{% block content %}\r\n\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

TRMM Agents Installation Report

\r\n

Client: All | Site: All

\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agents %}\r\n {% if item.site__client__name not in clients %}\r\n {% set _ = clients.append(item.site__client__name) %}\r\n {% endif %}\r\n {% if item.site__name not in sites %}\r\n {% set _ = sites.append(item.site__name) %}\r\n {% endif %}\r\n{% endfor %}\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for item in data_sources.agents %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
\r\n Client\r\n \r\n \r\n Site\r\n \r\n AgentUserInstallation Date
{{ item.site__client__name }}{{ item.site__name }}{{ item.hostname }}{{ item.last_logged_in_user }}{% if item.created_time %}{{ item.created_time.strftime('%Y-%m-%d %H:%M') }}{% else %}N/A{% endif %}
\r\n
\r\n\r\n\r\n{% endblock %}", - "type": "html", - "depends_on": [], - "template_variables": "data_sources:\r\n agents:\r\n model: agent\r\n select_related:\r\n - site\r\n - site__client\r\n only:\r\n - hostname\r\n - last_logged_in_user\r\n - created_time\r\n - site__name\r\n - site__client__name\r\n order_by:\r\n - -created_time\r\nreport_run_timestamp: !now" - }, - "assets": [] -} \ No newline at end of file diff --git a/templates/Agent TRMM Install date_descending v1.5.json b/templates/Agent TRMM Install date_descending v1.5.json new file mode 100644 index 0000000..eac4825 --- /dev/null +++ b/templates/Agent TRMM Install date_descending v1.5.json @@ -0,0 +1,15 @@ +{ + "base_template": { + "name": "TRMM_Base v1", + "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" + }, + "template": { + "name": "Agent TRMM Install date_descending v1.5", + "template_css": "", + "template_md": "{% block content %}\r\n\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

TRMM Agents Installation Report

\r\n

Client: All | Site: All

\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agents %}\r\n {% if item.site__client__name not in clients %}{% set _ = clients.append(item.site__client__name) %}{% endif %}\r\n {% if item.site__name not in sites %}{% set _ = sites.append(item.site__name) %}{% endif %}\r\n{% endfor %}\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for item in data_sources.agents %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
\r\n
\r\n Client\r\n
\r\n \r\n 		\r\n
\r\n Site\r\n
\r\n \r\n 		\r\n
Agent
\r\n 		\r\n
User
\r\n 		\r\n
Installation Date
\r\n
{{ item.site__client__name }}{{ item.site__name }}{{ item.hostname }}{{ item.last_logged_in_user }}\r\n {% if item.created_time %}{{ item.created_time.strftime('%Y-%m-%d %H:%M') }}{% else %}N/A{% endif %}\r\n
\r\n
\r\n\r\n\r\n{% endblock %}", + "type": "html", + "depends_on": [], + "template_variables": "data_sources:\r\n agents:\r\n model: agent\r\n select_related:\r\n - site\r\n - site__client\r\n only:\r\n - hostname\r\n - last_logged_in_user\r\n - created_time\r\n - site__name\r\n - site__client__name\r\n order_by:\r\n - -created_time\r\nreport_run_timestamp: !now" + }, + "assets": [] +} \ No newline at end of file diff --git a/templates/Antivirus Report v1.1.json b/templates/Antivirus Report v1.1.json deleted file mode 100644 index 37c79be..0000000 --- a/templates/Antivirus Report v1.1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "base_template": { - "name": "TRMM_Base v1", - "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" - }, - "template": { - "name": "Antivirus Report v1.1", - "template_css": "", - "template_md": "{% block content %}\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

Audit Log

\r\n

Client: {{ client.name }}

\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for item in data_sources.agentsList %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
ClientSiteDevice NameUserDevice OSAntivirus
{{ item.site__client__name }}{{ item.site__name }}\r\n {{ item.hostname }}
\r\n {% if item.last_seen %}\r\n 30 %} class=\"text-danger\" {% endif %}>\r\n Last Seen: {{ item.last_seen.astimezone(ZoneInfo('America/New_York')).strftime('%Y-%m-%d %H:%M:%S') }}\r\n \r\n {% else %}\r\n \r\n {% endif %}\r\n 		{{ item.last_logged_in_user }}{{ item.operating_system }}\r\n {% if item.custom_fields and 'Antivirus' in item.custom_fields %}\r\n {{ item.custom_fields.Antivirus }}\r\n {% endif %}\r\n
\r\n
\r\n{% endblock %}", - "type": "html", - "depends_on": [ - "client" - ], - "template_variables": "data_sources:\n agentsList:\n filter:\n site__client_id: \"{{client.id}}\"\n custom_fields:\n - Antivirus\n model: agent\n only:\n - hostname\n - site__client__name\n - site__name\n - operating_system\n - site__name\n - last_seen\n - last_logged_in_user\nreport_run_timestamp: !now" - }, - "assets": [] -} \ No newline at end of file diff --git a/templates/Antivirus Report v1.3.json b/templates/Antivirus Report v1.3.json new file mode 100644 index 0000000..c4a8496 --- /dev/null +++ b/templates/Antivirus Report v1.3.json @@ -0,0 +1,15 @@ +{ + "base_template": { + "name": "TRMM_Base v1", + "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" + }, + "template": { + "name": "Antivirus Report v1.3", + "template_css": "", + "template_md": "{% block content %}\r\n\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

Antivirus Report

\r\n

Client: All | Site: All

\r\n
Filtered Row Count: 0
\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agentsList %}\r\n {% if item.site__client__name not in clients %}\r\n {% set _ = clients.append(item.site__client__name) %}\r\n {% endif %}\r\n {% if item.site__name not in sites %}\r\n {% set _ = sites.append(item.site__name) %}\r\n {% endif %}\r\n{% endfor %}\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n {% for item in data_sources.agentsList %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
\r\n
\r\n Client\r\n \r\n
\r\n \r\n 		\r\n
\r\n Site\r\n \r\n
\r\n \r\n 		\r\n
\r\n Device Name\r\n \r\n
\r\n 		\r\n
\r\n User\r\n \r\n
\r\n \r\n 		\r\n
\r\n Device OS\r\n \r\n
\r\n \r\n 		\r\n
\r\n Antivirus\r\n \r\n
\r\n \r\n
{{ item.site__client__name }}{{ item.site__name }}\r\n {{ item.hostname }}
\r\n {% if item.last_seen %}\r\n \r\n Last Seen: {{ item.last_seen.astimezone(ZoneInfo('America/New_York')).strftime('%Y-%m-%d %H:%M:%S') }}\r\n \r\n {% else %}\r\n  \r\n {% endif %}\r\n 		{{ item.last_logged_in_user }}{{ item.operating_system }}\r\n {% if item.custom_fields and 'Antivirus' in item.custom_fields %}\r\n {{ item.custom_fields.Antivirus }}\r\n {% endif %}\r\n
\r\n\r\n\r\n{% endblock %}", + "type": "html", + "depends_on": [], + "template_variables": "data_sources:\n agentsList:\n custom_fields:\n - Antivirus\n model: agent\n only:\n - hostname\n - site__client__name\n - site__name\n - operating_system\n - site__name\n - last_seen\n - last_logged_in_user\nreport_run_timestamp: !now" + }, + "assets": [] +} \ No newline at end of file diff --git a/templates/Antivirus Report_by Client v1.3.json b/templates/Antivirus Report_by Client v1.3.json new file mode 100644 index 0000000..d0c3c9f --- /dev/null +++ b/templates/Antivirus Report_by Client v1.3.json @@ -0,0 +1,17 @@ +{ + "base_template": { + "name": "TRMM_Base v1", + "html": "\n\n\n \n\n\n\n {% block content %}{% endblock %}\n\n\n" + }, + "template": { + "name": "Antivirus Report_by Client v1.3", + "template_css": "", + "template_md": "{% block content %}\r\n\r\n\r\n
\r\n
\r\n \"Amidaware\r\n
\r\n
\r\n

Antivirus Report

\r\n

Client: All | Site: All

\r\n
Filtered Row Count: 0
\r\n
\r\n
\r\n

Report Date:
{{ report_run_timestamp.strftime('%B %d, %Y') }}

\r\n
\r\n
\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agentsList %}\r\n {% if item.site__client__name not in clients %}\r\n {% set _ = clients.append(item.site__client__name) %}\r\n {% endif %}\r\n {% if item.site__name not in sites %}\r\n {% set _ = sites.append(item.site__name) %}\r\n {% endif %}\r\n{% endfor %}\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n {% for item in data_sources.agentsList %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
\r\n
\r\n Client\r\n \r\n
\r\n \r\n 		\r\n
\r\n Site\r\n \r\n
\r\n \r\n 		\r\n
\r\n Device Name\r\n \r\n
\r\n 		\r\n
\r\n User\r\n \r\n
\r\n \r\n 		\r\n
\r\n Device OS\r\n \r\n
\r\n \r\n 		\r\n
\r\n Antivirus\r\n \r\n
\r\n \r\n
{{ item.site__client__name }}{{ item.site__name }}\r\n {{ item.hostname }}
\r\n {% if item.last_seen %}\r\n \r\n Last Seen: {{ item.last_seen.astimezone(ZoneInfo('America/New_York')).strftime('%Y-%m-%d %H:%M:%S') }}\r\n \r\n {% else %}\r\n  \r\n {% endif %}\r\n 		{{ item.last_logged_in_user }}{{ item.operating_system }}\r\n {% if item.custom_fields and 'Antivirus' in item.custom_fields %}\r\n {{ item.custom_fields.Antivirus }}\r\n {% endif %}\r\n
\r\n\r\n\r\n{% endblock %}", + "type": "html", + "depends_on": [ + "client" + ], + "template_variables": "data_sources:\n agentsList:\n filter:\n site__client_id: \"{{client.id}}\"\n custom_fields:\n - Antivirus\n model: agent\n only:\n - hostname\n - site__client__name\n - site__name\n - operating_system\n - site__name\n - last_seen\n - last_logged_in_user\nreport_run_timestamp: !now" + }, + "assets": [] +} \ No newline at end of file