diff --git a/cmd/derpprobe/derpprobe.go b/cmd/derpprobe/derpprobe.go
index 159482f86..c6657d7b4 100644
--- a/cmd/derpprobe/derpprobe.go
+++ b/cmd/derpprobe/derpprobe.go
@@ -106,7 +106,7 @@ func getOverallStatus(p *prober.Prober) (o overallStatus) {
// Do not show probes that have not finished yet.
continue
}
- if i.Result {
+ if i.Status == prober.ProbeStatusSucceeded {
o.addGoodf("%s: %s", p, i.Latency)
} else {
o.addBadf("%s: %s", p, i.Error)
diff --git a/prober/prober.go b/prober/prober.go
index bc3c11d89..df5f62d77 100644
--- a/prober/prober.go
+++ b/prober/prober.go
@@ -345,6 +345,11 @@ func (p *Probe) run() (pi ProbeInfo, err error) {
var cancel func()
ctx, cancel = context.WithTimeout(ctx, timeout)
defer cancel()
+ } else {
+ // For continuous probes, reset last error
+ p.mu.Lock()
+ p.lastErr = nil
+ p.mu.Unlock()
}
err = p.probeClass.Probe(ctx)
@@ -385,6 +390,16 @@ func (p *Probe) recordEnd(err error) {
p.successHist = p.successHist.Next()
}
+// ProbeStatus indicates the status of a probe.
+type ProbeStatus string
+
+const (
+ ProbeStatusUnknown = "unknown"
+ ProbeStatusRunning = "running"
+ ProbeStatusFailed = "failed"
+ ProbeStatusSucceeded = "succeeded"
+)
+
// ProbeInfo is a snapshot of the configuration and state of a Probe.
type ProbeInfo struct {
Name string
@@ -394,7 +409,7 @@ type ProbeInfo struct {
Start time.Time
End time.Time
Latency time.Duration
- Result bool
+ Status ProbeStatus
Error string
RecentResults []bool
RecentLatencies []time.Duration
@@ -422,6 +437,10 @@ func (pb ProbeInfo) RecentMedianLatency() time.Duration {
return pb.RecentLatencies[len(pb.RecentLatencies)/2]
}
+func (pb ProbeInfo) Continuous() bool {
+ return pb.Interval < 0
+}
+
// ProbeInfo returns the state of all probes.
func (p *Prober) ProbeInfo() map[string]ProbeInfo {
out := map[string]ProbeInfo{}
@@ -449,9 +468,14 @@ func (probe *Probe) probeInfoLocked() ProbeInfo {
Labels: probe.metricLabels,
Start: probe.start,
End: probe.end,
- Result: probe.succeeded,
}
- if probe.lastErr != nil {
+ inf.Status = ProbeStatusUnknown
+ if probe.end.Before(probe.start) {
+ inf.Status = ProbeStatusRunning
+ } else if probe.succeeded {
+ inf.Status = ProbeStatusSucceeded
+ } else if probe.lastErr != nil {
+ inf.Status = ProbeStatusFailed
inf.Error = probe.lastErr.Error()
}
if probe.latency > 0 {
diff --git a/prober/prober_test.go b/prober/prober_test.go
index 742a914b2..3905bfbc9 100644
--- a/prober/prober_test.go
+++ b/prober/prober_test.go
@@ -316,7 +316,7 @@ func TestProberProbeInfo(t *testing.T) {
Interval: probeInterval,
Labels: map[string]string{"class": "", "name": "probe1"},
Latency: 500 * time.Millisecond,
- Result: true,
+ Status: ProbeStatusSucceeded,
RecentResults: []bool{true},
RecentLatencies: []time.Duration{500 * time.Millisecond},
},
@@ -324,6 +324,7 @@ func TestProberProbeInfo(t *testing.T) {
Name: "probe2",
Interval: probeInterval,
Labels: map[string]string{"class": "", "name": "probe2"},
+ Status: ProbeStatusFailed,
Error: "error2",
RecentResults: []bool{false},
RecentLatencies: nil, // no latency for failed probes
@@ -349,7 +350,7 @@ type probeResult struct {
}{
{
name: "no_runs",
- wantProbeInfo: ProbeInfo{},
+ wantProbeInfo: ProbeInfo{Status: ProbeStatusUnknown},
wantRecentSuccessRatio: 0,
wantRecentMedianLatency: 0,
},
@@ -358,7 +359,7 @@ type probeResult struct {
results: []probeResult{{latency: 100 * time.Millisecond, err: nil}},
wantProbeInfo: ProbeInfo{
Latency: 100 * time.Millisecond,
- Result: true,
+ Status: ProbeStatusSucceeded,
RecentResults: []bool{true},
RecentLatencies: []time.Duration{100 * time.Millisecond},
},
@@ -369,7 +370,7 @@ type probeResult struct {
name: "single_failure",
results: []probeResult{{latency: 100 * time.Millisecond, err: errors.New("error123")}},
wantProbeInfo: ProbeInfo{
- Result: false,
+ Status: ProbeStatusFailed,
RecentResults: []bool{false},
RecentLatencies: nil,
Error: "error123",
@@ -390,7 +391,7 @@ type probeResult struct {
{latency: 80 * time.Millisecond, err: nil},
},
wantProbeInfo: ProbeInfo{
- Result: true,
+ Status: ProbeStatusSucceeded,
Latency: 80 * time.Millisecond,
RecentResults: []bool{false, true, true, false, true, true, false, true},
RecentLatencies: []time.Duration{
@@ -420,7 +421,7 @@ type probeResult struct {
{latency: 110 * time.Millisecond, err: nil},
},
wantProbeInfo: ProbeInfo{
- Result: true,
+ Status: ProbeStatusSucceeded,
Latency: 110 * time.Millisecond,
RecentResults: []bool{true, true, true, true, true, true, true, true, true, true},
RecentLatencies: []time.Duration{
@@ -483,7 +484,7 @@ func TestProberRunHandler(t *testing.T) {
ProbeInfo: ProbeInfo{
Name: "success",
Interval: probeInterval,
- Result: true,
+ Status: ProbeStatusSucceeded,
RecentResults: []bool{true, true},
},
PreviousSuccessRatio: 1,
@@ -498,7 +499,7 @@ func TestProberRunHandler(t *testing.T) {
ProbeInfo: ProbeInfo{
Name: "failure",
Interval: probeInterval,
- Result: false,
+ Status: ProbeStatusFailed,
Error: "error123",
RecentResults: []bool{false, false},
},
diff --git a/prober/status.go b/prober/status.go
index aa9ef99d0..20fbeec58 100644
--- a/prober/status.go
+++ b/prober/status.go
@@ -62,8 +62,9 @@ func (p *Prober) StatusHandler(opts ...statusHandlerOpt) tsweb.ReturnHandlerFunc
return func(w http.ResponseWriter, r *http.Request) error {
type probeStatus struct {
ProbeInfo
- TimeSinceLast time.Duration
- Links map[string]template.URL
+ TimeSinceLastStart time.Duration
+ TimeSinceLastEnd time.Duration
+ Links map[string]template.URL
}
vars := struct {
Title string
@@ -81,12 +82,15 @@ type probeStatus struct {
for name, info := range p.ProbeInfo() {
vars.TotalProbes++
- if !info.Result {
+ if info.Error != "" {
vars.UnhealthyProbes++
}
s := probeStatus{ProbeInfo: info}
+ if !info.Start.IsZero() {
+ s.TimeSinceLastStart = time.Since(info.Start).Truncate(time.Second)
+ }
if !info.End.IsZero() {
- s.TimeSinceLast = time.Since(info.End).Truncate(time.Second)
+ s.TimeSinceLastEnd = time.Since(info.End).Truncate(time.Second)
}
for textTpl, urlTpl := range params.probeLinks {
text, err := renderTemplate(textTpl, info)
diff --git a/prober/status.html b/prober/status.html
index ff0f06c13..d26588da1 100644
--- a/prober/status.html
+++ b/prober/status.html
@@ -73,8 +73,9 @@
| Name |
Probe Class & Labels |
Interval |
- Last Attempt |
- Success |
+ Last Finished |
+ Last Started |
+ Status |
Latency |
Last Error |
@@ -85,9 +86,11 @@
{{$name}}
{{range $text, $url := $probeInfo.Links}}
-
+ {{if not $probeInfo.Continuous}}
+
+ {{end}}
{{end}}
{{$probeInfo.Class}}
@@ -97,28 +100,48 @@
{{end}}
|
- {{$probeInfo.Interval}} |
-
- {{if $probeInfo.TimeSinceLast}}
- {{$probeInfo.TimeSinceLast.String}} ago
+ |
+ {{if $probeInfo.Continuous}}
+ Continuous
+ {{else}}
+ {{$probeInfo.Interval}}
+ {{end}}
+ |
+
+ {{if $probeInfo.TimeSinceLastEnd}}
+ {{$probeInfo.TimeSinceLastEnd.String}} ago
{{$probeInfo.End.Format "2006-01-02T15:04:05Z07:00"}}
{{else}}
Never
{{end}}
|
-
- {{if $probeInfo.Result}}
- {{$probeInfo.Result}}
+ |
+ {{if $probeInfo.TimeSinceLastStart}}
+ {{$probeInfo.TimeSinceLastStart.String}} ago
+ {{$probeInfo.Start.Format "2006-01-02T15:04:05Z07:00"}}
{{else}}
- {{$probeInfo.Result}}
+ Never
+ {{end}}
+ |
+
+ {{if $probeInfo.Error}}
+ {{$probeInfo.Status}}
+ {{else}}
+ {{$probeInfo.Status}}
{{end}}
- Recent: {{$probeInfo.RecentResults}}
- Mean: {{$probeInfo.RecentSuccessRatio}}
+ {{if not $probeInfo.Continuous}}
+ Recent: {{$probeInfo.RecentResults}}
+ Mean: {{$probeInfo.RecentSuccessRatio}}
+ {{end}}
|
- {{$probeInfo.Latency.String}}
- Recent: {{$probeInfo.RecentLatencies}}
- Median: {{$probeInfo.RecentMedianLatency}}
+ {{if $probeInfo.Continuous}}
+ n/a
+ {{else}}
+ {{$probeInfo.Latency.String}}
+ Recent: {{$probeInfo.RecentLatencies}}
+ Median: {{$probeInfo.RecentMedianLatency}}
+ {{end}}
|
{{$probeInfo.Error}} |