From c56fff792db0a5c440e4cf84dbb4a1d41a039535 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 28 Nov 2019 17:29:10 +0100
Subject: [PATCH] log: move core modules to new mvc module. for
 https://github.com/opnsense/core/issues/3831

---
 .../OPNsense/CaptivePortal/Menu/Menu.xml      |  2 +-
 .../mvc/app/models/OPNsense/Core/ACL/ACL.xml  | 36 ++++++++++++------
 .../app/models/OPNsense/Core/Menu/Menu.xml    | 22 +++++------
 .../app/models/OPNsense/Dnsmasq/ACL/ACL.xml   |  3 +-
 .../app/models/OPNsense/Dnsmasq/Menu/Menu.xml |  2 +-
 .../mvc/app/models/OPNsense/IDS/ACL/ACL.xml   |  3 +-
 .../mvc/app/models/OPNsense/IDS/Menu/Menu.xml |  2 +-
 .../mvc/app/models/OPNsense/IPsec/ACL/ACL.xml |  3 +-
 .../app/models/OPNsense/IPsec/Menu/Menu.xml   |  2 +-
 .../mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml  |  3 +-
 .../app/models/OPNsense/Ntpd/Menu/Menu.xml    |  2 +-
 .../mvc/app/models/OPNsense/Proxy/ACL/ACL.xml |  3 +-
 .../app/models/OPNsense/Proxy/Menu/Menu.xml   |  8 ++--
 .../app/models/OPNsense/Unbound/ACL/ACL.xml   |  3 +-
 .../app/models/OPNsense/Unbound/Menu/Menu.xml |  2 +-
 .../app/views/OPNsense/Diagnostics/log.volt   |  2 -
 src/www/configd_logs.php                      |  6 ---
 src/www/diag_logs.php                         |  6 ---
 src/www/diag_logs_auth.php                    |  6 ---
 src/www/diag_logs_dhcp.php                    | 14 -------
 src/www/diag_logs_dnsmasq.php                 |  8 ----
 src/www/diag_logs_filter_plain.php            |  6 ---
 src/www/diag_logs_gateways.php                |  8 ----
 src/www/diag_logs_ipsec.php                   |  8 ----
 src/www/diag_logs_ntpd.php                    |  8 ----
 src/www/diag_logs_openvpn.php                 |  6 ---
 src/www/diag_logs_pkg.php                     |  6 ---
 src/www/diag_logs_ppp.php                     |  6 ---
 src/www/diag_logs_proxy.php                   | 37 -------------------
 src/www/diag_logs_resolver.php                |  8 ----
 src/www/diag_logs_routing.php                 |  6 ---
 src/www/diag_logs_suricata.php                |  8 ----
 src/www/diag_logs_wireless.php                |  6 ---
 src/www/httpd_logs.php                        |  6 ---
 34 files changed, 57 insertions(+), 200 deletions(-)
 delete mode 100644 src/www/configd_logs.php
 delete mode 100644 src/www/diag_logs.php
 delete mode 100644 src/www/diag_logs_auth.php
 delete mode 100644 src/www/diag_logs_dhcp.php
 delete mode 100644 src/www/diag_logs_dnsmasq.php
 delete mode 100644 src/www/diag_logs_filter_plain.php
 delete mode 100644 src/www/diag_logs_gateways.php
 delete mode 100644 src/www/diag_logs_ipsec.php
 delete mode 100644 src/www/diag_logs_ntpd.php
 delete mode 100644 src/www/diag_logs_openvpn.php
 delete mode 100644 src/www/diag_logs_pkg.php
 delete mode 100644 src/www/diag_logs_ppp.php
 delete mode 100644 src/www/diag_logs_proxy.php
 delete mode 100644 src/www/diag_logs_resolver.php
 delete mode 100644 src/www/diag_logs_routing.php
 delete mode 100644 src/www/diag_logs_suricata.php
 delete mode 100644 src/www/diag_logs_wireless.php
 delete mode 100644 src/www/httpd_logs.php

diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml
index 7e3611b54..2545ffc28 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml
@@ -4,7 +4,7 @@
             <Administration order="10" url="/ui/captiveportal"/>
             <Sessions order="20" url="/ui/captiveportal/session"/>
             <Vouchers order="30" url="/ui/captiveportal/voucher"/>
