diff options
Diffstat (limited to '')
-rwxr-xr-x | apt-panopticon-report-email-web.lua | 19 | ||||
-rw-r--r-- | explanations.html | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua index 079c4cc..abc376c 100755 --- a/apt-panopticon-report-email-web.lua +++ b/apt-panopticon-report-email-web.lua | |||
@@ -362,7 +362,8 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
362 | "<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>\n" .. | 362 | "<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>\n" .. |
363 | "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. | 363 | "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. |
364 | "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" .. | 364 | "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" .. |
365 | "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th></tr>\n" | 365 | "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" .. |
366 | "<th colspan='2'>" .. lnk('Weekly averages', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n" | ||
366 | ) | 367 | ) |
367 | 368 | ||
368 | local bg = '' | 369 | local bg = '' |
@@ -390,6 +391,8 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
390 | local min = tonumber(results.speed.min) | 391 | local min = tonumber(results.speed.min) |
391 | local max = tonumber(results.speed.max) | 392 | local max = tonumber(results.speed.max) |
392 | local spd = '<td></td><td></td>' | 393 | local spd = '<td></td><td></td>' |
394 | local week = '<td>xxx% up</td><td>xxx% updated</td>' | ||
395 | local graph = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>' | ||
393 | 396 | ||
394 | -- DNS-RR test. | 397 | -- DNS-RR test. |
395 | if ("deb.devuan.org" ~= k) and (nil ~= APT.mirrors["deb.devuan.org"]) then | 398 | if ("deb.devuan.org" ~= k) and (nil ~= APT.mirrors["deb.devuan.org"]) then |
@@ -430,8 +433,8 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
430 | end | 433 | end |
431 | 434 | ||
432 | web:write("<td>" .. ftp .. " </td><td>" .. http .. " </td><td>" .. https .. " </td><td>" .. rsync .. " </td><td>" .. dns .. | 435 | web:write("<td>" .. ftp .. " </td><td>" .. http .. " </td><td>" .. https .. " </td><td>" .. rsync .. " </td><td>" .. dns .. |
433 | " </td><td>" .. protocol .. " </td><td>" .. sanity .. | 436 | " </td><td>" .. protocol .. " </td><td>" .. sanity .. " </td><td>" .. integrity .. " </td><td>" .. updated .. |
434 | " </td><td>" .. integrity .. " </td><td>" .. updated .. " </td>" .. spd .. "</tr>\n") | 437 | " " .. spd .. " " .. week .." <td>" .. graph .. "</td></tr>\n") |
435 | if "" ~= active then | 438 | if "" ~= active then |
436 | web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n") | 439 | web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n") |
437 | end | 440 | end |
@@ -487,7 +490,9 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
487 | 490 | ||
488 | "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</a></th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. | 491 | "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</a></th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. |
489 | "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" .. | 492 | "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" .. |
490 | "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th></tr>\n") | 493 | "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" .. |
494 | "<th colspan='2'>" .. lnk('Weekly averages', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n" | ||
495 | ) | ||
491 | for k, v in APT.orderedPairs(APT.debians) do | 496 | for k, v in APT.orderedPairs(APT.debians) do |
492 | if '' == bg then bg = " style='background-color:#111111'" else bg = '' end | 497 | if '' == bg then bg = " style='background-color:#111111'" else bg = '' end |
493 | local results = APT.collateAll(APT.debians, 'results', k) | 498 | local results = APT.collateAll(APT.debians, 'results', k) |
@@ -512,6 +517,8 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
512 | local min = tonumber(results.speed.min) | 517 | local min = tonumber(results.speed.min) |
513 | local max = tonumber(results.speed.max) | 518 | local max = tonumber(results.speed.max) |
514 | local spd = '<td></td><td></td>' | 519 | local spd = '<td></td><td></td>' |
520 | local week = '<td>xxx% up</td><td>xxx% updated</td>' | ||
521 | local graph = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>' | ||
515 | 522 | ||
516 | -- DNS-RR test. | 523 | -- DNS-RR test. |
517 | if ("deb.devuan.org" ~= k) and (nil ~= APT.debians["deb.devuan.org"]) then | 524 | if ("deb.devuan.org" ~= k) and (nil ~= APT.debians["deb.devuan.org"]) then |
@@ -552,8 +559,8 @@ if nil == web then C("opening mirrors file - " .. e) else | |||
552 | end | 559 | end |
553 | 560 | ||
554 | web:write("<td>" .. ftp .. " </td><td>" .. http .. " </td><td>" .. https .. " </td><td>" .. rsync .. " </td><td>" .. dns .. | 561 | web:write("<td>" .. ftp .. " </td><td>" .. http .. " </td><td>" .. https .. " </td><td>" .. rsync .. " </td><td>" .. dns .. |
555 | " </td><td>" .. protocol .. " </td><td>" .. sanity .. | 562 | " </td><td>" .. protocol .. " </td><td>" .. sanity .. " </td><td>" .. integrity .. " </td><td>" .. updated .. |
556 | " </td><td>" .. integrity .. " </td><td>" .. updated .. " </td>" .. spd .. "</tr>\n") | 563 | " </td>" .. spd .. " " .. week .." <td>" .. graph .. "</td></tr>\n") |
557 | if "" ~= active then | 564 | if "" ~= active then |
558 | web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n") | 565 | web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n") |
559 | end | 566 | end |
diff --git a/explanations.html b/explanations.html index a6efb76..ae1299a 100644 --- a/explanations.html +++ b/explanations.html | |||
@@ -77,4 +77,10 @@ Finally, the tested mirror may have a bigger network connection than the compute | |||
77 | So take this speed measurement with a grain of salt, it's more of an indication, the <a href="../apt-panopticon_cgp/index.php">full graphs</a> might be useful. | 77 | So take this speed measurement with a grain of salt, it's more of an indication, the <a href="../apt-panopticon_cgp/index.php">full graphs</a> might be useful. |
78 | </p> | 78 | </p> |
79 | 79 | ||
80 | <hr><h1 id="Weekly">Weekly averages</h1> | ||
81 | <p>This is the percentage of time the mirror was up, and the mirror was up to date.</p> | ||
82 | |||
83 | <hr><h1 id="Graphs">Graphs</h1> | ||
84 | <p>A link to the graphs for this mirror.</p> | ||
85 | |||
80 | </body></html> | 86 | </body></html> |