From 915df2452471350254e895dae71c2627fdef05f4 Mon Sep 17 00:00:00 2001
From: Fabian Franz BSc <fabianfrz@users.noreply.github.com>
Date: Wed, 28 Nov 2018 18:45:43 +0100
Subject: [PATCH] Logviewer streams (#1017)

* www/nginx: add logviewer support for streams
* www/nginx: add release note
* www/nginx: bugfix used incorrect variable name
* www/nginx: remove useless brackets
---
 www/nginx/pkg-descr                           |  1 +
 .../OPNsense/Nginx/Api/LogsController.php     | 45 +++++++++
 .../OPNsense/Nginx/StreamAccessLogLine.php    | 39 ++++++++
 .../OPNsense/Nginx/StreamAccessLogParser.php  | 63 ++++++++++++
 .../mvc/app/views/OPNsense/Nginx/index.volt   |  2 +-
 .../mvc/app/views/OPNsense/Nginx/logs.volt    |  2 +-
 .../src/opnsense/scripts/nginx/read_log.php   | 95 +++++++++++++------
 ...{configuration.js => configuration.min.js} |  2 +-
 .../opnsense/www/js/nginx/dist/logviewer.js   |  1 -
 .../www/js/nginx/dist/logviewer.min.js        |  1 +
 .../src/opnsense/www/js/nginx/src/config.js   | 12 ++-
 .../www/js/nginx/src/controller/LogView.js    | 20 +++-
 .../js/nginx/src/models/LogLinesCollection.js |  6 ++
 .../src/templates/StreamAccessLogLine.html    |  6 ++
 .../js/nginx/src/templates/TabCollection.html |  2 +-
 .../www/js/nginx/src/templates/TabModel.html  |  2 +-
 .../www/js/nginx/src/templates/logviewer.html | 22 ++++-
 .../nginx/src/templates/noDataAvailable.html  |  3 +
 .../src/opnsense/www/js/nginx/webpack.conf.js |  2 +-
 19 files changed, 280 insertions(+), 46 deletions(-)
 create mode 100644 www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogLine.php
 create mode 100644 www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogParser.php
 rename www/nginx/src/opnsense/www/js/nginx/dist/{configuration.js => configuration.min.js} (79%)
 delete mode 100644 www/nginx/src/opnsense/www/js/nginx/dist/logviewer.js
 create mode 100644 www/nginx/src/opnsense/www/js/nginx/dist/logviewer.min.js
 create mode 100644 www/nginx/src/opnsense/www/js/nginx/src/templates/StreamAccessLogLine.html
 create mode 100644 www/nginx/src/opnsense/www/js/nginx/src/templates/noDataAvailable.html

diff --git a/www/nginx/pkg-descr b/www/nginx/pkg-descr
index daad3ba2b..1ecc41ab8 100644
--- a/www/nginx/pkg-descr
+++ b/www/nginx/pkg-descr
@@ -11,6 +11,7 @@ Plugin Changelog
 1.5
 
 * Add proxy options for ignore client abort and disabling buffering
+* Add logviewer support for streams
 
 1.4 (Development only)
 
diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/LogsController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/LogsController.php
index 00de73e5f..26d16716a 100644
--- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/LogsController.php
+++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/LogsController.php
@@ -57,6 +57,28 @@ class LogsController extends ApiControllerBase
             return $this->call_configd('error', $uuid);
         }
     }
+    public function stream_accessesAction($uuid = null)
+    {
+        $this->nginx = new Nginx();
+        if (!isset($uuid)) {
+            // emulate REST API -> /stream_accesses delivers a list of servers with access logs
+            return $this->list_streams();
+        } else {
+            // emulate REST call for a specific log /stream_accesses/uuid
+            return $this->call_configd_stream('streamaccess', $uuid);
+        }
+    }
+    public function stream_errorsAction($uuid = null)
+    {
+        $this->nginx = new Nginx();
+        if (!isset($uuid)) {
+            // emulate REST API -> /stream_errors delivers a list of servers with error logs
+            return $this->list_streams();
+        } else {
+            // emulate REST call for a specific log /stream_errors/uuid
+            return $this->call_configd_stream('streamerror', $uuid);
+        }
+    }
 
     private function call_configd($type, $uuid)
     {
@@ -68,6 +90,16 @@ class LogsController extends ApiControllerBase
         $data = $backend->configdRun('nginx log ' . $type . ' ' . $uuid);
         return json_decode($data, true);
     }
+    private function call_configd_stream($type, $uuid)
+    {
+        if (!$this->stream_exists($uuid)) {
+            $this->response->setStatusCode(404, "Not Found");
+        }
+
+        $backend = new Backend();
+        $data = $backend->configdRun('nginx log ' . $type . ' ' . $uuid);
+        return json_decode($data, true);
+    }
 
     private function list_vhosts()
     {
@@ -77,10 +109,23 @@ class LogsController extends ApiControllerBase
         }
         return $data;
     }
+    private function list_streams()
+    {
+        $data = [];
+        foreach ($this->nginx->stream_server->__items as $item) {
+            $data[] = array('id' => $item->getAttributes()['uuid'], 'port' => (string)$item->listen_port);
+        }
+        return $data;
+    }
 
     private function vhost_exists($uuid)
     {
         $data = $this->nginx->getNodeByReference('http_server.'. $uuid);
         return isset($data);
     }
+    private function stream_exists($uuid)
+    {
+        $data = $this->nginx->getNodeByReference('stream_server.'. $uuid);
+        return isset($data);
+    }
 }