-            <Log order="40" VisibleName="Log File" url="/diag_logs_auth.php"/>
+            <Log order="40" VisibleName="Log File" url="/ui/diagnostics/log/core/portalauth"/>
         </CaptivePortal>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index 099e36d16..17bfcac9a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -89,13 +89,15 @@
     <page-diagnostics-logs-dhcp>
         <name>Diagnostics: Logs: DHCP</name>
         <patterns>
-            <pattern>diag_logs_dhcp.php*</pattern>
+            <pattern>ui/diagnostics/log/core/dhcp/*</pattern>
+            <pattern>api/diagnostics/log/core/dhcp/*</pattern>
         </patterns>
     </page-diagnostics-logs-dhcp>
     <page-diagnostics-logs-gateways>
         <name>Diagnostics: Logs: Gateways</name>
         <patterns>
-            <pattern>diag_logs_gateways.php*</pattern>
+            <pattern>ui/diagnostics/log/core/gateways/*</pattern>
+            <pattern>api/diagnostics/log/core/gateways/*</pattern>
         </patterns>
     </page-diagnostics-logs-gateways>
     <page-diagnostics-logs-settings>
@@ -107,9 +109,12 @@
     <page-diagnostics-logs-system>
         <name>Diagnostics: Logs: System</name>
         <patterns>
-            <pattern>configd_logs.php</pattern>
-            <pattern>diag_logs.php</pattern>
-            <pattern>httpd_logs.php</pattern>
+            <pattern>ui/diagnostics/log/core/configd/*</pattern>
+            <pattern>api/diagnostics/log/core/configd/*</pattern>
+            <pattern>ui/diagnostics/log/core/system/*</pattern>
+            <pattern>api/diagnostics/log/core/system/*</pattern>
+            <pattern>ui/diagnostics/log/core/lighttpd/*</pattern>
+            <pattern>api/diagnostics/log/core/lighttpd/*</pattern>
         </patterns>
     </page-diagnostics-logs-system>
     <page-diagnostics-packetcapture>
@@ -296,7 +301,8 @@
     <page-diagnostics-logs-firewall-plain>
         <name>Diagnostics: Logs: Firewall: Plain View</name>
         <patterns>
-            <pattern>diag_logs_filter_plain.php*</pattern>
+            <pattern>ui/diagnostics/log/core/filter/*</pattern>
+            <pattern>api/diagnostics/log/core/filter/*</pattern>
         </patterns>
     </page-diagnostics-logs-firewall-plain>
     <page-diagnostics-logs-firewall-dynamic>
@@ -521,31 +527,36 @@
     <page-status-systemlogs-portalauth>
         <name>Status: System logs: Captive portal</name>
         <patterns>
-            <pattern>diag_logs_auth.php*</pattern>
+            <pattern>ui/diagnostics/log/core/portalauth/*</pattern>
+            <pattern>api/diagnostics/log/core/portalauth/*</pattern>
         </patterns>
     </page-status-systemlogs-portalauth>
     <page-status-systemlogs-ppp>
         <name>Status: System logs: PPP</name>
         <patterns>
-            <pattern>diag_logs_ppp.php*</pattern>
+            <pattern>ui/diagnostics/log/core/ppp/*</pattern>
+            <pattern>api/diagnostics/log/core/ppp/*</pattern>
         </patterns>
     </page-status-systemlogs-ppp>
     <page-status-systemlogs-openvpn>
         <name>Status: System logs: OpenVPN</name>
         <patterns>
-            <pattern>diag_logs_openvpn.php*</pattern>
+            <pattern>ui/diagnostics/log/core/openvpn/*</pattern>
+            <pattern>api/diagnostics/log/core/openvpn/*</pattern>
         </patterns>
     </page-status-systemlogs-openvpn>
     <page-status-systemlogs-routing>
         <name>Status: System logs: Routing</name>
         <patterns>
-            <pattern>diag_logs_routing.php*</pattern>
+            <pattern>ui/diagnostics/log/core/routing/*</pattern>
+            <pattern>api/diagnostics/log/core/routing/*</pattern>
         </patterns>
     </page-status-systemlogs-routing>
     <page-status-systemlogs-wireless>
         <name>Status: System logs: Wireless</name>
         <patterns>
-            <pattern>diag_logs_wireless.php*</pattern>
+            <pattern>ui/diagnostics/log/core/wireless/*</pattern>
+            <pattern>api/diagnostics/log/core/wireless/*</pattern>
         </patterns>
     </page-status-systemlogs-wireless>
     <page-status-trafficgraph>
@@ -620,7 +631,8 @@
         <patterns>
             <pattern>ui/core/firmware/*</pattern>
             <pattern>api/core/firmware/*</pattern>
-            <pattern>diag_logs_pkg.php</pattern>
+            <pattern>ui/diagnostics/log/core/pkg/*</pattern>
+            <pattern>api/diagnostics/log/core/pkg/*</pattern>
         </patterns>
     </page-system-firmware-manualupdate>
     <page-system-gatewaygroups>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
index 9de20721d..e0e7ef962 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
@@ -44,7 +44,7 @@
             <Changelog order="40" url="/ui/core/firmware#changelog"/>
             <Settings order="50" url="/ui/core/firmware#settings"/>
             <Reporter order="60" url="/crash_reporter.php"/>
-            <LogFile order="100" VisibleName="Log File" url="/diag_logs_pkg.php"/>
+            <LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/pkg"/>
         </Firmware>
         <Gateways cssClass="fa fa-location-arrow fa-fw">
             <Single order="10" url="/system_gateways.php">
@@ -55,7 +55,7 @@
                 <List url="/system_gateway_groups.php*" visibility="hidden"/>
                 <Edit url="/system_gateway_groups_edit.php*" visibility="hidden"/>
             </Group>
-            <LogFile VisibleName="Log File" order="30" url="/diag_logs_gateways.php"/>
+            <LogFile VisibleName="Log File" order="30" url="/ui/diagnostics/log/core/gateways"/>
         </Gateways>
         <HighAvailability VisibleName="High Availability" cssClass="fa fa-refresh fa-fw">
             <Settings order="100" url="/system_hasync.php"/>
@@ -63,7 +63,7 @@
         </HighAvailability>
         <Routes cssClass="fa fa-map-signs fa-fw">
             <Configuration order="10" url="/ui/routes" />
-            <LogFile order="100" VisibleName="Log File" url="/diag_logs_routing.php"/>
+            <LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/routing"/>
         </Routes>
         <Settings cssClass="fa fa-cogs fa-fw">
             <Administration url="/system_advanced_admin.php"/>
@@ -89,9 +89,9 @@
         </Trust>
         <Wizard url="/wizard.php?xml=system" cssClass="fa fa-magic fa-fw"/>
         <LogFiles order="150" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
-            <Backend url="/configd_logs.php"/>
-            <General url="/diag_logs.php"/>
-            <WebGUI VisibleName="Web GUI" url="/httpd_logs.php"/>
+            <Backend url="/ui/diagnostics/log/core/configd"/>
+            <General url="/ui/diagnostics/log/core/system"/>
+            <WebGUI VisibleName="Web GUI" url="/ui/diagnostics/log/core/lighttpd"/>
         </LogFiles>
         <Diagnostics order="160" cssClass="fa fa-medkit fa-fw">
             <Services url="/status_services.php">
@@ -107,13 +107,13 @@
             <Devices url="/interfaces_wireless.php">
                 <Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
             </Devices>
-            <LogFile VisibleName="Log File" url="/diag_logs_wireless.php"/>
+            <LogFile VisibleName="Log File" url="/ui/diagnostics/log/core/wireless"/>
         </Wireless>
         <PPP order="940" VisibleName="Point-to-Point" cssClass="fa fa-tty fa-fw">
             <Devices url="/interfaces_ppps.php">
                 <Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
             </Devices>
-            <LogFile VisibleName="Log File" url="/diag_logs_ppp.php"/>
+            <LogFile VisibleName="Log File" url="/ui/diagnostics/log/core/ppp"/>
         </PPP>
         <Types VisibleName="Other Types" order="950" cssClass="fa fa-archive fa-fw">
             <Bridge url="/interfaces_bridge.php">
@@ -196,7 +196,7 @@
         <LogFiles order="400" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
             <Live VisibleName="Live View" url="/ui/diagnostics/firewall/log"/>
             <Overview url="/diag_logs_filter_summary.php"/>
-            <Plain VisibleName="Plain View" url="/diag_logs_filter_plain.php"/>
+            <Plain VisibleName="Plain View" url="/ui/diagnostics/log/core/filter"/>
         </LogFiles>
     </Firewall>
     <Services order="60" cssClass="fa fa-cog">
@@ -205,7 +205,7 @@
             <Leases order="300" url="/status_dhcp_leases.php">
                 <Details url="/status_dhcp_leases.php?*" visibility="hidden"/>
             </Leases>
-            <LogFile VisibleName="Log File" order="400" url="/diag_logs_dhcp.php"/>
+            <LogFile VisibleName="Log File" order="400" url="/ui/diagnostics/log/core/dhcpd"/>
         </DHCPv4>
         <DHCPv6 cssClass="fa fa-bullseye fa-fw">
             <Relay order="300" url="/services_dhcpv6_relay.php"/>
@@ -232,7 +232,7 @@
                 <Edit url="/ui/openvpn/export?*" visibility="hidden"/>
             </ClientExport>
             <Status order="60" VisibleName="Connection Status" url="/status_openvpn.php"/>
-            <LogFile order="70" VisibleName="Log File" url="/diag_logs_openvpn.php"/>
+            <LogFile order="70" VisibleName="Log File" url="/ui/diagnostics/log/core/openvpn"/>
         </OpenVPN>
     </VPN>
     <Power order="70" cssClass="fa fa-plug">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml
index 450e8a528..2d9b48644 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml
@@ -20,7 +20,8 @@
     <page-diagnostics-logs-dnsmasq>
         <name>Services: Dnsmasq DNS: Log File</name>
         <patterns>
-            <pattern>diag_logs_dnsmasq.php*</pattern>
+            <pattern>ui/diagnostics/log/dnsmasq/*</pattern>
+            <pattern>api/diagnostics/log/dnsmasq/*</pattern>
         </patterns>
     </page-diagnostics-logs-dnsmasq>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
index cbc0926f5..e9a0052de 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
@@ -5,7 +5,7 @@
             <Hosts url="/services_dnsmasq_edit.php*" visibility="hidden"/>
             <Domains url="/services_dnsmasq_domainoverride_edit.php*" visibility="hidden"/>
           </Settings>
-          <LogFile VisibleName="Log File" order="50" url="/diag_logs_dnsmasq.php"/>
+          <LogFile VisibleName="Log File" order="50" url="/ui/diagnostics/log/core/dnsmasq"/>
         </Dnsmasq>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
index adce452f5..84ec5fa61 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
@@ -4,7 +4,8 @@
         <patterns>
             <pattern>ui/ids/*</pattern>
             <pattern>api/ids/*</pattern>
-            <pattern>diag_logs_suricata.php*</pattern>
+            <pattern>ui/diagnostics/log/suricata/*</pattern>
+            <pattern>api/diagnostics/log/suricata/*</pattern>
         </patterns>
     </page-services-ids>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml
index 3dd599030..d2edbb35f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml
@@ -2,7 +2,7 @@
     <Services>
         <IDS VisibleName="Intrusion Detection" cssClass="fa fa-shield fa-fw">
             <Administration url="/ui/ids" />
-            <Log VisibleName="Log File" url="/diag_logs_suricata.php" />
+            <Log VisibleName="Log File" url="/ui/diagnostics/log/core/suricata" />
         </IDS>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/ACL/ACL.xml
index 660c00a78..10314a136 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/ACL/ACL.xml
@@ -74,7 +74,8 @@
     <page-status-systemlogs-ipsecvpn>
         <name>Status: System logs: IPsec VPN</name>
         <patterns>
-            <pattern>diag_logs_ipsec.php*</pattern>
+            <pattern>ui/diagnostics/log/ipsec/*</pattern>
+            <pattern>api/diagnostics/log/ipsec/*</pattern>
         </patterns>
     </page-status-systemlogs-ipsecvpn>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/Menu/Menu.xml
index 6bc0e6a24..7137d722a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Menu/Menu.xml
@@ -19,7 +19,7 @@
             <Leases order="70" VisibleName="Lease Status" url="/diag_ipsec_leases.php"/>
             <SAD order="80" VisibleName="Security Association Database" url="/diag_ipsec_sad.php"/>
             <SPD order="90" VisibleName="Security Policy Database" url="/diag_ipsec_spd.php"/>
-            <LogFile order="100" VisibleName="Log File" url="/diag_logs_ipsec.php"/>
+            <LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/ipsec"/>
         </IPsec>
     </VPN>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
index 16f0c5b48..bf871cdfc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
@@ -26,7 +26,8 @@
     <page-status-systemlogs-ntpd>
         <name>Status: System logs: NTP</name>
         <patterns>
-            <pattern>diag_logs_ntpd.php*</pattern>
+            <pattern>ui/diagnostics/log/ntpd/*</pattern>
+            <pattern>api/diagnostics/log/ntpd/*</pattern>
         </patterns>
     </page-status-systemlogs-ntpd>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
index f9f1df3e7..4e47826e1 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
@@ -5,7 +5,7 @@
             <GPS order="20" url="/services_ntpd_gps.php"/>
             <PPS order="30" url="/services_ntpd_pps.php"/>
             <Status order="40" url="/status_ntpd.php"/>
-            <Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
+            <Log order="50" VisibleName="Log File" url="/ui/diagnostics/log/core/ntpd"/>
         </NTP>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
index 97ab62dec..220b30a9a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
@@ -4,7 +4,8 @@
         <patterns>
             <pattern>ui/proxy/*</pattern>
             <pattern>api/proxy/*</pattern>
-            <pattern>diag_logs_proxy.php*</pattern>
+            <pattern>ui/diagnostics/log/squid/*</pattern>
+            <pattern>api/diagnostics/log/squid/*</pattern>
         </patterns>
     </page-services-proxy>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
index d2839f830..876fe1357 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
     <Services>
-      <WebProxy VisibleName="Web Proxy" cssClass="fa fa-bolt fa-fw">
+      <WebProxy order="10" VisibleName="Web Proxy" cssClass="fa fa-bolt fa-fw">
           <Administration url="/ui/proxy">
             <ACL VisibleName="ACL" url="/ui/proxy#subtab_proxy-forward-acl"/>
             <Authentication VisibleName="Auth" url="/ui/proxy#subtab_proxy-general-authentication"/>
@@ -15,9 +15,9 @@
             <RemoteACL VisibleName="Remote ACL" url="/ui/proxy#remote_acls"/>
             <TrafficManagement VisibleName="Traffic Mgmt" url="/ui/proxy#subtab_proxy-general-traffic"/>
           </Administration>
-          <Log VisibleName="Log File" url="/diag_logs_proxy.php?type=cache">
-              <More url="/diag_logs_proxy.php*" visibility="hidden"/>
-          </Log>
+          <Cache order="20" VisibleName="Cache Log" url="/ui/diagnostics/log/squid/cache"/>
+          <Access order="30" VisibleName="Access Log" url="/ui/diagnostics/log/squid/access"/>
+          <Store order="40" VisibleName="Store Log" url="/ui/diagnostics/log/squid/store"/>
       </WebProxy>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml
index f86724dd7..19e4d9ecb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml
@@ -34,7 +34,8 @@
     <page-diagnostics-logs-resolver>
         <name>Services: Unbound DNS: Log File</name>
         <patterns>
-            <pattern>diag_logs_resolver.php*</pattern>
+            <pattern>ui/diagnostics/log/resolver/*</pattern>
+            <pattern>api/diagnostics/log/resolver/*</pattern>
         </patterns>
     </page-diagnostics-logs-resolver>
 </acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
index b3258de66..b6b260869 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
@@ -11,7 +11,7 @@
                 <All url="/services_unbound_acls.php*" visibility="hidden"/>
             </ACL>
             <Statistics order="50" url="/ui/unbound/stats"/>
-            <LogFile VisibleName="Log File" order="100" url="/diag_logs_resolver.php"/>
+            <LogFile VisibleName="Log File" order="100" url="/ui/diagnostics/log/core/resolver"/>
         </Unbound>
     </Services>
 </menu>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt
index 650798b03..d802a8851 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt
@@ -25,8 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 #}
-<script src="{{ cache_safe('/ui/js/moment-with-locales.min.js') }}"></script>
-
 <script>
     $( document ).ready(function() {
       $("#grid-log").UIBootgrid({
diff --git a/src/www/configd_logs.php b/src/www/configd_logs.php
deleted file mode 100644
index d1efa5042..000000000
--- a/src/www/configd_logs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/configd.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs.php b/src/www/diag_logs.php
deleted file mode 100644
index cd30199e6..000000000
--- a/src/www/diag_logs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/system.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_auth.php b/src/www/diag_logs_auth.php
deleted file mode 100644
index fec786567..000000000
--- a/src/www/diag_logs_auth.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/portalauth.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php
deleted file mode 100644
index 95f44498c..000000000
--- a/src/www/diag_logs_dhcp.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-$logfile = '/var/log/dhcpd.log';
-$logclog = true;
-
-function clear_hook()
-{
-    killbyname('dhcpd');
-    plugins_configure('dhcp');
-}
-
-$service_hook = 'dhcpd';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_dnsmasq.php b/src/www/diag_logs_dnsmasq.php
deleted file mode 100644
index b086f1d04..000000000
--- a/src/www/diag_logs_dnsmasq.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/dnsmasq.log';
-$logclog = true;
-
-$service_hook = 'dnsmasq';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_filter_plain.php b/src/www/diag_logs_filter_plain.php
deleted file mode 100644
index 49aee4cc1..000000000
--- a/src/www/diag_logs_filter_plain.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/filter.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php
deleted file mode 100644
index 1e121cef7..000000000
--- a/src/www/diag_logs_gateways.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/gateways.log';
-$logclog = true;
-
-$service_hook = 'dpinger';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php
deleted file mode 100644
index 78cfeabab..000000000
--- a/src/www/diag_logs_ipsec.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/ipsec.log';
-$logclog = true;
-
-$service_hook = 'strongswan';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php
deleted file mode 100644
index 57859ee90..000000000
--- a/src/www/diag_logs_ntpd.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/ntpd.log';
-$logclog = true;
-
-$service_hook = 'ntpd';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php
deleted file mode 100644
index 093e66d1a..000000000
--- a/src/www/diag_logs_openvpn.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/openvpn.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_pkg.php b/src/www/diag_logs_pkg.php
deleted file mode 100644
index b12875788..000000000
--- a/src/www/diag_logs_pkg.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/pkg.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php
deleted file mode 100644
index 4e450f270..000000000
--- a/src/www/diag_logs_ppp.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/ppps.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_proxy.php b/src/www/diag_logs_proxy.php
deleted file mode 100644
index fef781a65..000000000
--- a/src/www/diag_logs_proxy.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-$type = 'cache';
-if (isset($_GET['type']) && ($_GET['type'] === 'access' || $_GET['type'] === 'store')) {
-    $type = $_GET['type'];
-}
-
-$logfile = "/var/log/squid/{$type}.log";
-
-if ($type === 'access' || $type === 'store') {
-    $logformat = 'unix';
-    $logsplit = 1;
-} else {
-    $logsplit = 2;
-}
-
-if ($type == "access" && is_file("/var/log/squid.log")) {
-    // work around to be able to show access log entries when send using syslog.
-    // since we can't share our target file (clog vs plain log), we need to switch to the one in use.
-    // the most recent written one seems to be the easiest solution here, to avoid config.xml access.
-    if (!is_file($logfile) || filemtime("/var/log/squid.log") > filemtime($logfile)) {
-        $logformat = "keep";
-        $logfile = "/var/log/squid.log";
-        $logclog = true;
-        $logsplit = 3;
-    }
-}
-
-
-$logpills = array();
-$logpills[] = array(gettext('Cache'), true, '/diag_logs_proxy.php?type=cache');
-$logpills[] = array(gettext('Access'), false, '/diag_logs_proxy.php?type=access');
-$logpills[] = array(gettext('Store'), false, '/diag_logs_proxy.php?type=store');
-
-$service_hook = 'squid';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php
deleted file mode 100644
index e72759d41..000000000
--- a/src/www/diag_logs_resolver.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/resolver.log';
-$logclog = true;
-
-$service_hook = 'unbound';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_routing.php b/src/www/diag_logs_routing.php
deleted file mode 100644
index 5e60aae4b..000000000
--- a/src/www/diag_logs_routing.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/routing.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_suricata.php b/src/www/diag_logs_suricata.php
deleted file mode 100644
index 38852be6d..000000000
--- a/src/www/diag_logs_suricata.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/suricata.log';
-$logclog = true;
-
-$service_hook = 'suricata';
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_wireless.php b/src/www/diag_logs_wireless.php
deleted file mode 100644
index 841857df4..000000000
--- a/src/www/diag_logs_wireless.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/wireless.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';
diff --git a/src/www/httpd_logs.php b/src/www/httpd_logs.php
deleted file mode 100644
index 57b443ac9..000000000
--- a/src/www/httpd_logs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/lighttpd.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';