X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=optional-tools%2Fhosts-ping.py;h=b7afd7f330d6cc7a38d00b6e72337f3c44a84a53;hb=e2107a5e5a89245332653d3ac2274b131ab66c60;hp=740a74bf5caf6fa79f20e2a926f0f501fcf795e9;hpb=bf2122f6cc02857942996b6ca73662f338341afc;p=svn%2FPrometheus-QoS%2F.git

diff --git a/optional-tools/hosts-ping.py b/optional-tools/hosts-ping.py
index 740a74b..b7afd7f 100755
--- a/optional-tools/hosts-ping.py
+++ b/optional-tools/hosts-ping.py
@@ -95,7 +95,7 @@ def append_host(html, host, base_url, counter, red_treshold, green_treshold):
     elif host[column] < green_treshold[kolikaty]:
       style[column] += ' color: green;'
   
-  loss = 100*host['loss']/host['attempts']
+  loss = float(100*host['loss'])/host['attempts']
   html.write(   ('<tr class="%s"><td style="%s">%d</td><td><a href="%s" target="_blank" class="blue">%s</a></td><td style="%s">%.1f%%</td>' + "\n")
               % (('even', 'odd')[counter % 2], style['right'], counter, base_url % (host['name'], host['smokename']), host['name'], style['loss'], loss))
 
@@ -116,6 +116,8 @@ def merge_json_avgs(filename, smoke_array):
        if avg:
          if host['avg'] and avg['avg'] and avg['attempts']+host['attempts']-avg['loss']-host['loss'] > 0:
            host['avg'] = ((avg['attempts']-avg['loss'])*avg['avg']+(host['attempts']-host['loss'])*host['avg'])/(avg['attempts']+host['attempts']-avg['loss']-host['loss'])
+         else:
+           host['avg'] =  avg['avg']
 
          if not host['best'] or host['best'] > avg['best']:
            host['best'] = avg['best']
@@ -168,7 +170,7 @@ html = open(smokeping_html, 'w')
 html.write("<h1>Aktuální odezva klientských zařízení</h1>");
 html.write(table_head % time.ctime());
 
-for kolikaty, host in enumerate(sorted(smokeping, key = lambda host: -host['loss']*attempts*timeout-host['avg'])):
+for kolikaty, host in enumerate(sorted(smokeping, key = lambda host: -host['loss']*host['attempts']*timeout-host['avg'])):
   append_host(html, host, smokeping_url, kolikaty+1, red_treshold, green_treshold)
 
 html.write(table_end)
@@ -182,7 +184,7 @@ html = open(smpater_html, 'w')
 html.write("<h1>Aktuální odezva páteřních routerů</h1>");
 html.write(table_head % time.ctime());
 
-for kolikaty, host in enumerate(sorted(smpater, key = lambda host: -host['loss']*attempts*timeout-host['avg'])):
+for kolikaty, host in enumerate(sorted(smpater, key = lambda host: -host['loss']*host['attempts']*timeout-host['avg'])):
   append_host(html, host, smpater_url, kolikaty+1, red_treshold, green_treshold)
 
 html.write(table_end)
@@ -197,7 +199,7 @@ html = open(smokeping_avg_html, 'w')
 html.write("<h1>Průměrná odezva klientských zařízení</h1>");
 html.write(table_head % time.ctime());
 
-for kolikaty, host in enumerate(sorted(smokeping, key = lambda host: -host['loss']*attempts*timeout-host['avg'])):
+for kolikaty, host in enumerate(sorted(smokeping, key = lambda host: -host['loss']*host['attempts']*timeout-host['avg'])):
   append_host(html, host, smokeping_url, kolikaty+1, red_treshold, green_treshold)
 
 html.write(table_end)
@@ -213,7 +215,7 @@ html = open(smpater_avg_html, 'w')
 html.write("<h1>Průměrná odezva páteřních routerů</h1>");
 html.write(table_head % time.ctime());
 
-for kolikaty, host in enumerate(sorted(smpater, key = lambda host: -host['loss']*attempts*timeout-host['avg'])):
+for kolikaty, host in enumerate(sorted(smpater, key = lambda host: -host['loss']*host['attempts']*timeout-host['avg'])):
   append_host(html, host, smpater_url, kolikaty+1, red_treshold, green_treshold)
 
 html.write(table_end)