v5.5.0.0

Changelog: https://roxy-wi.org/changelog.py#5_5_0

app/overview.py

@@ -62,8 +62,6 @@ try:
 		is_metrics_worker = i
 		cmd = "ps ax |grep grafana|grep -v grep|wc -l"
 		grafana, stderr = funct.subprocess_execute(cmd)
-		cmd = "ps ax |grep 'prometheus ' |grep -v grep|wc -l"
-		prometheus, stderr = funct.subprocess_execute(cmd)
 		host = os.environ.get('HTTP_HOST', '')
 
 	cmd = "systemctl is-active roxy-wi-metrics"
@@ -76,6 +74,8 @@ try:
 	smon, stderr = funct.subprocess_execute(cmd)
 	cmd = "systemctl is-active roxy-wi-portscanner"
 	port_scanner, stderr = funct.subprocess_execute(cmd)
+	cmd = "systemctl is-active roxy-wi-socket"
+	socket, stderr = funct.subprocess_execute(cmd)
 
 except Exception as e:
 	role = ''
@@ -90,7 +90,7 @@ except Exception as e:
 	keep_alive = ''
 	smon = ''
 	grafana = ''
-	prometheus = ''
+	socket = ''
 	versions = ''
 	haproxy_wi_log = ''
 	servers = ''
@@ -115,12 +115,12 @@ template = template.render(h2=1,
 							smon=''.join(smon),
 							port_scanner=''.join(port_scanner),
 							grafana=''.join(grafana),
-							prometheus=''.join(prometheus),
+							socket=''.join(socket),
 							haproxy_wi_log_id=funct.haproxy_wi_log(log_id=1, file="roxy-wi-", with_date=1),
-							metrics_log_id=funct.haproxy_wi_log(log_id=1, file="metrics-", with_date=1),
+							metrics_log_id=funct.haproxy_wi_log(log_id=1, file="metrics", with_date=1),
-							checker_log_id=funct.haproxy_wi_log(log_id=1, file="checker-", with_date=1),
+							checker_log_id=funct.haproxy_wi_log(log_id=1, file="checker", with_date=1),
 							keep_alive_log_id=funct.haproxy_wi_log(log_id=1, file="keep_alive"),
-							checker_error_log_id=funct.haproxy_wi_log(log_id=1, file="checker-error"),
+							socket_log_id=funct.haproxy_wi_log(log_id=1, file="socket"),
 							metrics_error_log_id=funct.haproxy_wi_log(log_id=1, file="metrics-error"),
 							error=stderr,
 							haproxy_wi_log=funct.haproxy_wi_log(),

app/templates/logs.html

@@ -12,7 +12,7 @@
 				Server
 			{% endif %}
 		</td>
-		{% if waf != '1' %}
+		{% if waf != '1' and select_id != 'viewlogs' %}
 		<td style="width: 10%;">Log files</td>
 		{% endif %}
 		{% if select_id != 'viewlogs' and service != 'nginx' %}
@@ -55,7 +55,7 @@
 					{% include 'include/select.html' %}
 				{% endif %}
 		</td>
-		{% if waf != '1' %}
+		{% if waf != '1' and select_id != 'viewlogs' %}
 		<td id="remote_log_files"></td>
 		{% endif %}
 		<td class="padding10" style="width: 10%;">

app/templates/ovw.html

@@ -196,7 +196,7 @@
 			{% endif %}
 		{% endif %}
 		{% if role <= 1 %}
-			<a href="/app/viewlogs.py?viewlogs={{metrics_error_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View worker's logs" class="logs_link">
+			<a href="/app/viewlogs.py?viewlogs={{metrics_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View worker's logs" class="logs_link">
 				Metrics workers
 			</a>
 		{% else %}
@@ -214,7 +214,7 @@
 			{% endif %}
 		{% endif %}
 		{% if role <= 1 %}
-			<a href="/app/viewlogs.py?viewlogs={{checker_error_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View checker's logs" class="logs_link">
+			<a href="/app/viewlogs.py?viewlogs={{checker_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View checker's logs" class="logs_link">
 				Checker workers
 			</a>
 		{% else %}
@@ -252,25 +252,40 @@
 			<span class="serverNone server-status" title="The service is not installed or not running"></span>
 			<span>Grafana</span>			
 		{% endif %}
+		{% endif %}
+		</td>
+		<td {% if role != 1 %}class="padding10 first-collumn-wi"{%endif%}>
+			{% if socket == 'active' %}
+				<span class="serverUp server-status" title="Socket service is started"></span>
+				{% if role <= 1 %}
+					<a href="/app/viewlogs.py?viewlogs={{socket_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View Socket's logs" class="logs_link">
+						Socket service
+					</a>
+				{% else %}
+						Socket service
+				{% endif %}
+			{% else %}
+				{% if socket == 'inactive' or socket == 'failed' %}
+					<span class="serverDown server-status" title="Socket service scanner is stopped"></span>
+					<a href="/app/users.py#services" title="Socket service - Roxy-WI service" class="logs_link">
+						Socket service
+					</a>
+				{% else %}
+					<span title="Socket service is not installed"><span class="serverNone server-status"></span></span>
+					<a href="https://roxy-wi.org/services.py?service=socket" title="Socket service" target="_blank" class="logs_link">
+						Socket service
+					</a>
+				{% endif %}
+			{% endif %}
 		</td>
 		<td>
-		{% if prometheus|int() >= 1 %}
-			<span class="serverUp server-status" title="running {{ prometheus }} process"></span>
-			<a href="http://{{host}}:9090" target="_blank" title="Open Prometheus" class="logs_link">Prometheus</a>
-		{% else %}
-			<span class="serverNone server-status" title="The service is not installed or not running"></span>
-			Prometheus
-		{% endif %}
-		</td>
-		{% endif %}
-		<td {% if role != 1 %}class="padding10 first-collumn-wi"{%endif%}>
 		{% if port_scanner == 'active' %}
 				<span class="serverUp server-status" title="Port scanner is started"></span>
 				<a href="/app/portscanner.py" title="Port scanner Dashboard" class="logs_link">
 					Port scanner
 				</a>
 			{% else %}
-				{% if port_scanner == 'inactive' or port_scanner== 'failed' %}
+				{% if port_scanner == 'inactive' or port_scanner == 'failed' %}
 					<span class="serverDown server-status" title="Port scanner is stopped"></span>
 					<a href="/app/users.py#services" title="Start Port scanner - Roxy-WI service" class="logs_link">
 						Port scanner
@@ -384,7 +399,7 @@
 			<td>
 				<span class="add-button-wi">
 					<span title="Show more log" id="show-all-haproxy-wi-log" style="color: #fff">
-						Show more
+						Show more log
 					</span>
 				</span>
 			</td>