|
|
@@ -33,7 +33,7 @@ import tornado.websocket
|
|
|
from tornado.gen import sleep
|
|
|
import asyncio
|
|
|
|
|
|
-VERSION = '0.9.8'
|
|
|
+VERSION = '0.9.9'
|
|
|
|
|
|
konfig_file = 'config.cfg'
|
|
|
s_certfile = 'server.crt'
|
|
|
@@ -94,7 +94,7 @@ def read_config():
|
|
|
except KeyError:
|
|
|
pass
|
|
|
try:
|
|
|
- listen_addr = str(config["Main"]["TitleAdd"])
|
|
|
+ title_add = str(config["Main"]["TitleAdd"])
|
|
|
except KeyError:
|
|
|
config["Main"]["TitleAdd"] = ''
|
|
|
try:
|
|
|
@@ -158,6 +158,10 @@ def create_fpingparam():
|
|
|
fping_parameter.append('--period=' + config["Main"]["Fping-period"])
|
|
|
except KeyError:
|
|
|
fping_parameter.append('--period=100')
|
|
|
+ try:
|
|
|
+ fping_parameter.append('--size=' + config["Main"]["Fping-size"])
|
|
|
+ except KeyError:
|
|
|
+ pass
|
|
|
|
|
|
|
|
|
def ping(ip, packets=1, timeout=2):
|
|
|
@@ -423,11 +427,11 @@ def create_html_table():
|
|
|
html_tab += '<div class="w3-container" style="padding: 0;font-size:14px;">'
|
|
|
sect_x = sect.replace(' ','_')
|
|
|
clickId = 'accord_' + sect_x
|
|
|
- html_tab += '<br><div onclick="Accordion(\'' + clickId + '\')" class="w3-container w3-teal" style="padding: 3px 10px;opacity: 0.9;margin-top: 5px;box-shadow: 0 2px 5px 0 #04040424,0 2px 10px 0 #040404c4;letter-spacing: 2px;cursor: pointer;">' + sect + '<span id="ux_' + sect_x + '" class="w3-card-2 w3-right"></span></div>\n'
|
|
|
+ html_tab += '<br><div onclick="Accordion(\'' + clickId + '\')" class="w3-container w3-teal" style="padding: 3px 10px;margin-top: 5px;box-shadow: 0 2px 5px 0 #04040424,0 2px 10px 0 #040404c4;letter-spacing: 2px;cursor: pointer;text-shadow: 0 0 0px #fff;">' + sect + '<span id="ux_' + sect_x + '" class="w3-right"></span></div>\n'
|
|
|
html_tab += '<div id="' + clickId + '" class="w3-show">'
|
|
|
for key in config[sect]:
|
|
|
tkey = key.replace('.', '_')
|
|
|
- html_tab += '<div class="w3-left w3-dark-grey w3-border w3-border-teal tooltip" style="text-align: center;margin: 1px; min-width: 13ch; padding: 4px min(3px, 1vw) !important;box-shadow:3px 2px 4px #0009 !important;">'
|
|
|
+ html_tab += '<div class="w3-left si3-dark-grey w3-border w3-border-teal tooltip" style="text-align: center;margin: 1px; min-width: 13ch; padding: 4px min(3px, 1vw) !important;box-shadow:3px 2px 4px #000 !important;">'
|
|
|
html_tab += '<span class="w3-card-2 tooltiptext">'+config[sect][key]+'<br><span id="ttip_' + tkey + '" class="ttip_small"></span></span>'
|
|
|
html_tab += '<span id="' + tkey + '" class="ip_num">' + key + '</span><br><span id="stat_' + tkey + '" class="w3-center"></span></div>'
|
|
|
html_tab += '</div>\n</div>\n'
|
|
|
@@ -552,7 +556,7 @@ html_html = '''
|
|
|
</header>
|
|
|
<body>
|
|
|
<div id="main">%s</div>\n
|
|
|
-
|
|
|
+ <p><br></p>
|
|
|
|
|
|
<div id="modal_01" class="w3-modal modal_01" onclick="this.style.display='none'">
|
|
|
<div class="w3-modal-content modal_01_text">
|
|
|
@@ -577,11 +581,13 @@ body {
|
|
|
.red { color: red; }
|
|
|
.green { color: #0f0; }
|
|
|
.yellow { color: yellow; }
|
|
|
-.red_r { color: red; white-space: pre; text-align: right; font-family: monospace;}
|
|
|
+.red_r { color: red; white-space: pre; text-align: right; font-family: monospace;text-shadow: 0px -0px 0px #f44;}
|
|
|
.green_r { color: #0f0; white-space: pre; text-align: right;; font-family: monospace;}
|
|
|
.yellow_r { color: yellow; white-space: pre; text-align: right;; font-family: monospace;}
|
|
|
.ip_num { font-size: 80%; }
|
|
|
|
|
|
+.si3-dark-grey{color:#fff!important;background-color:#626262!important;text-shadow: 0 0 0px #fff, 0 0 1px #000;}
|
|
|
+
|
|
|
.top_header {
|
|
|
text-align: center;
|
|
|
padding: 5px 10px; height: 43px;
|
|
|
@@ -605,7 +611,6 @@ body {
|
|
|
border-radius: 2px;
|
|
|
font-weight: bold;
|
|
|
font-size: 12px;
|
|
|
- font-family: Bitstream;
|
|
|
}
|
|
|
|
|
|
.modal_01 {
|
|
|
@@ -660,13 +665,13 @@ body {
|
|
|
}
|
|
|
|
|
|
.tooltip .tooltiptext {
|
|
|
- font-family: monospace;
|
|
|
+ font-family: Verdana, 'PT Sans Caption', Arial, sans-serif;
|
|
|
visibility: hidden;
|
|
|
- width: 150px;
|
|
|
+ width: 170px;
|
|
|
background-color: black;
|
|
|
color: #fff;
|
|
|
text-align: center;
|
|
|
- font-size: 15px;
|
|
|
+ font-size: 17px;
|
|
|
border-radius: 6px;
|
|
|
padding: 5px 5px;
|
|
|
position: absolute;
|
|
|
@@ -674,6 +679,8 @@ body {
|
|
|
top: 120%;
|
|
|
left: 50%;
|
|
|
margin-left: -60px;
|
|
|
+ line-height: 1.1em;
|
|
|
+ text-shadow: 0 0 0 #a8a8a8 !important;
|
|
|
}
|
|
|
|
|
|
.tooltip .tooltiptext::after {
|
|
|
@@ -722,21 +729,21 @@ def create_html_modal01():
|
|
|
<br>
|
|
|
|
|
|
<p style="font-size:1.2em;font-variant:small-caps;letter-spacing:3px;font-style:italic;text-decoration:underline">Help</p>
|
|
|
-This PingPanel graphical interface consists of a header and the configured sections with the corresponding devices to be monitored.<br>
|
|
|
+The PingPanel board provides the header and the configured, expandable and collapsible sections with the corresponding devices to be monitored.<br>
|
|
|
|
|
|
Among other things, the header contains the current time (<span class="green">green</span>) of the last ping run
|
|
|
or the status "stopped" (<span class="red">red</span>) if the connection to the server has been lost or the "Stop" button below has been pressed.<br>
|
|
|
-Pressing the "Stop" button terminates the connection to the server and, if no other client is active, the ping rounds are suspended.<p>
|
|
|
+Pressing the "Stop" button terminates the connection to the server and, if no other client is active, the server pauses the ping rounds.<p>
|
|
|
|
|
|
The blue-green <span class="w3-teal">section bars</span> contain the name of the section and consolidated information about the status of the devices in this section.<br>
|
|
|
-<u>The section bars can be expanded and collapsed by clicking or tapping on them.</u><br>
|
|
|
+The section bars can be expanded and collapsed by clicking or tapping on them.<br>
|
|
|
Consolidated status information <img src="/img/stat-inf.gif"> is divided into <span class="red">failed</span>,
|
|
|
<span class="yellow">partially answered</span> and <span class="green">answered</span> ping requests.<br>
|
|
|
|
|
|
-Each monitored device displays its IP address and status. By hovering over or tapping on it the corresponding comment
|
|
|
-is displayed and every ping RTT of each ping round is reported.<p>
|
|
|
+Each monitored device displays its IP address and status. By hovering over or tapping on it its comment
|
|
|
+is displayed and the three ping RTT's of each ping round is reported.<p>
|
|
|
|
|
|
-A <span class="red">flashing red</span> status light indicates that the device has freshly not responded since 'FlashThreshold' ping rounds.<br>
|
|
|
+A <span class="red">flashing red</span> status light indicates that the device has recently not responded during 'FlashThreshold' ping rounds.<br>
|
|
|
A <span class="red">red</span> status light indicates that the device has not answered any of the three pings.<br>
|
|
|
A <span class="yellow">yellow</span> status light indicates that the device has answered one of three pings.<br>
|
|
|
A <span class="green">green</span> status light indicates that the device has answered to all three or at least two pings.<br>
|
