diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index 739e59f6..e47d2292 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -69,7 +69,7 @@ jQuery(function($){
$.each(data, function (i, item) {
item.message = escapeHtml(item.message);
var danger_class = ["emerg", "alert", "crit", "err"];
- var warning_class = ["warning"];
+ var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"];
if (jQuery.inArray(item.priority, danger_class) !== -1) {
item.priority = '' + item.priority + '';
@@ -103,6 +103,7 @@ jQuery(function($){
ft_fail2ban_logs = FooTable.init('#fail2ban_log', {
"columns": [
{"name":"time","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleString();},"title":lang.time,"style":{"width":"170px"}},
+ {"name":"priority","title":lang.priority,"style":{"width":"80px"}},
{"name":"message","title":lang.message},
],
"rows": $.ajax({
@@ -114,7 +115,19 @@ jQuery(function($){
},
success: function (data) {
$.each(data, function (i, item) {
+ var danger_class = ["emerg", "alert", "crit", "err"];
+ var warning_class = ["warning", "warn"];
+ var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message);
+ if (jQuery.inArray(item.priority, danger_class) !== -1) {
+ item.priority = '' + item.priority + '';
+ }
+ else if (jQuery.inArray(item.priority, warning_class) !== -1) {
+ item.priority = '' + item.priority + '';
+ }
+ else if (jQuery.inArray(item.priority, info_class) !== -1) {
+ item.priority = '' + item.priority + '';
+ }
});
}
}),
@@ -151,7 +164,7 @@ jQuery(function($){
success: function (data) {
$.each(data, function (i, item) {
var danger_class = ["emerg", "alert", "crit", "err"];
- var warning_class = ["warning"];
+ var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message);
if (jQuery.inArray(item.priority, danger_class) !== -1) {
@@ -199,7 +212,7 @@ jQuery(function($){
success: function (data) {
$.each(data, function (i, item) {
var danger_class = ["emerg", "alert", "crit", "err"];
- var warning_class = ["warning"];
+ var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message);
if (jQuery.inArray(item.priority, danger_class) !== -1) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 12d9170d..3573f5e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -311,7 +311,7 @@ services:
- acme
fail2ban-mailcow:
- image: mailcow/fail2ban:1.1
+ image: mailcow/fail2ban:1.2
build: ./data/Dockerfiles/fail2ban
depends_on:
- dovecot-mailcow