diff --git a/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogLine.php b/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogLine.php
new file mode 100644
index 000000000..db58bb5e3
--- /dev/null
+++ b/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogLine.php
@@ -0,0 +1,39 @@
+<?php
+/*
+
+    Copyright (C) 2018 Fabian Franz
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+namespace OPNsense\Nginx;
+
+class StreamAccessLogLine
+{
+    public $remote_ip;
+    public $time;
+    public $status;
+    public $bytes_sent;
+    public $bytes_received;
+    public $session_time;
+}
diff --git a/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogParser.php b/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogParser.php
new file mode 100644
index 000000000..940f25d3b
--- /dev/null
+++ b/www/nginx/src/opnsense/mvc/app/library/OPNsense/Nginx/StreamAccessLogParser.php
@@ -0,0 +1,63 @@
+<?php
+/*
+
+    Copyright (C) 2018 Fabian Franz
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+namespace OPNsense\Nginx;
+
+class StreamAccessLogParser
+{
+    private $file_name;
+    private $lines;
+    private $result;
+
+    private const LogLineRegex = '/(\S+) \[([\d\sa-z\:\-\/\+]+)\] (\S+?) (\d+) (\d+) (\d+) (\d+(?:\.\d+)?)/i';
+
+    function __construct($file_name)
+    {
+        $this->file_name = $file_name;
+        $this->lines = file($this->file_name);
+        $this->result = array_map([$this, 'parse_line'], $this->lines);
+    }
+    private function parse_line($line)
+    {
+        $container = new StreamAccessLogLine();
+        if (preg_match(self::LogLineRegex, $line, $data)) {
+            $container->remote_ip = $data[1];
+            $container->time = $data[2];
+            $container->status = $data[3];
+            $container->bytes_sent = $data[4];
+            $container->bytes_received = $data[5];
+            $container->session_time = $data[6];
+        }
+        return $container;
+    }
+
+    public function get_result()
+    {
+        return $this->result;
+    }
+}
diff --git a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt
index 7b41c062f..ac0771e2f 100644
--- a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt
+++ b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt
@@ -58,7 +58,7 @@
 </script>
 <script src="{{ cache_safe('/ui/js/nginx/lib/lodash.min.js') }}"></script>
 <script src="{{ cache_safe('/ui/js/nginx/lib/backbone-min.js') }}"></script>
-<script src="{{ cache_safe('/ui/js/nginx/dist/configuration.js') }}"></script>
+<script src="{{ cache_safe('/ui/js/nginx/dist/configuration.min.js') }}"></script>
 <style>
     #frm_sni_hostname_mapdlg .col-md-4,
     #frm_ipacl_dlg .col-md-4 {
diff --git a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/logs.volt b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/logs.volt
index 60756a697..125fc5d63 100644
--- a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/logs.volt
+++ b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/logs.volt
@@ -29,4 +29,4 @@
 
 <script src="{{ cache_safe('/ui/js/nginx/lib/lodash.min.js') }}"></script>
 <script src="{{ cache_safe('/ui/js/nginx/lib/backbone-min.js') }}"></script>
-<script src="{{ cache_safe('/ui/js/nginx/dist/logviewer.js') }}"></script>
+<script src="{{ cache_safe('/ui/js/nginx/dist/logviewer.min.js') }}"></script>
diff --git a/www/nginx/src/opnsense/scripts/nginx/read_log.php b/www/nginx/src/opnsense/scripts/nginx/read_log.php
index 716a3f09f..499f0b283 100755
--- a/www/nginx/src/opnsense/scripts/nginx/read_log.php
+++ b/www/nginx/src/opnsense/scripts/nginx/read_log.php
@@ -30,6 +30,7 @@ require_once 'config.inc';
 use OPNsense\Nginx\Nginx;
 use OPNsense\Nginx\ErrorLogParser;
 use OPNsense\Nginx\AccessLogParser;
+use OPNsense\Nginx\StreamAccessLogParser;
 
 $log_prefix = '/var/log/nginx/';
 $log_suffix = '.log';
@@ -45,35 +46,73 @@ $mode = $_SERVER['argv'][1];
 $server = $_SERVER['argv'][2];
 $nginx = new Nginx();
 
-if ($data = $nginx->getNodeByReference('http_server.'. $server)) {
-    $server_names = (string)$data->servername;
-    if (empty($server_names)) {
-        die('{"error": "The server entry has no server name"}');
-    }
-    $lines = [];
-    foreach (explode(',', $server_names) as $server_name) {
-        $log_file_name = $log_prefix . basename($server_name) . '.' . $mode . $log_suffix;
-        // this entry has no log file, ignore it
-        if (!file_exists($log_file_name)) {
-            continue;
-        }
-        $logparser = null;
+switch ($mode) {
+    case 'error':
+    case 'access':
+        if ($data = $nginx->getNodeByReference('http_server.'. $server)) {
+            $server_names = (string)$data->servername;
+            if (empty($server_names)) {
+                die('{"error": "The server entry has no server name"}');
+            }
+            $lines = [];
+            foreach (explode(',', $server_names) as $server_name) {
+                $log_file_name = $log_prefix . basename($server_name) . '.' . $mode . $log_suffix;
+                // this entry has no log file, ignore it
+                if (!file_exists($log_file_name)) {
+                    continue;
+                }
+                $logparser = null;
 
-        if ($mode == 'error') {
-            $logparser = new ErrorLogParser($log_file_name);
-        } elseif ($mode == 'access') {
-            $logparser = new AccessLogParser($log_file_name);
+                if ($mode == 'error') {
+                    $logparser = new ErrorLogParser($log_file_name);
+                } elseif ($mode == 'access') {
+                    $logparser = new AccessLogParser($log_file_name);
+                }
+                // we cannot parse the file - something went wrong
+                if ($logparser == null) {
+                    continue;
+                }
+                $lines = array_merge($lines, $logparser->get_result());
+            }
+            if (empty($lines)) {
+                $lines['error'] = 'no lines found';
+            }
+            echo json_encode($lines);
+        } else {
+            die('{"error": "UUID not found"}');
         }
-        // we cannot parse the file - something went wrong
-        if ($logparser == null) {
-            continue;
+        break;
+    case 'streamerror':
+    case 'streamaccess':
+        if ($data = $nginx->getNodeByReference('stream_server.'. $server)) {
+            $lines = [];
+            $mode = str_replace('stream', '', $mode);
+            $log_file_name = $log_prefix . 'stream_' . $server . '.' . $mode . $log_suffix;
+            // this entry has no log file, ignore it
+            if (!file_exists($log_file_name)) {
+                die('{"error": "file not found"}');
+            }
+            $logparser = null;
+
+            if ($mode == 'error') {
+                $logparser = new ErrorLogParser($log_file_name);
+            } elseif ($mode == 'access') {
+                $logparser = new StreamAccessLogParser($log_file_name);
+            }
+            // we cannot parse the file - something went wrong
+            if ($logparser == null) {
+                continue;
+            }
+            $lines = array_merge($lines, $logparser->get_result());
+            if (empty($lines)) {
+                $lines['error'] = 'no lines found';
+            }
+            echo json_encode($lines);
+        } else {
+            die('{"error": "UUID not found"}');
         }
-        $lines = array_merge($lines, $logparser->get_result());
-    }
-    if (empty($lines)) {
-        $lines['error'] = 'no lines found';
-    }
-    echo json_encode($lines);
-} else {
-    die('{"error": "UUID not found"}');
+        break;
+    default:
+        die('{"error": "action (' . $mode . ') not found"}');
 }
+
diff --git a/www/nginx/src/opnsense/www/js/nginx/dist/configuration.js b/www/nginx/src/opnsense/www/js/nginx/dist/configuration.min.js
similarity index 79%
rename from www/nginx/src/opnsense/www/js/nginx/dist/configuration.js
rename to www/nginx/src/opnsense/www/js/nginx/dist/configuration.min.js
index 6ec37a78d..4c387da28 100644
--- a/www/nginx/src/opnsense/www/js/nginx/dist/configuration.js
+++ b/www/nginx/src/opnsense/www/js/nginx/dist/configuration.min.js
@@ -1 +1 @@
-!function(e){var t={};function i(n){if(t[n])return t[n].exports;var s=t[n]={i:n,l:!1,exports:{}};return e[n].call(s.exports,s,s.exports,i),s.l=!0,s.exports}i.m=e,i.c=t,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)i.d(n,s,function(t){return e[t]}.bind(null,s));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s=21)}({21:function(e,t,i){"use strict";i.r(t);var n=Backbone.View.extend({tagName:"div",attributes:{class:"container-fluid"},child_views:[],createModel:null,upstreamCollection:null,initialize:function(e){this.dataField=$(e.dataField),this.entryclass=e.entryclass,this.createModel=e.createModel,this.upstreamCollection=e.upstreamCollection,this.listenTo(this.collection,"add remove reset",this.render),this.listenTo(this.collection,"change",this.update),this.dataField.after(this.$el)},events:{"click .add":"addEntry"},render:function(){this.child_views.forEach(e=>e.remove()),this.$el.html(""),this.child_views=[],this.update(),this.collection.each(e=>{const t=new this.entryclass({model:e,collection:this.collection,upstreamCollection:this.upstreamCollection});this.child_views.push(t),this.$el.append(t.$el),t.render()}),this.$el.append($('\n            <div class="row">\n                <button class="btn btn-primary pull-right add">\n                    <span class="fa fa-plus"></span>\n                </button>\n            </div>'))},update:function(){this.dataField.data("data",this.collection.toJSON())},addEntry:function(e){e.preventDefault(),this.collection.add(this.createModel())}});var s=Backbone.Collection.extend({url:"/api/nginx/settings/searchupstream",parse:function(e){return e.rows}});const a=Backbone.View.extend({tagName:"div",attributes:{class:"row"},events:{"keyup .key":function(){this.model.set("hostname",this.key.value)},"change .value":function(){this.model.set("upstream",this.value.value)},"click .delete":"deleteEntry"},key:null,value:null,delBtn:null,first:null,second:null,third:null,upstreamCollection:null,initialize:function(e){this.upstreamCollection=e.upstreamCollection,this.listenTo(this.upstreamCollection,"update reset add remove",this.regenerate_list),this.first=document.createElement("div"),this.first.classList.add("col-sm-5"),this.key=document.createElement("input"),this.first.append(this.key),this.key.type="text",this.key.classList.add("key"),this.key.value=this.model.get("hostname"),this.second=document.createElement("div"),this.second.classList.add("col-sm-5"),this.value=document.createElement("select"),this.second.append(this.value),this.value.classList.add("value"),this.value.classList.add("form-control"),this.value.value=this.model.get("upstream"),this.third=document.createElement("div"),this.third.classList.add("col-sm-2"),this.third.style.textAlign="right",this.delBtn=document.createElement("button"),this.delBtn.classList.add("delete"),this.delBtn.classList.add("btn"),this.delBtn.innerHTML='<span class="fa fa-trash"></span>',this.third.append(this.delBtn),this.model.has("upstream")&&0!==this.upstreamCollection.where({uuid:this.model.get("upstream")}).length||this.upstreamCollection.length>0&&this.model.set("upstream",this.upstreamCollection.at(0).get("uuid")),this.$el.append(this.first).append(this.second).append(this.third)},render:function(){$(this.key).val(this.model.get("hostname")),this.regenerate_list(),$(this.value).val(this.model.get("upstream"))},deleteEntry:function(e){e.preventDefault(),this.collection.remove(this.model)},regenerate_list:function(){const e=$(this.value);e.html(""),this.upstreamCollection.each(t=>e.append(`<option value="${t.escape("uuid")}">${t.escape("description")}</option>`)),e.val(this.model.get("upstream")),e.selectpicker("refresh")}}),l=Backbone.View.extend({tagName:"div",attributes:{class:"row"},events:{"keyup .key":function(){this.model.set("network",this.key.value)},"change .value":function(){this.model.set("action",this.value.value)},"click .delete":"deleteEntry"},key:null,value:null,delBtn:null,first:null,second:null,third:null,upstreamCollection:null,initialize:function(e){this.upstreamCollection=e.upstreamCollection,this.listenTo(this.upstreamCollection,"update reset add remove",this.regenerate_list),this.first=document.createElement("div"),this.first.classList.add("col-sm-5"),this.key=document.createElement("input"),this.first.append(this.key),this.key.type="text",this.key.classList.add("key"),this.key.value=this.model.get("network"),this.second=document.createElement("div"),this.second.classList.add("col-sm-5"),this.value=document.createElement("select"),this.second.append(this.value),this.value.classList.add("value"),this.value.classList.add("form-control"),this.value.value=this.model.get("action"),this.third=document.createElement("div"),this.third.classList.add("col-sm-2"),this.third.style.textAlign="right",this.delBtn=document.createElement("button"),this.delBtn.classList.add("delete"),this.delBtn.classList.add("btn"),this.delBtn.innerHTML='<span class="fa fa-trash"></span>',this.third.append(this.delBtn),this.$el.append(this.first).append(this.second).append(this.third)},render:function(){$(this.key).val(this.model.get("network")),this.regenerate_list(),$(this.value).val(this.model.get("action"))},deleteEntry:function(e){e.preventDefault(),this.collection.remove(this.model)},regenerate_list:function(){const e=$(this.value);e.html(""),this.upstreamCollection.each(t=>e.append(`<option value="${t.escape("value")}">${t.escape("name")}</option>`)),e.val(this.model.get("action")),e.selectpicker("refresh")}});var o=Backbone.Collection.extend({initialize:function(){let e=this;$("#snihostname\\.data").change(function(){e.regenerateFromView()})},regenerateFromView:function(){let e=$("#snihostname\\.data").data("data");_.isArray(e)||(e=[]),this.reset(e)}}),r=Backbone.Model.extend({}),c=Backbone.Model.extend({}),d=Backbone.Collection.extend({initialize:function(){let e=this;$("#ipacl\\.data").change(function(){e.regenerateFromView()})},regenerateFromView:function(){let e=$("#ipacl\\.data").data("data");_.isArray(e)||(e=[]),this.reset(e)}});const u=new s,h=new Backbone.Collection([{name:"Deny",value:"deny"},{name:"Allow",value:"allow"}]);$(document).ready(function(){mapDataToFormUI({frm_nginx:"/api/nginx/settings/get"}).done(function(){formatTokenizersUI(),$('select[data-allownew="false"]').selectpicker("refresh"),updateServiceControlUI("nginx")}),""!==window.location.hash&&$('a[href="'+window.location.hash+'"]').click(),$(".nav-tabs a").on("shown.bs.tab",function(e){history.pushState(null,null,e.target.hash)}),$(".reload_btn").click(function(){$(".reloadAct_progress").addClass("fa-spin"),ajaxCall(url="/api/nginx/service/reconfigure",sendData={},callback=function(e,t){$(".reloadAct_progress").removeClass("fa-spin")})}),$('[id*="save_"]').each(function(){$(this).click(function(e){let t=$(this).closest("form").attr("id"),i=$(this).closest("form").attr("data-title");saveFormToEndpoint(url="/api/nginx/settings/set",formid=t,callback_ok=function(){$("#"+t+"_progress").addClass("fa fa-spinner fa-pulse"),ajaxCall(url="/api/nginx/service/reconfigure",sendData={},callback=function(e,n){$("#"+t+"_progress").removeClass("fa fa-spinner fa-pulse"),void 0===e||"success"===n&&"ok"===e.status?updateServiceControlUI("nginx"):BootstrapDialog.show({type:BootstrapDialog.TYPE_WARNING,title:i,message:JSON.stringify(e),draggable:!0})})})})}),["upstream","upstreamserver","location","credential","userlist","httpserver","streamserver","httprewrite","custompolicy","security_header","ipacl","limit_zone","cache_path","limit_request_connection","snifwd","naxsirule"].forEach(function(e){$("#grid-"+e).UIBootgrid({search:"/api/nginx/settings/search"+e,get:"/api/nginx/settings/get"+e+"/",set:"/api/nginx/settings/set"+e+"/",add:"/api/nginx/settings/add"+e+"/",del:"/api/nginx/settings/del"+e+"/",options:{selection:!1,multiSelect:!1}})}),bind_naxsi_rule_dl_button(),function(){let e=new n({dataField:document.getElementById("snihostname.data"),upstreamCollection:u,entryclass:a,collection:new o,createModel:function(){return new r({hostname:"localhost"})}});window.snifield=e,e.render(),$("#grid-upstream").on("loaded.rs.jquery.bootgrid",function(){u.fetch()}),u.fetch()}();let e=new n({dataField:document.getElementById("ipacl.data"),upstreamCollection:h,entryclass:l,collection:new d,createModel:function(){return new c({network:"::",action:"deny"})}});window.ipaclfield=e,e.render()})}});
+!function(e){var t={};function i(n){if(t[n])return t[n].exports;var s=t[n]={i:n,l:!1,exports:{}};return e[n].call(s.exports,s,s.exports,i),s.l=!0,s.exports}i.m=e,i.c=t,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)i.d(n,s,function(t){return e[t]}.bind(null,s));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s=23)}({23:function(e,t,i){"use strict";i.r(t);var n=Backbone.View.extend({tagName:"div",attributes:{class:"container-fluid"},child_views:[],createModel:null,upstreamCollection:null,initialize:function(e){this.dataField=$(e.dataField),this.entryclass=e.entryclass,this.createModel=e.createModel,this.upstreamCollection=e.upstreamCollection,this.listenTo(this.collection,"add remove reset",this.render),this.listenTo(this.collection,"change",this.update),this.dataField.after(this.$el)},events:{"click .add":"addEntry"},render:function(){this.child_views.forEach(e=>e.remove()),this.$el.html(""),this.child_views=[],this.update(),this.collection.each(e=>{const t=new this.entryclass({model:e,collection:this.collection,upstreamCollection:this.upstreamCollection});this.child_views.push(t),this.$el.append(t.$el),t.render()}),this.$el.append($('\n            <div class="row">\n                <button class="btn btn-primary pull-right add">\n                    <span class="fa fa-plus"></span>\n                </button>\n            </div>'))},update:function(){this.dataField.data("data",this.collection.toJSON())},addEntry:function(e){e.preventDefault(),this.collection.add(this.createModel())}});var s=Backbone.Collection.extend({url:"/api/nginx/settings/searchupstream",parse:function(e){return e.rows}});const a=Backbone.View.extend({tagName:"div",attributes:{class:"row"},events:{"keyup .key":function(){this.model.set("hostname",this.key.value)},"change .value":function(){this.model.set("upstream",this.value.value)},"click .delete":"deleteEntry"},key:null,value:null,delBtn:null,first:null,second:null,third:null,upstreamCollection:null,initialize:function(e){this.upstreamCollection=e.upstreamCollection,this.listenTo(this.upstreamCollection,"update reset add remove",this.regenerate_list),this.first=document.createElement("div"),this.first.classList.add("col-sm-5"),this.key=document.createElement("input"),this.first.append(this.key),this.key.type="text",this.key.classList.add("key"),this.key.value=this.model.get("hostname"),this.second=document.createElement("div"),this.second.classList.add("col-sm-5"),this.value=document.createElement("select"),this.second.append(this.value),this.value.classList.add("value"),this.value.classList.add("form-control"),this.value.value=this.model.get("upstream"),this.third=document.createElement("div"),this.third.classList.add("col-sm-2"),this.third.style.textAlign="right",this.delBtn=document.createElement("button"),this.delBtn.classList.add("delete"),this.delBtn.classList.add("btn"),this.delBtn.innerHTML='<span class="fa fa-trash"></span>',this.third.append(this.delBtn),this.model.has("upstream")&&0!==this.upstreamCollection.where({uuid:this.model.get("upstream")}).length||this.upstreamCollection.length>0&&this.model.set("upstream",this.upstreamCollection.at(0).get("uuid")),this.$el.append(this.first).append(this.second).append(this.third)},render:function(){$(this.key).val(this.model.get("hostname")),this.regenerate_list(),$(this.value).val(this.model.get("upstream"))},deleteEntry:function(e){e.preventDefault(),this.collection.remove(this.model)},regenerate_list:function(){const e=$(this.value);e.html(""),this.upstreamCollection.each(t=>e.append(`<option value="${t.escape("uuid")}">${t.escape("description")}</option>`)),e.val(this.model.get("upstream")),e.selectpicker("refresh")}}),l=Backbone.View.extend({tagName:"div",attributes:{class:"row"},events:{"keyup .key":function(){this.model.set("network",this.key.value)},"change .value":function(){this.model.set("action",this.value.value)},"click .delete":"deleteEntry"},key:null,value:null,delBtn:null,first:null,second:null,third:null,upstreamCollection:null,initialize:function(e){this.upstreamCollection=e.upstreamCollection,this.listenTo(this.upstreamCollection,"update reset add remove",this.regenerate_list),this.first=document.createElement("div"),this.first.classList.add("col-sm-5"),this.key=document.createElement("input"),this.first.append(this.key),this.key.type="text",this.key.classList.add("key"),this.key.value=this.model.get("network"),this.second=document.createElement("div"),this.second.classList.add("col-sm-5"),this.value=document.createElement("select"),this.second.append(this.value),this.value.classList.add("value"),this.value.classList.add("form-control"),this.value.value=this.model.get("action"),this.third=document.createElement("div"),this.third.classList.add("col-sm-2"),this.third.style.textAlign="right",this.delBtn=document.createElement("button"),this.delBtn.classList.add("delete"),this.delBtn.classList.add("btn"),this.delBtn.innerHTML='<span class="fa fa-trash"></span>',this.third.append(this.delBtn),this.$el.append(this.first).append(this.second).append(this.third)},render:function(){$(this.key).val(this.model.get("network")),this.regenerate_list(),$(this.value).val(this.model.get("action"))},deleteEntry:function(e){e.preventDefault(),this.collection.remove(this.model)},regenerate_list:function(){const e=$(this.value);e.html(""),this.upstreamCollection.each(t=>e.append(`<option value="${t.escape("value")}">${t.escape("name")}</option>`)),e.val(this.model.get("action")),e.selectpicker("refresh")}});var o=Backbone.Collection.extend({initialize:function(){let e=this;$("#snihostname\\.data").change(function(){e.regenerateFromView()})},regenerateFromView:function(){let e=$("#snihostname\\.data").data("data");_.isArray(e)||(e=[]),this.reset(e)}}),r=Backbone.Model.extend({}),c=Backbone.Model.extend({}),d=Backbone.Collection.extend({initialize:function(){let e=this;$("#ipacl\\.data").change(function(){e.regenerateFromView()})},regenerateFromView:function(){let e=$("#ipacl\\.data").data("data");_.isArray(e)||(e=[]),this.reset(e)}});const u=new s,h=new Backbone.Collection([{name:"Deny",value:"deny"},{name:"Allow",value:"allow"}]);$(document).ready(function(){mapDataToFormUI({frm_nginx:"/api/nginx/settings/get"}).done(function(){formatTokenizersUI(),$('select[data-allownew="false"]').selectpicker("refresh"),updateServiceControlUI("nginx")}),""!==window.location.hash&&$('a[href="'+window.location.hash+'"]').click(),$(".nav-tabs a").on("shown.bs.tab",function(e){history.pushState(null,null,e.target.hash)}),$(".reload_btn").click(function(){$(".reloadAct_progress").addClass("fa-spin"),ajaxCall("/api/nginx/service/reconfigure",{},function(){$(".reloadAct_progress").removeClass("fa-spin")})}),$('[id*="save_"]').each(function(){$(this).click(function(){let e=$(this).closest("form").attr("id"),t=$(this).closest("form").attr("data-title");saveFormToEndpoint("/api/nginx/settings/set",e,function(){$("#"+e+"_progress").addClass("fa fa-spinner fa-pulse"),ajaxCall("/api/nginx/service/reconfigure",{},function(i,n){$("#"+e+"_progress").removeClass("fa fa-spinner fa-pulse"),void 0===i||"success"===n&&"ok"===i.status?updateServiceControlUI("nginx"):BootstrapDialog.show({type:BootstrapDialog.TYPE_WARNING,title:t,message:JSON.stringify(i),draggable:!0})})})})}),["upstream","upstreamserver","location","credential","userlist","httpserver","streamserver","httprewrite","custompolicy","security_header","ipacl","limit_zone","cache_path","limit_request_connection","snifwd","naxsirule"].forEach(function(e){$("#grid-"+e).UIBootgrid({search:"/api/nginx/settings/search"+e,get:"/api/nginx/settings/get"+e+"/",set:"/api/nginx/settings/set"+e+"/",add:"/api/nginx/settings/add"+e+"/",del:"/api/nginx/settings/del"+e+"/",options:{selection:!1,multiSelect:!1}})}),bind_naxsi_rule_dl_button(),function(){let e=new n({dataField:document.getElementById("snihostname.data"),upstreamCollection:u,entryclass:a,collection:new o,createModel:function(){return new r({hostname:"localhost"})}});window.snifield=e,e.render(),$("#grid-upstream").on("loaded.rs.jquery.bootgrid",function(){u.fetch()}),u.fetch()}();let e=new n({dataField:document.getElementById("ipacl.data"),upstreamCollection:h,entryclass:l,collection:new d,createModel:function(){return new c({network:"::",action:"deny"})}});window.ipaclfield=e,e.render()})}});
\ No newline at end of file
diff --git a/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.js b/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.js
deleted file mode 100644
index 97e06d1a3..000000000
--- a/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){var t={};function n(l){if(t[l])return t[l].exports;var o=t[l]={i:l,l:!1,exports:{}};return e[l].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,l){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:l})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var l=Object.create(null);if(n.r(l),Object.defineProperty(l,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(l,o,function(t){return e[t]}.bind(null,o));return l},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=20)}([function(e,t,n){var l=n(6),o=n(8),i=/[&<>"']/g,r=RegExp(i.source);e.exports=function(e){return(e=o(e))&&r.test(e)?e.replace(i,l):e}},function(e,t,n){var l=n(10).Symbol;e.exports=l},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,"")}with(obj)__p+='\n<a data-toggle="dropdown"\n   href="#"\n   class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block"\n   role="button">\n    <b><span class="caret"></span></b>\n</a>\n<a data-toggle="tab"\n   class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block mainentry"\n   style="border-right: 0px;"><b>'+(null==(__t=_.escape(name))?"":__t)+'</b></a>\n<ul class="dropdown-menu" role="menu">\n    ',model.forEach(function(e){__p+='\n    <li>\n        <a data-toggle="tab"\n           class="menuEntry"\n           data-model-cid="'+(null==(__t=e.cid)?"":__t)+'"\n           data-model-uuid="'+(null==(__t=e.escape("id"))?"":__t)+'"\n           id="subtab_item_'+(null==(__t=e.escape("id"))?"":__t)+'"\n           href="#subtab_'+(null==(__t=e.escape("id"))?"":__t)+'">'+(null==(__t=e.escape("server_name"))?"":__t)+"</a>\n    </li>\n    "}),__p+="\n</ul>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<td class="time">'+(null==(__t=model.escape("time"))?"":__t)+'</td>\n<td class="remote_ip">'+(null==(__t=model.escape("remote_ip"))?"":__t)+'</td>\n<td class="username">'+(null==(__t=model.escape("username"))?"":__t)+'</td>\n<td class="status">'+(null==(__t=model.escape("status"))?"":__t)+'</td>\n<td class="size">'+(null==(__t=model.escape("size"))?"":__t)+'</td>\n<td class="referer">'+(null==(__t=model.escape("http_referer"))?"":__t)+'</td>\n<td class="user_agent">'+(null==(__t=model.escape("user_agent"))?"":__t)+'</td>\n<td class="forwarded_for">'+(null==(__t=model.escape("forwarded_for"))?"":__t)+'</td>\n<td class="request_line">'+(null==(__t=model.escape("request_line"))?"":__t)+"</td>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<td class="date">'+(null==(__t=model.escape("date"))?"":__t)+'</td>\n<td class="time">'+(null==(__t=model.escape("time"))?"":__t)+'</td>\n<td class="severity">'+(null==(__t=model.escape("severity"))?"":__t)+'</td>\n<td class="number">'+(null==(__t=model.escape("number"))?"":__t)+'</td>\n<td class="message">'+(null==(__t=model.escape("message"))?"":__t)+"</td>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,"")}with(obj)__p+='<table class="table table-striped">\n    <thead>\n        <tr>\n            ',"errors"===log_type?__p+="\n            <th>Date</th>\n            <th>Time</th>\n            <th>Severity</th>\n            <th>Number</th>\n            <th>Message</th>\n            ":__p+="\n            <th>Time</th>\n            <th>Remote IP</th>\n            <th>Username</th>\n            <th>Status</th>\n            <th>Size</th>\n            <th>Referer</th>\n            <th>User Agent</th>\n            <th>Forwarded For</th>\n            <th>Request Line</th>\n            ",__p+='\n        </tr>\n        <tr class="filter">\n            ',"errors"===log_type?__p+='\n            <td><input type="text" value="'+(null==(__t=model.escape("date"))?"":__t)+'" name="date" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("time"))?"":__t)+'" name="time" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("severity"))?"":__t)+'" name="severity" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("number"))?"":__t)+'" name="number" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("message"))?"":__t)+'" name="message" /></td>\n            ':__p+='\n            <td><input type="text" value="'+(null==(__t=model.escape("time"))?"":__t)+'" name="time" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("remote_ip"))?"":__t)+'" name="remote_ip" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("username"))?"":__t)+'" name="username" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("status"))?"":__t)+'" name="status" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("size"))?"":__t)+'" name="size" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("http_referer"))?"":__t)+'" name="http_referer" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("user_agent"))?"":__t)+'" name="user_agent" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("forwarded_for"))?"":__t)+'" name="forwarded_for" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("request_line"))?"":__t)+'" name="request_line" /></td>\n            ',__p+="\n        </tr>\n    </thead>\n    <tbody>\n    </tbody>\n</table>\n";return __p}},function(e,t,n){var l=n(7)({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"});e.exports=l},function(e,t){e.exports=function(e){return function(t){return null==e?void 0:e[t]}}},function(e,t,n){var l=n(9);e.exports=function(e){return null==e?"":l(e)}},function(e,t,n){var l=n(1),o=n(13),i=n(14),r=n(15),s=1/0,a=l?l.prototype:void 0,_=a?a.toString:void 0;e.exports=function e(t){if("string"==typeof t)return t;if(i(t))return o(t,e)+"";if(r(t))return _?_.call(t):"";var n=t+"";return"0"==n&&1/t==-s?"-0":n}},function(e,t,n){var l=n(11),o="object"==typeof self&&self&&self.Object===Object&&self,i=l||o||Function("return this")();e.exports=i},function(e,t,n){(function(t){var n="object"==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(this,n(12))},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t){e.exports=function(e,t){for(var n=-1,l=null==e?0:e.length,o=Array(l);++n<l;)o[n]=t(e[n],n,e);return o}},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){var l=n(16),o=n(19),i="[object Symbol]";e.exports=function(e){return"symbol"==typeof e||o(e)&&l(e)==i}},function(e,t,n){var l=n(1),o=n(17),i=n(18),r="[object Null]",s="[object Undefined]",a=l?l.toStringTag:void 0;e.exports=function(e){return null==e?void 0===e?s:r:a&&a in Object(e)?o(e):i(e)}},function(e,t,n){var l=n(1),o=Object.prototype,i=o.hasOwnProperty,r=o.toString,s=l?l.toStringTag:void 0;e.exports=function(e){var t=i.call(e,s),n=e[s];try{e[s]=void 0;var l=!0}catch(e){}var o=r.call(e);return l&&(t?e[s]=n:delete e[s]),o}},function(e,t){var n=Object.prototype.toString;e.exports=function(e){return n.call(e)}},function(e,t){e.exports=function(e){return null!=e&&"object"==typeof e}},function(e,t,n){"use strict";n.r(t);const l=new Backbone.Collection([{name:"Access Logs",logType:"accesses"},{name:"Error Logs",logType:"errors"}]);var o=Backbone.Model.extend({});var i=Backbone.Collection.extend({model:o,url:function(){return"/api/nginx/logs/"+this.logType},initialize:function(e){this.logType=e.logType}}),r=n(2),s=n.n(r);var a=Backbone.View.extend({tagName:"li",events:{"click .mainentry":"mainMenuClick","click .menuEntry":"menuEntryClick"},initialize:function(e){this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.logview=e.logview},render:function(){this.$el.html(""),this.renderCollection()},renderCollection:function(){this.$el.addClass("dropdown"),this.$el.html(""),this.$el.append(s()({model:this.collection,name:this.model.attributes.name}))},mainMenuClick:function(){this.collection.models[0]&&this.handleElementClick(this.collection.models[0].id)},menuEntryClick:function(e){this.handleElementClick(e.target.dataset.modelUuid)},handleElementClick:function(e){console.log(e),console.log(this.logview),this.logview.get_log(this.model.get("logType"),e)}});var _=Backbone.View.extend({tagName:"ul",className:"nav nav-tabs",initialize:function(e){this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.logview=e.logview},render:function(){this.$el.attr("role","tablist"),this.$el.html(""),this.collection.forEach(e=>this.render_one(e))},render_one:function(e){const t=new i({uuid:e.get("url"),logType:e.get("logType")}),n=new a({collection:t,model:e,logview:this.logview});this.$el.append(n.$el),t.fetch()}}),c=n(3),u=n.n(c),d=n(4),p=n.n(d),m=n(5),h=n.n(m);var f=Backbone.Model.extend({});var b=Backbone.Collection.extend({model:f,url:function(){return`/api/nginx/logs/${this.logType}/${this.uuid}`},initialize:function(){this.logType="none",this.uuid="none"},filter_collection:function(e){const t=e.keys();return this.filter(function(n){if(!n)return!1;for(let l=0;l<t.length;l++){const o=t[l];if("string"==typeof e.get(o)&&0!==e.get(o).length&&!n.get(o).includes(e.get(o)))return!1}return!0})}});const g=Backbone.View.extend({tagName:"tr",initialize:function(e){this.type=e.type},render:function(){this.$el.html(this.get_template()({model:this.model}))},get_template:function(){return"accesses"===this.type?u.a:p.a}});const y=new(Backbone.View.extend({tagName:"div",className:"content-box tab-content",events:{"keyup .filter input":"update_filter"},initialize:function(){this.collection=new b,this.filter_model=new Backbone.Model,this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.listenTo(this.filter_model,"change",this.render),this.type=""},render:function(){let e=this.$el.find("tbody");e.length<1?(this.$el.html(h()({log_type:this.type,model:this.filter_model})),e=this.$el.find("tbody")):e.html(""),this.collection.filter_collection(this.filter_model).forEach(t=>this.render_one(e,t))},render_one:function(e,t){const n=new g({type:this.type,model:t});n.render(),e.append(n.$el)},get_log:function(e,t){this.collection.uuid=t,this.collection.logType=e,this.type=e,this.$el.html(""),this.filter_model.clear(),this.update()},update:function(){this.collection.fetch()},update_filter:function(e){const t=e.target;this.filter_model.set(t.name,$(t).val())}})),v=new _({collection:l,logview:y});$(document.getElementById("logapplication")).append(v.$el).append(y.$el),v.render()}]);
diff --git a/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.min.js b/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.min.js
new file mode 100644
index 000000000..424c53b06
--- /dev/null
+++ b/www/nginx/src/opnsense/www/js/nginx/dist/logviewer.min.js
@@ -0,0 +1 @@
+!function(e){var t={};function n(l){if(t[l])return t[l].exports;var o=t[l]={i:l,l:!1,exports:{}};return e[l].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,l){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:l})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var l=Object.create(null);if(n.r(l),Object.defineProperty(l,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(l,o,function(t){return e[t]}.bind(null,o));return l},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=22)}([function(e,t,n){var l=n(8),o=n(10),i=/[&<>"']/g,r=RegExp(i.source);e.exports=function(e){return(e=o(e))&&r.test(e)?e.replace(i,l):e}},function(e,t,n){var l=n(12).Symbol;e.exports=l},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,"")}with(obj)__p+='\n<a data-toggle="dropdown"\n   href="#"\n   class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block"\n   role="button">\n    <b><span class="caret"></span></b>\n</a>\n<a data-toggle="tab"\n   class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block mainentry"\n   style="border-right: 0px;"><b>'+(null==(__t=_.escape(name))?"":__t)+'</b></a>\n<ul class="dropdown-menu" role="menu">\n    ',model.forEach(function(e){__p+='\n    <li>\n        <a data-toggle="tab"\n           class="menuEntry"\n           data-model-cid="'+(null==(__t=e.cid)?"":__t)+'"\n           data-model-uuid="'+(null==(__t=e.escape("id"))?"":__t)+'"\n           id="subtab_item_'+(null==(__t=e.escape("id"))?"":__t)+'"\n           href="#subtab_'+(null==(__t=e.escape("id"))?"":__t)+'">'+(null==(__t=e.has("server_name")?e.escape("server_name"):e.escape("port"))?"":__t)+"</a>\n    </li>\n    "}),__p+="\n</ul>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<td class="time">'+(null==(__t=model.escape("time"))?"":__t)+'</td>\n<td class="remote_ip">'+(null==(__t=model.escape("remote_ip"))?"":__t)+'</td>\n<td class="username">'+(null==(__t=model.escape("username"))?"":__t)+'</td>\n<td class="status">'+(null==(__t=model.escape("status"))?"":__t)+'</td>\n<td class="size">'+(null==(__t=model.escape("size"))?"":__t)+'</td>\n<td class="referer">'+(null==(__t=model.escape("http_referer"))?"":__t)+'</td>\n<td class="user_agent">'+(null==(__t=model.escape("user_agent"))?"":__t)+'</td>\n<td class="forwarded_for">'+(null==(__t=model.escape("forwarded_for"))?"":__t)+'</td>\n<td class="request_line">'+(null==(__t=model.escape("request_line"))?"":__t)+"</td>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<td class="time">'+(null==(__t=model.escape("time"))?"":__t)+'</td>\n<td class="remote_ip">'+(null==(__t=model.escape("remote_ip"))?"":__t)+'</td>\n<td class="status">'+(null==(__t=model.escape("status"))?"":__t)+'</td>\n<td class="bytes_sent">'+(null==(__t=model.escape("bytes_sent"))?"":__t)+'</td>\n<td class="bytes_received">'+(null==(__t=model.escape("bytes_received"))?"":__t)+'</td>\n<td class="session_time">'+(null==(__t=model.escape("session_time"))?"":__t)+"</td>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<td class="date">'+(null==(__t=model.escape("date"))?"":__t)+'</td>\n<td class="time">'+(null==(__t=model.escape("time"))?"":__t)+'</td>\n<td class="severity">'+(null==(__t=model.escape("severity"))?"":__t)+'</td>\n<td class="number">'+(null==(__t=model.escape("number"))?"":__t)+'</td>\n<td class="message">'+(null==(__t=model.escape("message"))?"":__t)+"</td>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,"")}with(obj)__p+='<table class="table table-striped">\n    <thead>\n        <tr>\n            ',"errors"===log_type||"stream_errors"===log_type?__p+="\n            <th>Date</th>\n            <th>Time</th>\n            <th>Severity</th>\n            <th>Number</th>\n            <th>Message</th>\n            ":"accesses"===log_type?__p+="\n            <th>Time</th>\n            <th>Remote IP</th>\n            <th>Username</th>\n            <th>Status</th>\n            <th>Size</th>\n            <th>Referer</th>\n            <th>User Agent</th>\n            <th>Forwarded For</th>\n            <th>Request Line</th>\n            ":__p+="\n            <th>Time</th>\n            <th>Remote IP</th>\n            <th>Status</th>\n            <th>Bytes Sent</th>\n            <th>Bytes Received</th>\n            <th>Session Time</th>\n            ",__p+='\n        </tr>\n        <tr class="filter">\n            ',"errors"===log_type||"stream_errors"===log_type?__p+='\n            <td><input type="text" value="'+(null==(__t=model.escape("date"))?"":__t)+'" name="date" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("time"))?"":__t)+'" name="time" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("severity"))?"":__t)+'" name="severity" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("number"))?"":__t)+'" name="number" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("message"))?"":__t)+'" name="message" /></td>\n            ':"accesses"===log_type?__p+='\n            <td><input type="text" value="'+(null==(__t=model.escape("time"))?"":__t)+'" name="time" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("remote_ip"))?"":__t)+'" name="remote_ip" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("username"))?"":__t)+'" name="username" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("status"))?"":__t)+'" name="status" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("size"))?"":__t)+'" name="size" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("http_referer"))?"":__t)+'" name="http_referer" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("user_agent"))?"":__t)+'" name="user_agent" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("forwarded_for"))?"":__t)+'" name="forwarded_for" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("request_line"))?"":__t)+'" name="request_line" /></td>\n            ':__p+='\n            <td><input type="text" value="'+(null==(__t=model.escape("time"))?"":__t)+'" name="time" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("remote_ip"))?"":__t)+'" name="remote_ip" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("status"))?"":__t)+'" name="status" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("bytes_sent"))?"":__t)+'" name="bytes_sent" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("bytes_received"))?"":__t)+'" name="bytes_received" /></td>\n            <td><input type="text" value="'+(null==(__t=model.escape("session_time"))?"":__t)+'" name="session_time" /></td>\n            ',__p+="\n        </tr>\n    </thead>\n    <tbody>\n    </tbody>\n</table>\n";return __p}},function(module,exports,__webpack_require__){var _={escape:__webpack_require__(0)};module.exports=function(obj){obj||(obj={});var __t,__p="";with(obj)__p+='<div style="text-align: center;">\n    No data avialable\n</div>';return __p}},function(e,t,n){var l=n(9)({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"});e.exports=l},function(e,t){e.exports=function(e){return function(t){return null==e?void 0:e[t]}}},function(e,t,n){var l=n(11);e.exports=function(e){return null==e?"":l(e)}},function(e,t,n){var l=n(1),o=n(15),i=n(16),r=n(17),s=1/0,_=l?l.prototype:void 0,a=_?_.toString:void 0;e.exports=function e(t){if("string"==typeof t)return t;if(i(t))return o(t,e)+"";if(r(t))return a?a.call(t):"";var n=t+"";return"0"==n&&1/t==-s?"-0":n}},function(e,t,n){var l=n(13),o="object"==typeof self&&self&&self.Object===Object&&self,i=l||o||Function("return this")();e.exports=i},function(e,t,n){(function(t){var n="object"==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(this,n(14))},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t){e.exports=function(e,t){for(var n=-1,l=null==e?0:e.length,o=Array(l);++n<l;)o[n]=t(e[n],n,e);return o}},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){var l=n(18),o=n(21),i="[object Symbol]";e.exports=function(e){return"symbol"==typeof e||o(e)&&l(e)==i}},function(e,t,n){var l=n(1),o=n(19),i=n(20),r="[object Null]",s="[object Undefined]",_=l?l.toStringTag:void 0;e.exports=function(e){return null==e?void 0===e?s:r:_&&_ in Object(e)?o(e):i(e)}},function(e,t,n){var l=n(1),o=Object.prototype,i=o.hasOwnProperty,r=o.toString,s=l?l.toStringTag:void 0;e.exports=function(e){var t=i.call(e,s),n=e[s];try{e[s]=void 0;var l=!0}catch(e){}var o=r.call(e);return l&&(t?e[s]=n:delete e[s]),o}},function(e,t){var n=Object.prototype.toString;e.exports=function(e){return n.call(e)}},function(e,t){e.exports=function(e){return null!=e&&"object"==typeof e}},function(e,t,n){"use strict";n.r(t);const l=new Backbone.Collection([{name:"HTTP Access Logs",logType:"accesses"},{name:"HTTP Error Logs",logType:"errors"},{name:"Stream Access Logs",logType:"stream_accesses"},{name:"Stream Error Logs",logType:"stream_errors"}]);var o=Backbone.Model.extend({});var i=Backbone.Collection.extend({model:o,url:function(){return"/api/nginx/logs/"+this.logType},initialize:function(e){this.logType=e.logType}}),r=n(2),s=n.n(r);var _=Backbone.View.extend({tagName:"li",events:{"click .mainentry":"mainMenuClick","click .menuEntry":"menuEntryClick"},initialize:function(e){this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.logview=e.logview},render:function(){this.$el.html(""),this.renderCollection()},renderCollection:function(){this.$el.addClass("dropdown"),this.$el.html(""),this.$el.append(s()({model:this.collection,name:this.model.attributes.name}))},mainMenuClick:function(){this.collection.models[0]&&this.handleElementClick(this.collection.models[0].id)},menuEntryClick:function(e){this.handleElementClick(e.target.dataset.modelUuid)},handleElementClick:function(e){console.log(e),console.log(this.logview),this.logview.get_log(this.model.get("logType"),e)}});var a=Backbone.View.extend({tagName:"ul",className:"nav nav-tabs",initialize:function(e){this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.logview=e.logview},render:function(){this.$el.attr("role","tablist"),this.$el.html(""),this.collection.forEach(e=>this.render_one(e))},render_one:function(e){const t=new i({uuid:e.get("url"),logType:e.get("logType")}),n=new _({collection:t,model:e,logview:this.logview});this.$el.append(n.$el),t.fetch()}}),c=n(3),u=n.n(c),d=n(4),p=n.n(d),m=n(5),h=n.n(m),f=n(6),b=n.n(f);var y=Backbone.Model.extend({});var v=Backbone.Collection.extend({model:y,url:function(){return`/api/nginx/logs/${this.logType}/${this.uuid}`},initialize:function(){this.logType="none",this.uuid="none"},parse:function(e){return"error"in e?[]:e},filter_collection:function(e){const t=e.keys();return this.filter(function(n){if(!n)return!1;for(let l=0;l<t.length;l++){const o=t[l];if("string"==typeof e.get(o)&&0!==e.get(o).length&&!n.get(o).includes(e.get(o)))return!1}return!0})}}),g=n(7),x=n.n(g);const w=Backbone.View.extend({tagName:"tr",initialize:function(e){this.type=e.type},render:function(){this.$el.html(this.get_template()({model:this.model}))},get_template:function(){return"accesses"===this.type?u.a:"stream_accesses"===this.type?p.a:h.a}});const j=new(Backbone.View.extend({tagName:"div",className:"content-box tab-content",events:{"keyup .filter input":"update_filter"},initialize:function(){this.collection=new v,this.filter_model=new Backbone.Model,this.listenTo(this.collection,"sync",this.render),this.listenTo(this.collection,"update",this.render),this.listenTo(this.filter_model,"change",this.render),this.type=""},render:function(){let e=this.$el.find("tbody");e.length<1?0!==this.collection.length?(this.$el.html(b()({log_type:this.type,model:this.filter_model})),e=this.$el.find("tbody")):this.$el.html(x.a):e.html(""),0!==this.collection.length&&this.collection.filter_collection(this.filter_model).forEach(t=>this.render_one(e,t))},render_one:function(e,t){const n=new w({type:this.type,model:t});n.render(),e.append(n.$el)},get_log:function(e,t){this.collection.uuid=t,this.collection.logType=e,this.type=e,this.$el.html(""),this.filter_model.clear(),this.update()},update:function(){this.collection.fetch()},update_filter:function(e){const t=e.target;this.filter_model.set(t.name,$(t).val())}})),k=new a({collection:l,logview:j});$(document.getElementById("logapplication")).append(k.$el).append(j.$el),k.render()}]);
\ No newline at end of file
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/config.js b/www/nginx/src/opnsense/www/js/nginx/src/config.js
index ded3858fb..4887d2978 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/config.js
+++ b/www/nginx/src/opnsense/www/js/nginx/src/config.js
@@ -1,10 +1,18 @@
 export const defaultEndpoints = new Backbone.Collection([
     {
-        "name": 'Access Logs',
+        "name": 'HTTP Access Logs',
         "logType" : 'accesses'
     },
     {
-        "name": 'Error Logs',
+        "name": 'HTTP Error Logs',
         "logType" : 'errors'
+    },
+    {
+        "name": 'Stream Access Logs',
+        "logType" : 'stream_accesses'
+    },
+    {
+        "name": 'Stream Error Logs',
+        "logType" : 'stream_errors'
     }
 ]);
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/controller/LogView.js b/www/nginx/src/opnsense/www/js/nginx/src/controller/LogView.js
index 1cefeffb4..636f34926 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/controller/LogView.js
+++ b/www/nginx/src/opnsense/www/js/nginx/src/controller/LogView.js
@@ -1,7 +1,9 @@
 import accessLogLine from '../templates/AccessLogLine.html';
+import streamAccessLogLine from '../templates/StreamAccessLogLine.html';
 import errorLogLine from '../templates/ErrorLogLine.html';
 import logViewer from '../templates/logviewer.html';
 import LogLinesCollection from "../models/LogLinesCollection";
+import noDataAvailable from '../templates/noDataAvailable.html';
 
 
 const LogViewLine = Backbone.View.extend({
@@ -17,6 +19,8 @@ const LogViewLine = Backbone.View.extend({
     get_template: function() {
         if (this.type === 'accesses') {
             return accessLogLine;
+        } else if (this.type === 'stream_accesses') {
+            return streamAccessLogLine;
         } else {
             return errorLogLine;
         }
@@ -43,15 +47,21 @@ const LogView = Backbone.View.extend({
     render: function() {
         let tbody = this.$el.find('tbody');
         if (tbody.length < 1) {
-            this.$el.html(logViewer({log_type: this.type, model: this.filter_model}));
-            tbody = this.$el.find('tbody');
+            if (this.collection.length !== 0) {
+                this.$el.html(logViewer({log_type: this.type, model: this.filter_model}));
+                tbody = this.$el.find('tbody');
+            } else {
+                this.$el.html(noDataAvailable);
+            }
         }
         else {
             tbody.html('');
         }
-        this.collection.filter_collection(this.filter_model).forEach(
-            (model) => this.render_one(tbody, model)
-        );
+        if (this.collection.length !== 0) {
+            this.collection.filter_collection(this.filter_model).forEach(
+                (model) => this.render_one(tbody, model)
+            );
+        }
     },
     render_one: function(parent_element, model) {
         const logline = new LogViewLine({type: this.type, model: model});
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/models/LogLinesCollection.js b/www/nginx/src/opnsense/www/js/nginx/src/models/LogLinesCollection.js
index b9eaf8b54..d06e559b2 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/models/LogLinesCollection.js
+++ b/www/nginx/src/opnsense/www/js/nginx/src/models/LogLinesCollection.js
@@ -9,6 +9,12 @@ const LogLinesCollection = Backbone.Collection.extend({
         this.logType = 'none';
         this.uuid = 'none';
     },
+    parse: function(response) {
+        if ('error' in response) {
+            return [];
+        }
+        return response;
+    },
     filter_collection: function(filter_model) {
         const filter_model_keys = filter_model.keys();
         return this.filter(function (model) {
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/StreamAccessLogLine.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/StreamAccessLogLine.html
new file mode 100644
index 000000000..54cfd8789
--- /dev/null
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/StreamAccessLogLine.html
@@ -0,0 +1,6 @@
+<td class="time"><%= model.escape('time') %></td>
+<td class="remote_ip"><%= model.escape('remote_ip') %></td>
+<td class="status"><%= model.escape('status') %></td>
+<td class="bytes_sent"><%= model.escape('bytes_sent') %></td>
+<td class="bytes_received"><%= model.escape('bytes_received') %></td>
+<td class="session_time"><%= model.escape('session_time') %></td>
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/TabCollection.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/TabCollection.html
index aa292008c..ee317a10c 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/templates/TabCollection.html
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/TabCollection.html
@@ -45,7 +45,7 @@
            data-model-cid="<%= row.cid %>"
            data-model-uuid="<%= row.escape('id') %>"
            id="subtab_item_<%= row.escape('id') %>"
-           href="#subtab_<%= row.escape('id') %>"><%= row.escape('server_name') %></a>
+           href="#subtab_<%= row.escape('id') %>"><%= row.has("server_name") ? row.escape("server_name") : row.escape("port") %></a>
     </li>
     <% }) %>
 </ul>
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/TabModel.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/TabModel.html
index 7b8828ae0..278f45384 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/templates/TabModel.html
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/TabModel.html
@@ -29,5 +29,5 @@
 */
 %>
 <a data-toggle="tab" href="#subtab_item_<%= model.escape('id') %>">
