link dismissed

mtojek · mtojek · commit b8f655631618 · 2023-11-29T15:11:06.000+01:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -25,6 +25,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	httpSwagger "github.com/swaggo/http-swagger/v2"
 	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 	"google.golang.org/api/idtoken"
 	"storj.io/drpc/drpcmux"
@@ -407,24 +408,30 @@ func New(options *Options) *API {
 
 	if options.HealthcheckFunc == nil {
 		options.HealthcheckFunc = func(ctx context.Context, apiKey string) *healthcheck.Report {
+			dismissedHealthchecks := loadDismissedHealthcheck(ctx, options.Database, options.Logger)
 			return healthcheck.Run(ctx, &healthcheck.ReportOptions{
 				Database: healthcheck.DatabaseReportOptions{
 					DB:        options.Database,
 					Threshold: options.DeploymentValues.Healthcheck.ThresholdDatabase.Value(),
+					Dismissed: slices.Contains(dismissedHealthchecks, healthcheck.SectionDatabase),
 				},
 				Websocket: healthcheck.WebsocketReportOptions{
 					AccessURL: options.AccessURL,
 					APIKey:    apiKey,
+					Dismissed: slices.Contains(dismissedHealthchecks, healthcheck.SectionWebsocket),
 				},
 				AccessURL: healthcheck.AccessURLReportOptions{
 					AccessURL: options.AccessURL,
+					Dismissed: slices.Contains(dismissedHealthchecks, healthcheck.SectionAccessURL),
 				},
 				DerpHealth: derphealth.ReportOptions{
-					DERPMap: api.DERPMap(),
+					DERPMap:   api.DERPMap(),
+					Dismissed: slices.Contains(dismissedHealthchecks, healthcheck.SectionDERP),
 				},
 				WorkspaceProxy: healthcheck.WorkspaceProxyReportOptions{
 					CurrentVersion:               buildinfo.Version(),
 					WorkspaceProxiesFetchUpdater: *(options.WorkspaceProxiesFetchUpdater).Load(),
+					Dismissed:                    slices.Contains(dismissedHealthchecks, healthcheck.SectionWorkspaceProxy),
 				},
 			})
 		}
diff --git a/coderd/debug.go b/coderd/debug.go
@@ -11,6 +11,8 @@ import (
 	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 
+	"cdr.dev/slog"
+
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/v2/coderd/audit"
@@ -253,3 +255,19 @@ func validateHealthSettings(settings codersdk.HealthSettings) error {
 // @Router /debug/ws [get]
 // @x-apidocgen {"skip": true}
 func _debugws(http.ResponseWriter, *http.Request) {} //nolint:unused
+
+func loadDismissedHealthcheck(ctx context.Context, db database.Store, logger slog.Logger) []string {
+	dismissedHealthchecks := []string{}
+	settingsJSON, err := db.GetHealthSettings(ctx)
+	if err == nil {
+		var settings codersdk.HealthSettings
+		err = json.Unmarshal([]byte(settingsJSON), &settings)
+		if len(settings.DismissedHealthchecks) > 0 {
+			dismissedHealthchecks = settings.DismissedHealthchecks
+		}
+	}
+	if err != nil {
+		logger.Error(ctx, "unable to fetch health settings: %w", err)
+	}
+	return dismissedHealthchecks
+}
diff --git a/coderd/healthcheck/healthcheck.go b/coderd/healthcheck/healthcheck.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/coder/coder/v2/buildinfo"
-	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/healthcheck/derphealth"
 	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/coderd/util/ptr"
@@ -61,8 +60,6 @@ type ReportOptions struct {
 	WorkspaceProxy WorkspaceProxyReportOptions
 
 	Checker Checker
-
-	DB database.Store
 }
 
 type defaultChecker struct{}
