diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
index 3e5c1455ccb..ffdd8047c4d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
@@ -29,6 +29,7 @@
namespace OPNsense\Diagnostics;
use OPNsense\Base\IndexController;
+use OPNsense\Core\Config;
/**
* Class FirewallController
@@ -61,6 +62,7 @@ protected function templateCSSIncludes()
public function logAction()
{
$this->view->pick('OPNsense/Diagnostics/fw_log');
+ $this->view->timefmt = !empty(Config::getInstance()->object()->syslog->timefmt) ? Config::getInstance()->object()->syslog->timefmt : 'Log_Raw';
}
/**
* firewall statistical view
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php
index 588a5de97ff..9480faca6a3 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php
@@ -29,6 +29,7 @@
namespace OPNsense\Diagnostics;
use OPNsense\Base\IndexController;
+use OPNsense\Core\Config;
/**
* @inherit
@@ -42,6 +43,7 @@ public function renderPage($module, $scope)
$this->view->scope = htmlspecialchars($scope, ENT_QUOTES | ENT_HTML401);
$this->view->service = '';
$this->view->default_log_severity = 'Warning';
+ $this->view->timefmt = !empty(Config::getInstance()->object()->OPNsense->Syslog->general->timefmt) ? Config::getInstance()->object()->OPNsense->Syslog->general->timefmt : 'Log_Raw';
$service = $module == 'core' ? $scope : $module;
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/AliasController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/AliasController.php
index 291799fc6ec..875956aed9d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/AliasController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/AliasController.php
@@ -29,6 +29,7 @@
namespace OPNsense\Firewall;
use OPNsense\Base\IndexController;
+use OPNsense\Core\Config;
/**
* @package OPNsense\Firewall
@@ -41,5 +42,6 @@ public function indexAction($selected = null)
$this->view->selected_alias = $selected;
$this->view->formGeoIPSettings = $this->getForm("geoIPSettings");
$this->view->pick('OPNsense/Firewall/alias');
+ $this->view->timefmt = !empty(Config::getInstance()->object()->syslog->timefmt) ? Config::getInstance()->object()->syslog->timefmt : 'Log_Raw';
}
}
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Syslog/forms/local.xml b/src/opnsense/mvc/app/controllers/OPNsense/Syslog/forms/local.xml
index 3dc3a37362b..a0932136e1f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Syslog/forms/local.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Syslog/forms/local.xml
@@ -17,4 +17,12 @@
text
Maximum file size per log file. When set and a log file exceeds the amount specified, it will be rotated.
+
+ syslog.general.timefmt
+
+ dropdown
+
+ (boot log does not include timezone)]]>
+
+
diff --git a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
index 6a63bd535de..1a31f452e8f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
@@ -16,6 +16,18 @@
Y
+
+ Log_Raw
+ Y
+
+ Web GUI Language (MMM DD hh:mm:ss)
+ Client Locale (MMM DD hh:mm:ss)
+ Log Raw (YYYY-MM-DDThh:mm:ss+/-hh:mm)
+ Log Long (YYYY-MM-DD hh:mm:ss+/-hh)
+ Log Long w/o TZ (YYYY-MM-DD hh:mm:ss)
+ Log Short (MM-DD hh:mm:ss)
+
+
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
index c95e68bdff7..4ef88f14024 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
@@ -27,6 +27,17 @@