-    <b><%= model.escape("server_name") %></b>
+    <b><%= model.has("server_name") ? model.escape("server_name") : model.escape("port") %></b>
 </a>
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/logviewer.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/logviewer.html
index d8a585142..44b6788ba 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/templates/logviewer.html
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/logviewer.html
@@ -1,13 +1,13 @@
 <table class="table table-striped">
     <thead>
         <tr>
-            <% if (log_type === 'errors') { %>
+            <% if (log_type === 'errors' || log_type === 'stream_errors') { %>
             <th>Date</th>
             <th>Time</th>
             <th>Severity</th>
             <th>Number</th>
             <th>Message</th>
-            <% } else { %>
+            <% } else if (log_type === 'accesses') { %>
             <th>Time</th>
             <th>Remote IP</th>
             <th>Username</th>
@@ -17,16 +17,23 @@
             <th>User Agent</th>
             <th>Forwarded For</th>
             <th>Request Line</th>
+            <% } else {%>
+            <th>Time</th>
+            <th>Remote IP</th>
+            <th>Status</th>
+            <th>Bytes Sent</th>
+            <th>Bytes Received</th>
+            <th>Session Time</th>
             <% } %>
         </tr>
         <tr class="filter">
-            <% if (log_type === 'errors') { %>
+            <% if (log_type === 'errors' || log_type === 'stream_errors') { %>
             <td><input type="text" value="<%= model.escape('date') %>" name="date" /></td>
             <td><input type="text" value="<%= model.escape('time') %>" name="time" /></td>
             <td><input type="text" value="<%= model.escape('severity') %>" name="severity" /></td>
             <td><input type="text" value="<%= model.escape('number') %>" name="number" /></td>
             <td><input type="text" value="<%= model.escape('message') %>" name="message" /></td>
-            <% } else { %>
+            <% } else if (log_type === 'accesses') { %>
             <td><input type="text" value="<%= model.escape('time') %>" name="time" /></td>
             <td><input type="text" value="<%= model.escape('remote_ip') %>" name="remote_ip" /></td>
             <td><input type="text" value="<%= model.escape('username') %>" name="username" /></td>
@@ -36,6 +43,13 @@
             <td><input type="text" value="<%= model.escape('user_agent') %>" name="user_agent" /></td>
             <td><input type="text" value="<%= model.escape('forwarded_for') %>" name="forwarded_for" /></td>
             <td><input type="text" value="<%= model.escape('request_line') %>" name="request_line" /></td>
+            <% } else { %>
+            <td><input type="text" value="<%= model.escape('time') %>" name="time" /></td>
+            <td><input type="text" value="<%= model.escape('remote_ip') %>" name="remote_ip" /></td>
+            <td><input type="text" value="<%= model.escape('status') %>" name="status" /></td>
+            <td><input type="text" value="<%= model.escape('bytes_sent') %>" name="bytes_sent" /></td>
+            <td><input type="text" value="<%= model.escape('bytes_received') %>" name="bytes_received" /></td>
+            <td><input type="text" value="<%= model.escape('session_time') %>" name="session_time" /></td>
             <% } %>
         </tr>
     </thead>
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/noDataAvailable.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/noDataAvailable.html
new file mode 100644
index 000000000..e8c596767
--- /dev/null
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/noDataAvailable.html
@@ -0,0 +1,3 @@
+<div style="text-align: center;">
+    No data avialable
+</div>
\ No newline at end of file
diff --git a/www/nginx/src/opnsense/www/js/nginx/webpack.conf.js b/www/nginx/src/opnsense/www/js/nginx/webpack.conf.js
index c28a654fd..27a46182e 100644
--- a/www/nginx/src/opnsense/www/js/nginx/webpack.conf.js
+++ b/www/nginx/src/opnsense/www/js/nginx/webpack.conf.js
@@ -7,7 +7,7 @@ module.exports = {
     },
     output: {
         path: path.resolve(__dirname, 'dist'),
-        filename: '[name].js'
+        filename: '[name].min.js'
     },
     mode: 'production',
     module: {