diff --git a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json index a9830ea387..f8a7964ca3 100644 --- a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json +++ b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json @@ -472,11 +472,7 @@ "EnableGossipCompression": true, "EnableExperimentalGossipEncryption": false, "ReadOnlyConfig": true, - "GossipPort": 8074, - "StreamingPort": 8075, - "MaxIdleConns": 100, - "MaxIdleConnsPerHost": 128, - "IdleConnTimeoutMilliseconds": 90000 + "GossipPort": 8074 }, "MetricsSettings": { "Enable": false, diff --git a/e2e-tests/playwright/support/server/default_config.ts b/e2e-tests/playwright/support/server/default_config.ts index 800eb870b9..4dd9b300e2 100644 --- a/e2e-tests/playwright/support/server/default_config.ts +++ b/e2e-tests/playwright/support/server/default_config.ts @@ -556,10 +556,6 @@ const defaultServerConfig: AdminConfig = { EnableExperimentalGossipEncryption: false, ReadOnlyConfig: true, GossipPort: 8074, - StreamingPort: 8075, - MaxIdleConns: 100, - MaxIdleConnsPerHost: 128, - IdleConnTimeoutMilliseconds: 90000, }, MetricsSettings: { Enable: false, diff --git a/server/channels/store/searchlayer/layer_test.go b/server/channels/store/searchlayer/layer_test.go index 96f6e43922..74c5153c81 100644 --- a/server/channels/store/searchlayer/layer_test.go +++ b/server/channels/store/searchlayer/layer_test.go @@ -33,7 +33,7 @@ func TestUpdateConfigRace(t *testing.T) { cfg := &model.Config{} cfg.SetDefaults() - cfg.ClusterSettings.MaxIdleConns = model.NewInt(1) + cfg.ClusterSettings.GossipPort = model.NewInt(9999) searchEngine := searchengine.NewBroker(cfg) layer := searchlayer.NewSearchLayer(&testlib.TestStore{Store: store}, searchEngine, cfg) var wg sync.WaitGroup diff --git a/server/public/model/cluster_discovery.go b/server/public/model/cluster_discovery.go index 0a60dd6be3..90052a64ee 100644 --- a/server/public/model/cluster_discovery.go +++ b/server/public/model/cluster_discovery.go @@ -19,7 +19,7 @@ type ClusterDiscovery struct { ClusterName string `json:"cluster_name"` Hostname string `json:"hostname"` GossipPort int32 `json:"gossip_port"` - Port int32 `json:"port"` + Port int32 `json:"port"` // Deperacted: Port is unused. It's only kept for backwards compatibility. CreateAt int64 `json:"create_at"` LastPingAt int64 `json:"last_ping_at"` } diff --git a/server/public/model/config.go b/server/public/model/config.go index e69bcc0d18..c257e092df 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -934,10 +934,6 @@ type ClusterSettings struct { EnableExperimentalGossipEncryption *bool `access:"environment_high_availability,write_restrictable,cloud_restrictable"` ReadOnlyConfig *bool `access:"environment_high_availability,write_restrictable,cloud_restrictable"` GossipPort *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none - StreamingPort *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none - MaxIdleConns *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none - MaxIdleConnsPerHost *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none - IdleConnTimeoutMilliseconds *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none } func (s *ClusterSettings) SetDefaults() { @@ -984,22 +980,6 @@ func (s *ClusterSettings) SetDefaults() { if s.GossipPort == nil { s.GossipPort = NewInt(8074) } - - if s.StreamingPort == nil { - s.StreamingPort = NewInt(8075) - } - - if s.MaxIdleConns == nil { - s.MaxIdleConns = NewInt(100) - } - - if s.MaxIdleConnsPerHost == nil { - s.MaxIdleConnsPerHost = NewInt(128) - } - - if s.IdleConnTimeoutMilliseconds == nil { - s.IdleConnTimeoutMilliseconds = NewInt(90000) - } } type MetricsSettings struct { diff --git a/server/tests/test-config.json b/server/tests/test-config.json index bbdb1d92d7..0eb26422e8 100644 --- a/server/tests/test-config.json +++ b/server/tests/test-config.json @@ -167,7 +167,7 @@ "EmailNotificationContentsType": "full", "LoginButtonColor": "", "LoginButtonBorderColor": "", - "LoginButtonTextColor": "", + "LoginButtonTextColor": "" }, "RateLimitSettings": { "Enable": false, @@ -307,11 +307,7 @@ "UseIPAddress": true, "UseExperimentalGossip": true, "ReadOnlyConfig": true, - "GossipPort": 8074, - "StreamingPort": 8075, - "MaxIdleConns": 100, - "MaxIdleConnsPerHost": 128, - "IdleConnTimeoutMilliseconds": 90000 + "GossipPort": 8074 }, "MetricsSettings": { "Enable": false, diff --git a/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap index 75c3e7ae53..32ad049829 100644 --- a/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap @@ -226,29 +226,6 @@ exports[`components/ClusterSettings should match snapshot, compression disabled setByEnv={false} value={8074} /> - - } - id="StreamingPort" - label={ - - } - onChange={[Function]} - placeholder={ - Object { - "defaultMessage": "E.g.: \\"8075\\"", - "id": "admin.cluster.StreamingPortEx", - } - } - setByEnv={false} - />
- - } - id="StreamingPort" - label={ - - } - onChange={[Function]} - placeholder={ - Object { - "defaultMessage": "E.g.: \\"8075\\"", - "id": "admin.cluster.StreamingPortEx", - } - } - setByEnv={false} - />
- - } - id="StreamingPort" - label={ - - } - onChange={[Function]} - placeholder={ - Object { - "defaultMessage": "E.g.: \\"8075\\"", - "id": "admin.cluster.StreamingPortEx", - } - } - setByEnv={false} - />
- - } - id="StreamingPort" - label={ - - } - onChange={[Function]} - placeholder={ - Object { - "defaultMessage": "E.g.: \\"8075\\"", - "id": "admin.cluster.StreamingPortEx", - } - } - setByEnv={false} - />
{ @@ -87,7 +82,6 @@ export default class ClusterSettings extends AdminSettings { config.ClusterSettings.EnableExperimentalGossipEncryption = this.state.EnableExperimentalGossipEncryption; config.ClusterSettings.EnableGossipCompression = this.state.EnableGossipCompression; config.ClusterSettings.GossipPort = this.parseIntNonZero(this.state.GossipPort, 8074); - config.ClusterSettings.StreamingPort = this.parseIntNonZero(this.state.StreamingPort, 8075); return config; }; @@ -102,7 +96,6 @@ export default class ClusterSettings extends AdminSettings { EnableExperimentalGossipEncryption: settings.EnableExperimentalGossipEncryption, EnableGossipCompression: settings.EnableGossipCompression, GossipPort: settings.GossipPort, - StreamingPort: settings.StreamingPort, showWarning: false, }; } @@ -275,16 +268,6 @@ export default class ClusterSettings extends AdminSettings { setByEnv={this.isSetByEnv('ClusterSettings.GossipPort')} disabled={this.props.isDisabled} /> - } - placeholder={defineMessage({id: 'admin.cluster.StreamingPortEx', defaultMessage: 'E.g.: "8075"'})} - helpText={} - value={this.state.StreamingPort} - onChange={this.overrideHandleChange} - setByEnv={this.isSetByEnv('ClusterSettings.StreamingPort')} - disabled={this.props.isDisabled} - /> ); }; diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 450e113436..4aef79d10a 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -598,9 +598,6 @@ "admin.cluster.status_table.status": "Status", "admin.cluster.status_table.url": "Gossip Address", "admin.cluster.status_table.version": "Version", - "admin.cluster.StreamingPort": "Streaming Port:", - "admin.cluster.StreamingPortDesc": "The port used for streaming data between servers.", - "admin.cluster.StreamingPortEx": "E.g.: \"8075\"", "admin.cluster.unknown": "unknown", "admin.cluster.UseIPAddress": "Use IP Address:", "admin.cluster.UseIPAddressDesc": "When true, the cluster will attempt to communicate via IP Address vs using the hostname.", diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts index a6f5854354..412aa631d2 100644 --- a/webapp/platform/types/src/config.ts +++ b/webapp/platform/types/src/config.ts @@ -763,10 +763,6 @@ export type ClusterSettings = { EnableExperimentalGossipEncryption: boolean; ReadOnlyConfig: boolean; GossipPort: number; - StreamingPort: number; - MaxIdleConns: number; - MaxIdleConnsPerHost: number; - IdleConnTimeoutMilliseconds: number; }; export type MetricsSettings = {