From 9c056ac0c7046a897a174dd973e053c474c1fd8f Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Fri, 24 Apr 2020 21:44:37 +0200
Subject: [PATCH] v4.2.3.0

Changelog: https://haproxy-wi.org/changelog.py#4_2_3
---
 app/overview.py                  |  4 ++++
 app/templates/ovw.html           |  5 +++--
 app/versions.py                  |  2 ++
 inc/images/favicon/manifest.json | 14 +++++++-------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/overview.py b/app/overview.py
index 7386240d..07b4da50 100644
--- a/app/overview.py
+++ b/app/overview.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 import funct, sql
 import create_db
+import os
 from jinja2 import Environment, FileSystemLoader
 env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
 template = env.get_template('ovw.html')
@@ -43,6 +44,7 @@ try:
 	for s in is_metrics_workers:
 		i += 1
 	is_metrics_worker = i
+	host = os.environ.get('HTTP_HOST', '')
 
 except:
 	role = ''
@@ -65,6 +67,7 @@ except:
 	is_checker_worker = ''
 	is_metrics_worker = ''
 	token = ''
+	host = ''
 
 
 template = template.render(h2 = 1,
@@ -95,5 +98,6 @@ template = template.render(h2 = 1,
 							servers = servers,
 							is_checker_worker = is_checker_worker,
 							is_metrics_worker = is_metrics_worker,
+							host = host,
 							token = token)
 print(template)
\ No newline at end of file
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 63a32f08..889527a3 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -174,10 +174,11 @@
 		<td class="padding10 first-collumn-wi">
 		{% if grafana|int() >= 1 %}
 			<span title="running {{grafana}} process"><span class="serverUp server-status"></span></span> 
+			<a href="http://{{host}}:3000" target="_blank" title="Open Grafana" class="logs_link">Grafana</a>
 		{% else %}
-			<span title="The service does not started or does not installed"><span class="serverNone server-status"></span></span> 
+			<span title="The service does not started or does not installed"><span class="serverNone server-status"></span></span>
+			<span>Grafana</span>			
 		{% endif %}
-			<span>Grafana</span>
 		</td>
 		<td>
 		{% if prometheus|int() >= 1 %}
diff --git a/app/versions.py b/app/versions.py
index 59c199c3..473ce31b 100644
--- a/app/versions.py
+++ b/app/versions.py
@@ -52,6 +52,8 @@ else:
 if serv is not None and form.getvalue('del') is not None:
 	if Select is not None:
 		aftersave = 1
+		env = Environment(loader=FileSystemLoader('templates/'))
+		template = env.get_template('delver.html')
 		for get in form:
 			if format in get:
 				try:
diff --git a/inc/images/favicon/manifest.json b/inc/images/favicon/manifest.json
index b0c3f926..34479cd8 100644
--- a/inc/images/favicon/manifest.json
+++ b/inc/images/favicon/manifest.json
@@ -2,40 +2,40 @@
  "name": "App",
  "icons": [
   {
-   "src": "\/inc\images\/favicon\/android-icon-36x36.png",
+   "src": "/inc/images/favicon/android-icon-36x36.png",
    "sizes": "36x36",
    "type": "image\/png",
    "density": "0.75"
   },
   {
-   "src": "\/inc\images\/favicon\/android-icon-48x48.png",
+   "src": "\/inc\/images\/favicon\/android-icon-48x48.png",
    "sizes": "48x48",
    "type": "image\/png",
    "density": "1.0"
   },
   {
-   "src": "\/inc\images\/favicon\/android-icon-72x72.png",
+   "src": "\/inc\/images\/favicon\/android-icon-72x72.png",
    "sizes": "72x72",
    "type": "image\/png",
    "density": "1.5"
   },
   {
-   "src": "\/inc\images\/favicon\/android-icon-96x96.png",
+   "src": "\/inc\/images\/favicon\/android-icon-96x96.png",
    "sizes": "96x96",
    "type": "image\/png",
    "density": "2.0"
   },
   {
-   "src": "\/inc\images\/favicon\/android-icon-144x144.png",
+   "src": "\/inc\/images\/favicon\/android-icon-144x144.png",
    "sizes": "144x144",
    "type": "image\/png",
    "density": "3.0"
   },
   {
-   "src": "\/inc\images\/favicon\/android-icon-192x192.png",
+   "src": "\/inc\/images\/favicon\/android-icon-192x192.png",
    "sizes": "192x192",
    "type": "image\/png",
    "density": "4.0"
   }
  ]
-}
\ No newline at end of file
+}