Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Deliver websocket events only to the organization that owns them

rcourtman822eac9789e1
diff --git a/docs/release-control/v6/internal/subsystems/api-contracts.md b/docs/release-control/v6/internal/subsystems/api-contracts.md
index f0fbfeb726..56afe31794 100644
--- a/docs/release-control/v6/internal/subsystems/api-contracts.md
+++ b/docs/release-control/v6/internal/subsystems/api-contracts.md
@@ -4208,6 +4208,19 @@ fake persistent loggers, including query non-execution and tenant isolation;
## Completion Obligations
+WebSocket events derived from tenant infrastructure use
+`Hub.BroadcastMessageToTenant` or `Hub.BroadcastToTenant` with the owning org.
+Setup registration uses the setup-token org already bound to the request;
+node changes and test notifications use the request org. Empty org IDs target
+only `default`; custom and alert broadcasts require an explicit org argument.
+`BroadcastMessage` permits
+only the instance heartbeat (`ping`), shared system theme (`settingsUpdate`),
+and server update progress (`update:progress`); other types are refused.
+`internal/websocket/hub_event_boundary_test.go` and
+`internal/api/configapi/tenant_event_delivery_test.go` cover cross-org refusal,
+scoped delivery and default-org compatibility, including the existing custom
+discovery envelope.
+
### Docker update agent-attested running verification
In `internal/api/docker_container_action_result.go`, a matching replacement
diff --git a/docs/release-control/v6/internal/subsystems/monitoring.md b/docs/release-control/v6/internal/subsystems/monitoring.md
index 5cc1ad375a..85eba45af2 100644
--- a/docs/release-control/v6/internal/subsystems/monitoring.md
+++ b/docs/release-control/v6/internal/subsystems/monitoring.md
@@ -3564,6 +3564,12 @@ service-history reads plus denial/recovery without fabricated samples.
## Completion Obligations
+Discovery belongs to the monitor that constructs it. Both initial startup and
+runtime enablement pass that monitor's org into the service constructor; every
+scan callback retains it. `internal/discovery/service_event_tenant_test.go`
+checks started, found-server, progress, update and completion callbacks for
+named and default organizations. The custom event envelope stays unchanged.
+
`internal/monitoring/monitor_host_agents_test.go` and `pkg/agents/host/proxmox_lxc_test.go` must prove JSON wire-report ingestion through `ApplyHostReport`, partial/complete-empty recovery, contradictory IDs, unchanged node/agent/name/TTL protection, and no invalid-list-to-healthy-empty conversion. Omitted telemetry is never zero. Source proofs are distinct from native PVE and released availability.
1. Update this contract when monitoring truth ownership changes
diff --git a/internal/api/configapi/config_node_handlers.go b/internal/api/configapi/config_node_handlers.go
index b5a2514873..e1ef769502 100644
--- a/internal/api/configapi/config_node_handlers.go
+++ b/internal/api/configapi/config_node_handlers.go
@@ -1740,7 +1740,7 @@ func (h *ConfigHandlers) handleUpdateNode(w http.ResponseWriter, r *http.Request
time.Sleep(2 * time.Second)
result, _ := h.getMonitor(r.Context()).GetDiscoveryService().GetCachedResult()
if result != nil {
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(r.Context()), websocket.Message{
Type: "discovery_update",
Data: map[string]interface{}{
"servers": result.Servers,
@@ -1914,7 +1914,7 @@ func (h *ConfigHandlers) handleDeleteNode(w http.ResponseWriter, r *http.Request
// Broadcast node deletion to refresh the frontend
if h.wsHub != nil {
// Send a node_deleted message to trigger a refresh of the nodes list
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(r.Context()), websocket.Message{
Type: "node_deleted",
Data: map[string]interface{}{
"nodeType": nodeType,
@@ -2041,7 +2041,7 @@ func (h *ConfigHandlers) handleRefreshClusterNodes(w http.ResponseWriter, r *htt
// Broadcast update to refresh frontend
if h.wsHub != nil {
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(r.Context()), websocket.Message{
Type: "nodes_updated",
Data: map[string]interface{}{
"nodeType": "pve",
diff --git a/internal/api/configapi/config_setup_handlers.go b/internal/api/configapi/config_setup_handlers.go
index c660669074..ee97e08126 100644
--- a/internal/api/configapi/config_setup_handlers.go
+++ b/internal/api/configapi/config_setup_handlers.go
@@ -1487,7 +1487,7 @@ func (h *ConfigHandlers) notifyAutoUnregisterSuccess(ctx context.Context, req *A
return
}
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(ctx), websocket.Message{
Type: "node_deleted",
Data: map[string]interface{}{
"nodeType": strings.TrimSpace(req.Type),
@@ -1497,7 +1497,7 @@ func (h *ConfigHandlers) notifyAutoUnregisterSuccess(ctx context.Context, req *A
if h.getMonitor(ctx) != nil && h.getMonitor(ctx).GetDiscoveryService() != nil {
if result, _ := h.getMonitor(ctx).GetDiscoveryService().GetCachedResult(); result != nil {
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(ctx), websocket.Message{
Type: "discovery_update",
Data: map[string]interface{}{
"servers": result.Servers,
@@ -1717,7 +1717,7 @@ func (h *ConfigHandlers) notifyAutoRegistrationSuccess(ctx context.Context, req
}
nodeInfo := buildAutoRegisterEventData(req, host, actualName, tokenID)
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(ctx), websocket.Message{
Type: autoRegisterWebSocketEventType(created),
Data: nodeInfo,
Timestamp: time.Now().Format(time.RFC3339),
@@ -1726,7 +1726,7 @@ func (h *ConfigHandlers) notifyAutoRegistrationSuccess(ctx context.Context, req
if h.getMonitor(ctx) != nil && h.getMonitor(ctx).GetDiscoveryService() != nil {
result, _ := h.getMonitor(ctx).GetDiscoveryService().GetCachedResult()
if result != nil {
- h.wsHub.BroadcastMessage(websocket.Message{
+ h.wsHub.BroadcastMessageToTenant(apicontext.OrgID(ctx), websocket.Message{
Type: "discovery_update",
Data: map[string]interface{}{
"servers": result.Servers,
diff --git a/internal/api/configapi/tenant_event_delivery_test.go b/internal/api/configapi/tenant_event_delivery_test.go
new file mode 100644
index 0000000000..6a033df983
--- /dev/null
+++ b/internal/api/configapi/tenant_event_delivery_test.go
@@ -0,0 +1,120 @@
+package configapi
+
+import (
+ "context"
+ "net"
+ "net/http"
+ "net/http/httptest"
+ "strings"
+ "testing"
+ "time"
+
+ gorillaws "github.com/gorilla/websocket"
+ "github.com/rcourtman/pulse-go-rewrite/internal/api/apicontext"
+ "github.com/rcourtman/pulse-go-rewrite/internal/config"
+ "github.com/rcourtman/pulse-go-rewrite/internal/discovery"
+ "github.com/rcourtman/pulse-go-rewrite/internal/websocket"
+ "github.com/rcourtman/pulse-go-rewrite/pkg/proxmox"
+)
+
+func tenantEventConnections(t *testing.T, hub *websocket.Hub, orgID string) (*gorillaws.Conn, *gorillaws.Conn) {
+ t.Helper()
+ go hub.Run()
+ t.Cleanup(hub.Stop)
+ server := httptest.NewServer(http.HandlerFunc(hub.HandleWebSocket))
+ t.Cleanup(server.Close)
+ connect := func(org string) *gorillaws.Conn {
+ headers := http.Header{"Origin": {server.URL}}
+ conn, _, err := gorillaws.DefaultDialer.Dial("ws"+strings.TrimPrefix(server.URL, "http")+"?org_id="+org, headers)
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { conn.Close() })
+ deadline := time.Now().Add(time.Second)
+ for hub.GetTenantClientCount(org) == 0 {
+ if time.Now().After(deadline) {
+ t.Fatalf("client for %s did not register", org)
+ }
+ time.Sleep(time.Millisecond)
+ }
+ return conn
+ }
+ if orgID == "" {
+ orgID = "default"
+ }
+ return connect(orgID), connect("org-b")
+}
+
+func assertTenantEvents(t *testing.T, owner, other *gorillaws.Conn, types ...string) {
+ t.Helper()
+ owner.SetReadDeadline(time.Now().Add(3 * time.Second))
+ for _, want := range types {
+ var msg websocket.Message
+ if err := owner.ReadJSON(&msg); err != nil {
+ t.Fatalf("read %s: %v", want, err)
+ }
+ if msg.Type != want {
+ t.Fatalf("got %q, want %q", msg.Type, want)
+ }
+ }
+ other.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
+ if _, data, err := other.ReadMessage(); err == nil {
+ t.Fatalf("other organization received %s", data)
+ } else if netErr, ok := err.(net.Error); !ok || !netErr.Timeout() {
+ t.Fatalf("expected open idle connection, got %v", err)
+ }
+}
+
+func TestAutoRegistrationEventsStayWithRequestOrganization(t *testing.T) {
+ for _, orgID := range []string{"org-a", "default", ""} {
+ t.Run("org="+orgID, func(t *testing.T) {
+ hub := websocket.NewHub(nil)
+ owner, other := tenantEventConnections(t, hub, orgID)
+ h := NewConfigHandlers(nil, nil, nil, hub, nil, nil, false)
+ monitor, _, _ := newTestMonitor(t)
+ service := discovery.NewService(nil, orgID, time.Hour, "auto", nil)
+ service.Stop()
+ setUnexportedField(t, monitor, "discoveryService", service)
+ h.defaultMonitor = monitor
+ ctx := context.WithValue(context.Background(), apicontext.OrgIDContextKey, orgID)
+ req := &AutoRegisterRequest{Type: "pve", Source: "script"}
+ h.notifyAutoRegistrationSuccess(ctx, req, "192.0.2.10", "node-a", "token-id", true)
+ h.notifyAutoRegistrationSuccess(ctx, req, "192.0.2.10", "node-a", "token-id", false)
+ h.notifyAutoUnregisterSuccess(ctx, &AutoUnregisterRequest{Type: "pve"})
+ assertTenantEvents(t, owner, other,
+ "node_auto_registered", "discovery_update", "nodes_changed", "discovery_update", "node_deleted", "discovery_update")
+ })
+ }
+}
+
+func TestNodeMutationEventsStayWithRequestOrganization(t *testing.T) {
+ for _, orgID := range []string{"org-a", "default"} {
+ t.Run(orgID, func(t *testing.T) {
+ hub := websocket.NewHub(nil)
+ owner, other := tenantEventConnections(t, hub, orgID)
+ h := newTestConfigHandlers(t, &config.Config{DataPath: t.TempDir(), PVEInstances: []config.PVEInstance{
+ {Name: "node-a", Host: "https://192.0.2.10:8006", TokenValue: "synthetic"},
+ }})
+ h.wsHub = hub
+ original := detectPVECluster
+ t.Cleanup(func() { detectPVECluster = original })
+ detectPVECluster = func(proxmox.ClientConfig, string, []config.ClusterEndpoint) (bool, string, []config.ClusterEndpoint) {
+ return true, "cluster-a", []config.ClusterEndpoint{{NodeName: "node-a", Host: "https://192.0.2.10:8006"}}
+ }
+ ctx := context.WithValue(context.Background(), apicontext.OrgIDContextKey, orgID)
+ refresh := httptest.NewRequest(http.MethodPost, "/api/config/nodes/pve-0/refresh-cluster", nil).WithContext(ctx)
+ rec := httptest.NewRecorder()
+ h.HandleRefreshClusterNodes(rec, refresh)
+ if rec.Code != http.StatusOK {
+ t.Fatalf("refresh: %d %s", rec.Code, rec.Body.String())
+ }
+ remove := httptest.NewRequest(http.MethodDelete, "/api/config/nodes/pve-0", nil).WithContext(ctx)
+ rec = httptest.NewRecorder()
+ h.HandleDeleteNode(rec, remove)
+ if rec.Code != http.StatusOK {
+ t.Fatalf("delete: %d %s", rec.Code, rec.Body.String())
+ }
+ assertTenantEvents(t, owner, other, "nodes_updated", "node_deleted")
+ })
+ }
+}
diff --git a/internal/api/diagnostics_memory_test.go b/internal/api/diagnostics_memory_test.go
index c7eb78a3e0..1aab2a8154 100644
--- a/internal/api/diagnostics_memory_test.go
+++ b/internal/api/diagnostics_memory_test.go
@@ -356,7 +356,7 @@ func TestComputeDiagnostics_DiscoveryUsesStructuredErrorOwnership(t *testing.T)
cfg := &config.Config{DataPath: t.TempDir()}
monitor := newMonitorForDiagnostics(t, cfg)
- service := discoverysvc.NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := discoverysvc.NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
cache := &discoverysvc.DiscoveryCache{}
diff --git a/internal/api/router_routes_registration.go b/internal/api/router_routes_registration.go
index e4e8d296ca..4a3feaaafd 100644
--- a/internal/api/router_routes_registration.go
+++ b/internal/api/router_routes_registration.go
@@ -484,7 +484,7 @@ func (r *Router) registerConfigSystemRoutes(updateHandlers *UpdateHandlers) {
}
// Send a test auto-registration notification
- r.wsHub.BroadcastMessage(websocket.Message{
+ r.wsHub.BroadcastMessageToTenant(GetOrgID(req.Context()), websocket.Message{
Type: "node_auto_registered",
Data: map[string]interface{}{
"type": "pve",
diff --git a/internal/discovery/service.go b/internal/discovery/service.go
index 4e69992499..d76cf5698e 100644
--- a/internal/discovery/service.go
+++ b/internal/discovery/service.go
@@ -19,7 +19,8 @@ import (
// Service handles background network discovery
type Service struct {
scanner discoveryScanner
- wsHub *websocket.Hub
+ wsHub eventBroadcaster
+ orgID string
cache *DiscoveryCache
interval time.Duration
subnet string
@@ -36,6 +37,10 @@ type Service struct {
stopOnce sync.Once
}
+type eventBroadcaster interface {
+ BroadcastToTenant(orgID string, data interface{})
+}
+
// DiscoveryCache stores the latest discovery results
type DiscoveryCache struct {
mu sync.RWMutex
@@ -208,7 +213,7 @@ func init() {
}
// NewService creates a new discovery service
-func NewService(wsHub *websocket.Hub, interval time.Duration, subnet string, cfgProvider func() config.DiscoveryConfig) *Service {
+func NewService(wsHub *websocket.Hub, orgID string, interval time.Duration, subnet string, cfgProvider func() config.DiscoveryConfig) *Service {
normalizedInterval := normalizeScanInterval(interval)
if normalizedInterval != interval {
log.Warn().
@@ -230,9 +235,9 @@ func NewService(wsHub *websocket.Hub, interval time.Duration, subnet string, cfg
cfgProvider = func() config.DiscoveryConfig { return config.DefaultDiscoveryConfig() }
}
- return &Service{
+ service := &Service{
scanner: newScannerFn(),
- wsHub: wsHub,
+ orgID: orgID,
cache: &DiscoveryCache{},
interval: normalizedInterval,
subnet: normalizedSubnet,
@@ -244,6 +249,10 @@ func NewService(wsHub *websocket.Hub, interval time.Duration, subnet string, cfg
return BuildScanner(cfg)
},
}
+ if wsHub != nil {
+ service.wsHub = wsHub
+ }
+ return service
}
func normalizeDiscoverySubnet(subnet string) (string, error) {
@@ -488,7 +497,7 @@ func (s *Service) performScan() {
if result != nil && result.Environment != nil {
payload.Environment = result.Environment
}
- s.wsHub.Broadcast(websocket.Message{
+ s.wsHub.BroadcastToTenant(s.orgID, websocket.Message{
Type: "discovery_complete",
Data: payload,
})
@@ -499,7 +508,7 @@ func (s *Service) performScan() {
// Send scan started notification
if s.wsHub != nil {
- s.wsHub.Broadcast(websocket.Message{
+ s.wsHub.BroadcastToTenant(s.orgID, websocket.Message{
Type: "discovery_started",
Data: map[string]interface{}{
"scanning": true,
@@ -558,7 +567,7 @@ func (s *Service) performScan() {
serverCallback := func(server pkgdiscovery.DiscoveredServer, phase string) {
// Send immediate update for each discovered server
if s.wsHub != nil {
- s.wsHub.Broadcast(websocket.Message{
+ s.wsHub.BroadcastToTenant(s.orgID, websocket.Message{
Type: "discovery_server_found",
Data: discoveryServerFoundPayload{
Server: server,
@@ -577,7 +586,7 @@ func (s *Service) performScan() {
progressCallback := func(progress pkgdiscovery.ScanProgress) {
// Send progress update via WebSocket
if s.wsHub != nil {
- s.wsHub.Broadcast(websocket.Message{
+ s.wsHub.BroadcastToTenant(s.orgID, websocket.Message{
Type: "discovery_progress",
Data: discoveryProgressPayload{
Progress: progress,
@@ -640,7 +649,7 @@ func (s *Service) performScan() {
Timestamp: time.Now().Unix(),
Environment: result.Environment,
}
- s.wsHub.Broadcast(websocket.Message{
+ s.wsHub.BroadcastToTenant(s.orgID, websocket.Message{
Type: "discovery_update",
Data: payload,
})
diff --git a/internal/discovery/service_event_tenant_test.go b/internal/discovery/service_event_tenant_test.go
new file mode 100644
index 0000000000..1ad00a830e
--- /dev/null
+++ b/internal/discovery/service_event_tenant_test.go
@@ -0,0 +1,47 @@
+package discovery
+
+import (
+ "reflect"
+ "testing"
+ "time"
+
+ "github.com/rcourtman/pulse-go-rewrite/internal/config"
+ "github.com/rcourtman/pulse-go-rewrite/internal/websocket"
+ pkgdiscovery "github.com/rcourtman/pulse-go-rewrite/pkg/discovery"
+)
+
+type recordedDiscoveryEvents struct {
+ orgIDs []string
+ types []string
+}
+
+func (r *recordedDiscoveryEvents) BroadcastToTenant(orgID string, data interface{}) {
+ msg := data.(websocket.Message)
+ r.orgIDs = append(r.orgIDs, orgID)
+ r.types = append(r.types, msg.Type)
+}
+
+func TestDiscoveryCallbacksKeepOwningOrganization(t *testing.T) {
+ for _, orgID := range []string{"org-a", "default", ""} {
+ t.Run("org="+orgID, func(t *testing.T) {
+ events := &recordedDiscoveryEvents{}
+ service := NewService(nil, orgID, time.Minute, "192.0.2.0/24", nil)
+ service.wsHub = events
+ service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
+ return &fakeScanner{result: &pkgdiscovery.DiscoveryResult{
+ Servers: []pkgdiscovery.DiscoveredServer{{IP: "192.0.2.10", Port: 8006, Type: "pve"}},
+ }}, nil
+ }
+ service.performScan()
+ want := []string{"discovery_started", "discovery_server_found", "discovery_progress", "discovery_update", "discovery_complete"}
+ if !reflect.DeepEqual(events.types, want) {
+ t.Fatalf("callback events = %v, want %v", events.types, want)
+ }
+ for i, got := range events.orgIDs {
+ if got != orgID {
+ t.Errorf("%s targets org %q, want %q", events.types[i], got, orgID)
+ }
+ }
+ })
+ }
+}
diff --git a/internal/discovery/service_test.go b/internal/discovery/service_test.go
index 5e117894b7..44fceda5de 100644
--- a/internal/discovery/service_test.go
+++ b/internal/discovery/service_test.go
@@ -97,7 +97,7 @@ func (b *blockingScanner) DiscoverServersWithCallbacks(ctx context.Context, subn
}
func TestPerformScanRecordsHistoryAndMetrics(t *testing.T) {
- service := NewService(nil, time.Minute, "192.168.1.0/24", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "192.168.1.0/24", func() config.DiscoveryConfig {
cfg := config.DefaultDiscoveryConfig()
cfg.SubnetBlocklist = []string{"10.0.0.0/24", "172.16.0.0/24"}
return cfg
@@ -163,7 +163,7 @@ func TestPerformScanRecordsHistoryAndMetrics(t *testing.T) {
}
func TestPerformScanRecordsPartialFailure(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
cfg := config.DefaultDiscoveryConfig()
return cfg
})
@@ -253,7 +253,7 @@ func TestHistoryEntryAccessors(t *testing.T) {
}
func TestNewServiceDefaults(t *testing.T) {
- service := NewService(nil, 0, "", nil)
+ service := NewService(nil, "default", 0, "", nil)
if service.interval != defaultScanInterval {
t.Fatalf("expected default interval, got %v", service.interval)
}
@@ -281,7 +281,7 @@ func TestNewServiceDefaultScannerFactory(t *testing.T) {
detectEnvironmentFn = originalDetectEnvironment
})
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
scanner, err := service.scannerFactory(config.DefaultDiscoveryConfig())
if err != nil {
t.Fatalf("expected scannerFactory to build scanner, got error: %v", err)
@@ -292,7 +292,7 @@ func TestNewServiceDefaultScannerFactory(t *testing.T) {
}
func TestAppendHistoryTrim(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.historyLimit = 1
@@ -307,7 +307,7 @@ func TestAppendHistoryTrim(t *testing.T) {
}
func TestGetHistoryEmpty(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
if history := service.GetHistory(5); history != nil {
@@ -316,7 +316,7 @@ func TestGetHistoryEmpty(t *testing.T) {
}
func TestGetCachedResultEmpty(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
result, updated := service.GetCachedResult()
@@ -329,7 +329,7 @@ func TestGetCachedResultEmpty(t *testing.T) {
}
func TestGetCachedResultWithData(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
now := time.Now()
@@ -351,7 +351,7 @@ func TestGetCachedResultWithData(t *testing.T) {
}
func TestSetInterval(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.SetInterval(2 * time.Minute)
@@ -361,7 +361,7 @@ func TestSetInterval(t *testing.T) {
}
func TestSetIntervalNonPositiveUsesDefault(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.SetInterval(0)
@@ -376,7 +376,7 @@ func TestSetIntervalNonPositiveUsesDefault(t *testing.T) {
}
func TestNewServiceNormalizesInvalidInput(t *testing.T) {
- service := NewService(nil, -1*time.Second, "not-a-subnet", nil)
+ service := NewService(nil, "default", -1*time.Second, "not-a-subnet", nil)
if service.interval != defaultScanInterval {
t.Fatalf("expected default interval for invalid input, got %v", service.interval)
}
@@ -386,7 +386,7 @@ func TestNewServiceNormalizesInvalidInput(t *testing.T) {
}
func TestSetSubnetNormalizesAndFallbacks(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.SetSubnet(" 192.168.1.10/24 , invalid ,10.0.0.0/8,192.168.1.0/24 ")
if service.subnet != "192.168.1.0/24,10.0.0.0/8" {
@@ -412,7 +412,7 @@ func TestNormalizeScanInterval(t *testing.T) {
}
func TestGetStatus(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.mu.Lock()
@@ -433,7 +433,7 @@ func TestGetStatus(t *testing.T) {
}
func TestGetStatusSnapshot(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
@@ -488,7 +488,7 @@ func TestForceRefresh(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 1),
}
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -510,7 +510,7 @@ func TestForceRefreshSkippedWhenScanning(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 1),
}
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -535,7 +535,7 @@ func TestForceRefreshSkippedAfterStop(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 1),
}
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -558,7 +558,7 @@ func TestSetSubnetTriggersScan(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 1),
}
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -580,7 +580,7 @@ func TestSetSubnetWhileScanning(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 1),
}
- service := NewService(nil, time.Minute, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Minute, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -601,7 +601,7 @@ func TestSetSubnetWhileScanning(t *testing.T) {
}
func TestSetSubnetPanicRecovery(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.ctx = context.Background()
calls := make(chan struct{}, 1)
service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
@@ -622,7 +622,7 @@ func TestScanLoopStopsOnStopChan(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 2),
}
- service := NewService(nil, 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.ctx = context.Background()
@@ -656,7 +656,7 @@ func TestScanLoopStopsOnContextCancel(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 2),
}
- service := NewService(nil, 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
ctx, cancel := context.WithCancel(context.Background())
@@ -691,7 +691,7 @@ func TestStartAndStop(t *testing.T) {
result: &pkgdiscovery.DiscoveryResult{},
calls: make(chan struct{}, 2),
}
- service := NewService(nil, 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", 10*time.Millisecond, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
@@ -716,7 +716,7 @@ func TestStopCancelsInFlightScan(t *testing.T) {
started: make(chan struct{}, 1),
done: make(chan error, 1),
}
- service := NewService(nil, time.Hour, "auto", func() config.DiscoveryConfig {
+ service := NewService(nil, "default", time.Hour, "auto", func() config.DiscoveryConfig {
return config.DefaultDiscoveryConfig()
})
service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
@@ -746,7 +746,7 @@ func TestStopCancelsInFlightScan(t *testing.T) {
}
func TestStop_Idempotent(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.Stop()
defer func() {
@@ -759,7 +759,7 @@ func TestStop_Idempotent(t *testing.T) {
}
func TestStartPanicRecovery(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
panic("scan panic")
}
@@ -775,7 +775,7 @@ func TestStartPanicRecovery(t *testing.T) {
}
func TestStartScanLoopPanicRecovery(t *testing.T) {
- service := NewService(nil, 5*time.Millisecond, "auto", nil)
+ service := NewService(nil, "default", 5*time.Millisecond, "auto", nil)
calls := make(chan struct{}, 4)
service.scannerFactory = func(config.DiscoveryConfig) (discoveryScanner, error) {
calls <- struct{}{}
@@ -790,7 +790,7 @@ func TestStartScanLoopPanicRecovery(t *testing.T) {
}
func TestPerformScan_NoContextUsesBackground(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
scanner := &fakeScanner{
result: &pkgdiscovery.DiscoveryResult{},
}
@@ -807,7 +807,7 @@ func TestPerformScan_NoContextUsesBackground(t *testing.T) {
}
func TestPerformScan_StatusFailure(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.ctx = context.Background()
scanner := &fakeScanner{
err: errors.New("scan failed"),
@@ -828,7 +828,7 @@ func TestPerformScan_StatusFailure(t *testing.T) {
}
func TestAppendHistory_ResetLimit(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.historyLimit = -1
service.appendHistory(historyEntry{status: "test"})
if service.historyLimit != defaultHistoryLimit {
@@ -837,7 +837,7 @@ func TestAppendHistory_ResetLimit(t *testing.T) {
}
func TestPerformScan_StructuredErrors(t *testing.T) {
- service := NewService(nil, time.Minute, "auto", nil)
+ service := NewService(nil, "default", time.Minute, "auto", nil)
service.ctx = context.Background()
scanner := &fakeScanner{
result: &pkgdiscovery.DiscoveryResult{
@@ -917,7 +917,7 @@ func TestNormalizeDiscoverySubnet(t *testing.T) {
}
func TestNewServiceInvalidSubnetFallsBackToAuto(t *testing.T) {
- service := NewService(nil, time.Minute, "invalid-subnet", nil)
+ service := NewService(nil, "default", time.Minute, "invalid-subnet", nil)
if service.subnet != "auto" {
t.Fatalf("expected fallback subnet auto, got %q", service.subnet)
}
diff --git a/internal/monitoring/monitor.go b/internal/monitoring/monitor.go
index 625f7cd32a..9a9a813d4a 100644
--- a/internal/monitoring/monitor.go
+++ b/internal/monitoring/monitor.go
@@ -2459,7 +2459,7 @@ func (m *Monitor) startModeRuntime(ctx context.Context, wsHub *websocket.Hub, mo
cfgProvider := func() config.DiscoveryConfig {
return m.discoveryConfigSnapshot()
}
- m.discoveryService = discovery.NewService(wsHub, 5*time.Minute, discoverySubnet, cfgProvider)
+ m.discoveryService = discovery.NewService(wsHub, m.GetOrgID(), 5*time.Minute, discoverySubnet, cfgProvider)
if m.discoveryService != nil {
m.discoveryService.Start(ctx)
log.Info().Msg("discovery service initialized and started")
@@ -5014,7 +5014,7 @@ func (m *Monitor) StartDiscoveryService(ctx context.Context, wsHub *websocket.Hu
return m.discoveryConfigSnapshot()
}
- m.discoveryService = discovery.NewService(wsHub, 5*time.Minute, subnet, cfgProvider)
+ m.discoveryService = discovery.NewService(wsHub, m.orgID, 5*time.Minute, subnet, cfgProvider)
if m.discoveryService != nil {
m.discoveryService.Start(ctx)
log.Info().Str("subnet", subnet).Msg("discovery service started")
diff --git a/internal/websocket/concurrency_test.go b/internal/websocket/concurrency_test.go
index e5ec6293ab..4ee02b4b2c 100644
--- a/internal/websocket/concurrency_test.go
+++ b/internal/websocket/concurrency_test.go
@@ -27,7 +27,7 @@ func TestBroadcastAlertConcurrentMutation(t *testing.T) {
select {
case <-done:
return
- case _, ok := <-hub.broadcast:
+ case _, ok := <-hub.tenantBroadcast:
if !ok {
return
}
@@ -71,7 +71,7 @@ func TestBroadcastAlertConcurrentMutation(t *testing.T) {
mu.Lock()
alertCopy := alert.Clone()
mu.Unlock()
- hub.BroadcastAlert(alertCopy)
+ hub.BroadcastAlertToTenant("default", alertCopy)
}
}()
diff --git a/internal/websocket/hub.go b/internal/websocket/hub.go
index 04efdaa2e8..0447d153cf 100644
--- a/internal/websocket/hub.go
+++ b/internal/websocket/hub.go
@@ -780,13 +780,12 @@ func (h *Hub) Run() {
client.initializeLifecycle()
h.mu.Lock()
h.clients[client] = true
- // Also register by tenant if org ID is set
- if client.orgID != "" {
- if h.clientsByTenant[client.orgID] == nil {
- h.clientsByTenant[client.orgID] = make(map[*Client]bool)
- }
- h.clientsByTenant[client.orgID][client] = true
+ // Legacy clients belong to the default tenant.
+ orgID := normalizeOrgID(client.orgID)
+ if h.clientsByTenant[orgID] == nil {
+ h.clientsByTenant[orgID] = make(map[*Client]bool)
}
+ h.clientsByTenant[orgID][client] = true
h.mu.Unlock()
log.Info().Str("client", client.id).Str("org_id", client.orgID).Msg("webSocket client connected")
@@ -1693,28 +1692,6 @@ func (h *Hub) GetTenantClientCount(orgID string) int {
return 0
}
-// BroadcastAlert broadcasts alert to all clients
-func (h *Hub) BroadcastAlert(alert interface{}) {
- log.Info().Interface("alert", alert).Msg("broadcasting alert to WebSocket clients")
- msg := Message{
- Type: "alert",
- Data: cloneAlertData(alert),
- }
- h.BroadcastMessage(msg)
-}
-
-// BroadcastAlertResolved broadcasts alert resolution to all clients
-func (h *Hub) BroadcastAlertResolved(alertID string) {
- log.Info().Str("alertID", alertID).Msg("broadcasting alert resolved to WebSocket clients")
- msg := Message{
- Type: "alertResolved",
- Data: map[string]string{
- "alertIdentifier": alertID,
- },
- }
- h.BroadcastMessage(msg)
-}
-
// BroadcastAlertToTenant broadcasts alert to clients of a specific tenant only.
// Empty org IDs are normalized to the default tenant.
func (h *Hub) BroadcastAlertToTenant(orgID string, alert interface{}) {
@@ -1782,17 +1759,46 @@ func (h *Hub) GetClientCount() int {
return len(h.clients)
}
-// Broadcast sends a custom message to all connected clients
-func (h *Hub) Broadcast(data interface{}) {
- h.BroadcastMessage(Message{
+// BroadcastToTenant sends a custom message to its owning organization.
+func (h *Hub) BroadcastToTenant(orgID string, data interface{}) {
+ h.BroadcastMessageToTenant(orgID, Message{
Type: "custom",
Data: data,
Timestamp: time.Now().Format(time.RFC3339),
})
}
-// BroadcastMessage sends a message to all clients
+// BroadcastMessageToTenant delivers an event only to its owning organization.
+// Empty organization IDs identify the default tenant, including single-tenant installs.
+func (h *Hub) BroadcastMessageToTenant(orgID string, msg Message) {
+ orgID = normalizeOrgID(orgID)
+ if h.isStopping() {
+ return
+ }
+ msg.Data = sanitizeData(msg.Data)
+ select {
+ case h.tenantBroadcast <- TenantBroadcast{OrgID: orgID, Message: msg}:
+ default:
+ log.Warn().Str("component", websocketHubComponent).
+ Str("action", "enqueue_tenant_message_dropped").Str("org_id", orgID).
+ Str("message_type", msg.Type).Str("channel", "tenant_broadcast").
+ Int("channel_depth", len(h.tenantBroadcast)).
+ Int("channel_capacity", cap(h.tenantBroadcast)).
+ Msg("Tenant broadcast channel full, dropping event")
+ }
+}
+
+// BroadcastMessage accepts only instance-wide events. Tenant-derived messages
+// must use BroadcastMessageToTenant with the organization owning their data.
func (h *Hub) BroadcastMessage(msg Message) {
+ switch msg.Type {
+ case "ping", "settingsUpdate", "update:progress":
+ // Heartbeats, shared system theme, and server software update progress
+ // describe the instance rather than any organization's infrastructure.
+ default:
+ log.Error().Str("type", msg.Type).Msg("Refusing unscoped WebSocket event")
+ return
+ }
if h.isStopping() {
log.Debug().Str("type", msg.Type).Msg("Skipping websocket broadcast while hub is stopping")
return
diff --git a/internal/websocket/hub_concurrency_test.go b/internal/websocket/hub_concurrency_test.go
index 6db9570d81..bf8be4f558 100644
--- a/internal/websocket/hub_concurrency_test.go
+++ b/internal/websocket/hub_concurrency_test.go
@@ -36,7 +36,7 @@ func TestHubConcurrentClients(t *testing.T) {
go func() {
defer wg.Done()
for i := 0; i < iterations; i++ {
- hub.BroadcastMessage(Message{Type: "test", Data: map[string]int{"iteration": i}})
+ hub.BroadcastMessageToTenant("default", Message{Type: "test", Data: map[string]int{"iteration": i}})
time.Sleep(time.Microsecond)
}
}()
diff --git a/internal/websocket/hub_event_boundary_test.go b/internal/websocket/hub_event_boundary_test.go
new file mode 100644
index 0000000000..4c38268d2c
--- /dev/null
+++ b/internal/websocket/hub_event_boundary_test.go
@@ -0,0 +1,109 @@
+package websocket
+
+import (
+ "reflect"
+ "testing"
+ "time"
+)
+
+func TestHubGlobalEventBoundary(t *testing.T) {
+ for _, messageType := range []string{
+ "discovery_started", "discovery_server_found", "discovery_progress",
+ "discovery_update", "discovery_complete", "node_auto_registered",
+ "nodes_changed", "node_deleted", "nodes_updated", "alert", "alertResolved",
+ "custom", "future_tenant_event",
+ } {
+ t.Run(messageType, func(t *testing.T) {
+ hub := NewHub(nil)
+ go hub.Run()
+ t.Cleanup(hub.Stop)
+ registerTenantTestClient(t, hub, "client-a", "org-a")
+ other := registerTenantTestClient(t, hub, "client-b", "org-b")
+ hub.BroadcastMessage(Message{
+ Type: messageType,
+ Data: map[string]string{"orgId": "org-a", "subnet": "192.0.2.0/24"},
+ })
+ assertNoClientMessage(t, other, 50*time.Millisecond)
+ })
+ }
+}
+
+func TestHubTenantEventDelivery(t *testing.T) {
+ for _, orgID := range []string{"org-a", "default", ""} {
+ t.Run("org="+orgID, func(t *testing.T) {
+ hub := NewHub(nil)
+ go hub.Run()
+ t.Cleanup(hub.Stop)
+ owner := registerTenantTestClient(t, hub, "owner", normalizeOrgID(orgID))
+ second := registerTenantTestClient(t, hub, "second", normalizeOrgID(orgID))
+ other := registerTenantTestClient(t, hub, "other", "org-b")
+ otherOrgID := "default"
+ if normalizeOrgID(orgID) == "default" {
+ otherOrgID = "org-a"
+ }
+ otherOrg := registerTenantTestClient(t, hub, "other-org", otherOrgID)
+ for _, messageType := range []string{
+ "discovery_started", "discovery_server_found", "discovery_progress",
+ "discovery_update", "discovery_complete", "node_auto_registered",
+ "nodes_changed", "node_deleted", "nodes_updated",
+ } {
+ want := Message{Type: messageType, Data: map[string]interface{}{"host": "192.0.2.10"}, Timestamp: "event-time"}
+ hub.BroadcastMessageToTenant(orgID, want)
+ for _, client := range []*Client{owner, second} {
+ if got := readClientMessage(t, client, time.Second); !reflect.DeepEqual(got, want) {
+ t.Fatalf("event changed: got %#v, want %#v", got, want)
+ }
+ }
+ }
+ // Discovery retains its existing custom envelope on the wire.
+ for _, messageType := range []string{"discovery_started", "discovery_server_found", "discovery_progress", "discovery_update", "discovery_complete"} {
+ hub.BroadcastToTenant(orgID, Message{Type: messageType})
+ for _, client := range []*Client{owner, second} {
+ got := readClientMessage(t, client, time.Second)
+ payload, ok := got.Data.(map[string]interface{})
+ if got.Type != "custom" || !ok || payload["type"] != messageType || got.Timestamp == "" {
+ t.Fatalf("custom event changed: %#v", got)
+ }
+ }
+ }
+ assertNoClientMessage(t, other, 50*time.Millisecond)
+ assertNoClientMessage(t, otherOrg, 50*time.Millisecond)
+ })
+ }
+}
+
+func TestHubEmptyOrgEventsBelongToDefaultTenant(t *testing.T) {
+ hub := NewHub(nil)
+ go hub.Run()
+ t.Cleanup(hub.Stop)
+ owner := registerTenantTestClient(t, hub, "legacy", "")
+ other := registerTenantTestClient(t, hub, "other", "org-b")
+ hub.BroadcastAlertToTenant("", map[string]string{"id": "one"})
+ hub.BroadcastAlertResolvedToTenant("", "one")
+ hub.BroadcastToTenant("", map[string]string{"host": "192.0.2.10"})
+ for _, want := range []string{"alert", "alertResolved", "custom"} {
+ if got := readClientMessage(t, owner, time.Second); got.Type != want {
+ t.Fatalf("got %q, want %q", got.Type, want)
+ }
+ }
+ assertNoClientMessage(t, other, 50*time.Millisecond)
+}
+
+func TestHubInstanceEventsReachAllTenants(t *testing.T) {
+ hub := NewHub(nil)
+ go hub.Run()
+ t.Cleanup(hub.Stop)
+ clients := []*Client{
+ registerTenantTestClient(t, hub, "a", "org-a"),
+ registerTenantTestClient(t, hub, "b", "org-b"),
+ registerTenantTestClient(t, hub, "default", "default"),
+ }
+ for _, messageType := range []string{"ping", "settingsUpdate", "update:progress"} {
+ hub.BroadcastMessage(Message{Type: messageType})
+ for _, client := range clients {
+ if got := readClientMessage(t, client, time.Second); got.Type != messageType {
+ t.Fatalf("got %q, want %q", got.Type, messageType)
+ }
+ }
+ }
+}
diff --git a/internal/websocket/hub_more2_test.go b/internal/websocket/hub_more2_test.go
index 4f63e13b18..2d72f334a0 100644
--- a/internal/websocket/hub_more2_test.go
+++ b/internal/websocket/hub_more2_test.go
@@ -50,9 +50,16 @@ func TestBroadcastStateEnqueuesRawData(t *testing.T) {
func TestBroadcastAlertResolvedAndCustom(t *testing.T) {
hub := NewHub(nil)
- hub.BroadcastAlertResolved("alert-1")
+ hub.BroadcastAlertResolvedToTenant("", "alert-1")
select {
- case data := <-hub.broadcast:
+ case event := <-hub.tenantBroadcast:
+ if event.OrgID != "default" {
+ t.Fatalf("unexpected org: %s", event.OrgID)
+ }
+ data, err := json.Marshal(event.Message)
+ if err != nil {
+ t.Fatal(err)
+ }
var msg Message
if err := json.Unmarshal(data, &msg); err != nil {
t.Fatalf("unmarshal message: %v", err)
@@ -68,9 +75,16 @@ func TestBroadcastAlertResolvedAndCustom(t *testing.T) {
t.Fatal("expected alertResolved broadcast")
}
- hub.Broadcast(map[string]string{"status": "ok"})
+ hub.BroadcastToTenant("", map[string]string{"status": "ok"})
select {
- case data := <-hub.broadcast:
+ case event := <-hub.tenantBroadcast:
+ if event.OrgID != "default" {
+ t.Fatalf("unexpected org: %s", event.OrgID)
+ }
+ data, err := json.Marshal(event.Message)
+ if err != nil {
+ t.Fatal(err)
+ }
var msg Message
if err := json.Unmarshal(data, &msg); err != nil {
t.Fatalf("unmarshal message: %v", err)
diff --git a/internal/websocket/hub_observability_test.go b/internal/websocket/hub_observability_test.go
index f201daab8a..e5393ae021 100644
--- a/internal/websocket/hub_observability_test.go
+++ b/internal/websocket/hub_observability_test.go
@@ -65,14 +65,14 @@ func TestBroadcastMessageLogsStructuredContextWhenQueueFull(t *testing.T) {
defer restore()
hub.BroadcastMessage(Message{
- Type: "custom",
+ Type: "settingsUpdate",
Data: map[string]string{"status": "ok"},
})
entry := singleWebSocketLogEntry(t, buf.String())
assertWebSocketLogStringField(t, entry, "component", websocketHubComponent)
assertWebSocketLogStringField(t, entry, "action", "enqueue_broadcast_dropped")
- assertWebSocketLogStringField(t, entry, "message_type", "custom")
+ assertWebSocketLogStringField(t, entry, "message_type", "settingsUpdate")
assertWebSocketLogStringField(t, entry, "channel", "broadcast")
assertWebSocketLogIntField(t, entry, "channel_depth", cap(hub.broadcast))
assertWebSocketLogIntField(t, entry, "channel_capacity", cap(hub.broadcast))