Skip to content

feat(coderd/healthcheck): improve detection of STUN issues #12951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 15, 2024
Merged

feat(coderd/healthcheck): improve detection of STUN issues #12951

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c4c1a89
feat(coderd/healthcheck/derphealth): add some STUN-specific checks
johnstcn Apr 12, 2024
33b6fb5
fixup! feat(coderd/healthcheck/derphealth): add some STUN-specific ch…
johnstcn Apr 12, 2024
ca36623
fmt
johnstcn Apr 12, 2024
38c6470
feat(support): add messages from healthcheck to support bundle output
johnstcn Apr 12, 2024
50fa151
lint
johnstcn Apr 12, 2024
6f04178
fix tests
johnstcn Apr 12, 2024
56f81fc
document STUN warnings
johnstcn Apr 12, 2024
d09e5a1
Merge remote-tracking branch 'origin/main' into cj/stun-diagnose
johnstcn Apr 15, 2024
f3f5284
rephrase STUN warnings
johnstcn Apr 15, 2024
e5da288
only warn about STUN if at least one STUN node is configured
johnstcn Apr 15, 2024
f6af0e0
remove auto-summarization for now
johnstcn Apr 15, 2024
0c3a1e6
fixup! remove auto-summarization for now
johnstcn Apr 15, 2024
a96ab2d
fixup! fixup! remove auto-summarization for now
johnstcn Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only warn about STUN if at least one STUN node is configured
  • Loading branch information
@johnstcn
johnstcn committed Apr 15, 2024
commit e5da288eee10a79b73af9b3ac351b7e593bc3476
6 changes: 5 additions & 1 deletion coderd/healthcheck/derphealth/derp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,18 @@ func (r *Report) Run(ctx context.Context, opts *ReportOptions) {

// Count the number of STUN-capable nodes.
var stunCapableNodes int
var stunTotalNodes int
for _, region := range r.Regions {
for _, node := range region.NodeReports {
if node.STUN.Enabled {
stunTotalNodes++
}
if node.STUN.CanSTUN {
stunCapableNodes++
}
}
}
if stunCapableNodes == 0 {
if stunCapableNodes == 0 && stunTotalNodes > 0 {
r.Severity = health.SeverityWarning
r.Warnings = append(r.Warnings, health.Messagef(health.CodeSTUNNoNodes, noSTUN))
}
Expand Down
4 changes: 1 addition & 3 deletions coderd/healthcheck/derphealth/derp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,13 @@ func TestDERP(t *testing.T) {
assert.True(t, report.Healthy)
assert.Equal(t, health.SeverityWarning, report.Severity)
assert.True(t, report.Dismissed)
if assert.Len(t, report.Warnings, 2) {
if assert.Len(t, report.Warnings, 1) {
assert.Contains(t, report.Warnings[0].Code, health.CodeDERPOneNodeUnhealthy)
assert.Contains(t, report.Warnings[1].Code, health.CodeSTUNNoNodes)
}
for _, region := range report.Regions {
assert.True(t, region.Healthy)
assert.True(t, region.NodeReports[0].Healthy)
assert.Empty(t, region.NodeReports[0].Warnings)
assert.NotNil(t, region.NodeReports[0].Warnings)
assert.Equal(t, health.SeverityOK, region.NodeReports[0].Severity)
assert.False(t, region.NodeReports[1].Healthy)
assert.Equal(t, health.SeverityError, region.NodeReports[1].Severity)
Expand Down