From 4fa6288ed4bfe3d860b5419a3fbcbd2d32f3539c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 28 Nov 2019 22:46:54 +0100
Subject: [PATCH] zabbix_agent/log switch to new log view
 https://github.com/opnsense/plugins/issues/1593

---
 .../mvc/app/models/OPNsense/ZabbixAgent/ACL/ACL.xml       | 3 ++-
 .../mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml     | 2 +-
 net-mgmt/zabbix-agent/src/www/diag_logs_zabbixagent.php   | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 net-mgmt/zabbix-agent/src/www/diag_logs_zabbixagent.php

diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ACL/ACL.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ACL/ACL.xml
index b5e54cd9c..da9df4524 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ACL/ACL.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ACL/ACL.xml
@@ -4,7 +4,8 @@
         <patterns>
             <pattern>ui/zabbixagent/*</pattern>
             <pattern>api/zabbixagent/*</pattern>
-            <pattern>diag_logs_zabbixagent.php</pattern>
+            <pattern>ui/diagnostics/log/zabbix/zabbix_agentd/*</pattern>
+            <pattern>api/diagnostics/log/zabbix/zabbix_agentd/*</pattern>
         </patterns>
     </page-services-zabbixagent>
 </acl>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
index 567e3ac6e..e775ab44d 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
@@ -6,7 +6,7 @@
               <Features url="/ui/zabbixagent#tab_zabbixagent-settings-features"/>
               <Tuning url="/ui/zabbixagent#tab_zabbixagent-settings-tuning"/>
           </Settings>
-          <Log VisibleName="Log File" order="50" url="/diag_logs_zabbixagent.php"/>
+          <Log VisibleName="Log File" order="50" url="/ui/diagnostics/log/zabbix/zabbix_agentd"/>
       </ZabbixAgent>
     </Services>
 </menu>
diff --git a/net-mgmt/zabbix-agent/src/www/diag_logs_zabbixagent.php b/net-mgmt/zabbix-agent/src/www/diag_logs_zabbixagent.php
deleted file mode 100644
index 495569d9f..000000000
--- a/net-mgmt/zabbix-agent/src/www/diag_logs_zabbixagent.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/zabbix/zabbix_agentd.log';
-$logclog = false;
-
-$service_hook = 'zabbix_agentd';
-
-require_once 'diag_logs_template.inc';