TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

prober: make status page more clear

Browse Source 
Updates tailscale/corp#20583

Signed-off-by: Anton Tolchanov <anton@tailscale.com>
This commit is contained in:
Anton Tolchanov 2024-08-08 09:38:17 +01:00 committed by Anton Tolchanov
parent f79183dac7
commit 46db698333
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prober/prober.go
View File

@ -496,7 +496,8 @@ func (p *Prober) RunHandler(w http.ResponseWriter, r *http.Request) error {
return nil return nil
} }
stats := fmt.Sprintf("Previous runs: success rate %d%%, median latency %v", stats := fmt.Sprintf("Last %d probes: success rate %d%%, median latency %v\n",
len(prevInfo.RecentResults),
int(prevInfo.RecentSuccessRatio()*100), prevInfo.RecentMedianLatency()) int(prevInfo.RecentSuccessRatio()*100), prevInfo.RecentMedianLatency())
if err != nil { if err != nil {
return tsweb.Error(respStatus, fmt.Sprintf("Probe failed: %s\n%s", err.Error(), stats), err) return tsweb.Error(respStatus, fmt.Sprintf("Probe failed: %s\n%s", err.Error(), stats), err)

2
prober/status.go
View File

@ -86,7 +86,7 @@ type probeStatus struct {
} }
s := probeStatus{ProbeInfo: info} s := probeStatus{ProbeInfo: info}
if !info.End.IsZero() { if !info.End.IsZero() {
s.TimeSinceLast = time.Since(info.End) s.TimeSinceLast = time.Since(info.End).Truncate(time.Second)
} }
for textTpl, urlTpl := range params.probeLinks { for textTpl, urlTpl := range params.probeLinks {
text, err := renderTemplate(textTpl, info) text, err := renderTemplate(textTpl, info)

10
prober/status.html
View File

@ -71,12 +71,12 @@
<table class="sortable"> <table class="sortable">
<thead><tr> <thead><tr>
<th>Name</th> <th>Name</th>
<th>Class & Labels</th> <th>Probe Class & Labels</th>
<th>Interval</th> <th>Interval</th>
<th>Result</th> <th>Last Attempt</th>
<th>Success</th> <th>Success</th>
<th>Latency</th> <th>Latency</th>
<th>Error</th> <th>Last Error</th>
</tr></thead> </tr></thead>
<tbody> <tbody>
{{range $name, $probeInfo := .Probes}} {{range $name, $probeInfo := .Probes}}
@ -100,8 +100,8 @@
<td>{{$probeInfo.Interval}}</td> <td>{{$probeInfo.Interval}}</td>
<td data-sort="{{$probeInfo.TimeSinceLast.Milliseconds}}"> <td data-sort="{{$probeInfo.TimeSinceLast.Milliseconds}}">
{{if $probeInfo.TimeSinceLast}} {{if $probeInfo.TimeSinceLast}}
{{$probeInfo.TimeSinceLast.String}}<br/> {{$probeInfo.TimeSinceLast.String}} ago<br/>
<span class="small">{{$probeInfo.End}}</span> <span class="small">{{$probeInfo.End.Format "2006-01-02T15:04:05Z07:00"}}</span>
{{else}} {{else}}
Never Never
{{end}} {{end}}