diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden index 56edb2c58de04..f40f5ac07cf46 100644 --- a/cli/testdata/coder_server_--help.golden +++ b/cli/testdata/coder_server_--help.golden @@ -353,9 +353,6 @@ telemetrywhen required by your organization's security policy. Enterprise Options These options are only available in the Enterprise Edition. - --audit-logging bool, $CODER_AUDIT_LOGGING (default: true) - Specifies whether audit logging is enabled. - --browser-only bool, $CODER_BROWSER_ONLY Whether Coder only allows connections to workspaces via the browser. diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index 6c7c68e2432cf..02e043b94cb9d 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -6886,9 +6886,6 @@ const docTemplate = `{ "agent_stat_refresh_interval": { "type": "integer" }, - "audit_logging": { - "type": "boolean" - }, "autobuild_poll_interval": { "type": "integer" }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 9b6bf0e57db5b..d803441d0ee66 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -6150,9 +6150,6 @@ "agent_stat_refresh_interval": { "type": "integer" }, - "audit_logging": { - "type": "boolean" - }, "autobuild_poll_interval": { "type": "integer" }, diff --git a/codersdk/deployment.go b/codersdk/deployment.go index ebace3488709d..3247ad194d2d0 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -142,7 +142,6 @@ type DeploymentValues struct { MetricsCacheRefreshInterval clibase.Duration `json:"metrics_cache_refresh_interval,omitempty" typescript:",notnull"` AgentStatRefreshInterval clibase.Duration `json:"agent_stat_refresh_interval,omitempty" typescript:",notnull"` AgentFallbackTroubleshootingURL clibase.URL `json:"agent_fallback_troubleshooting_url,omitempty" typescript:",notnull"` - AuditLogging clibase.Bool `json:"audit_logging,omitempty" typescript:",notnull"` BrowserOnly clibase.Bool `json:"browser_only,omitempty" typescript:",notnull"` SCIMAPIKey clibase.String `json:"scim_api_key,omitempty" typescript:",notnull"` Provisioner ProvisionerConfig `json:"provisioner,omitempty" typescript:",notnull"` @@ -1262,16 +1261,6 @@ when required by your organization's security policy.`, Value: &c.AgentFallbackTroubleshootingURL, YAML: "agentFallbackTroubleshootingURL", }, - { - Name: "Audit Logging", - Description: "Specifies whether audit logging is enabled.", - Flag: "audit-logging", - Env: "CODER_AUDIT_LOGGING", - Default: "true", - Annotations: clibase.Annotations{}.Mark(flagEnterpriseKey, "true"), - Value: &c.AuditLogging, - YAML: "auditLogging", - }, { Name: "Browser Only", Description: "Whether Coder only allows connections to workspaces via the browser.", diff --git a/docs/api/general.md b/docs/api/general.md index 43dafb41e5d51..4a264d9d1bb85 100644 --- a/docs/api/general.md +++ b/docs/api/general.md @@ -150,7 +150,6 @@ curl -X GET http://coder-server:8080/api/v2/deployment/config \ "user": {} }, "agent_stat_refresh_interval": 0, - "audit_logging": true, "autobuild_poll_interval": 0, "browser_only": true, "cache_directory": "string", diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 7238089f02ca8..bc54759e9493b 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -1750,7 +1750,6 @@ CreateParameterRequest is a structure used to create a new parameter value for a "user": {} }, "agent_stat_refresh_interval": 0, - "audit_logging": true, "autobuild_poll_interval": 0, "browser_only": true, "cache_directory": "string", @@ -2098,7 +2097,6 @@ CreateParameterRequest is a structure used to create a new parameter value for a "user": {} }, "agent_stat_refresh_interval": 0, - "audit_logging": true, "autobuild_poll_interval": 0, "browser_only": true, "cache_directory": "string", @@ -2317,7 +2315,6 @@ CreateParameterRequest is a structure used to create a new parameter value for a | `address` | [clibase.HostPort](#clibasehostport) | false | | Address Use HTTPAddress or TLS.Address instead. | | `agent_fallback_troubleshooting_url` | [clibase.URL](#clibaseurl) | false | | | | `agent_stat_refresh_interval` | integer | false | | | -| `audit_logging` | boolean | false | | | | `autobuild_poll_interval` | integer | false | | | | `browser_only` | boolean | false | | | | `cache_directory` | string | false | | | diff --git a/docs/cli/server.md b/docs/cli/server.md index e9c9e73bb68d7..a2ffbbbd0eb46 100644 --- a/docs/cli/server.md +++ b/docs/cli/server.md @@ -29,16 +29,6 @@ coder server [flags] The URL that users will use to access the Coder deployment. -### --audit-logging - -| | | -| ----------- | --------------------------------- | -| Type | bool | -| Environment | $CODER_AUDIT_LOGGING | -| Default | true | - -Specifies whether audit logging is enabled. - ### --browser-only | | | diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go index 68b78648e6cea..d26f9e1b64618 100644 --- a/enterprise/cli/server.go +++ b/enterprise/cli/server.go @@ -49,18 +49,15 @@ func (r *RootCmd) server() *clibase.Cmd { } } options.DERPServer.SetMeshKey(meshKey) - - if options.DeploymentValues.AuditLogging.Value() { - options.Auditor = audit.NewAuditor(audit.DefaultFilter, - backends.NewPostgres(options.Database, true), - backends.NewSlog(options.Logger), - ) - } + options.Auditor = audit.NewAuditor(audit.DefaultFilter, + backends.NewPostgres(options.Database, true), + backends.NewSlog(options.Logger), + ) options.TrialGenerator = trialer.New(options.Database, "https://v2-licensor.coder.com/trial", coderd.Keys) o := &coderd.Options{ - AuditLogging: options.DeploymentValues.AuditLogging.Value(), + AuditLogging: true, BrowserOnly: options.DeploymentValues.BrowserOnly.Value(), SCIMAPIKey: []byte(options.DeploymentValues.SCIMAPIKey.Value()), RBAC: true, diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 440d29d84d3c2..06a34c7112d8e 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -347,7 +347,6 @@ export interface DeploymentValues { readonly metrics_cache_refresh_interval?: number readonly agent_stat_refresh_interval?: number readonly agent_fallback_troubleshooting_url?: string - readonly audit_logging?: boolean readonly browser_only?: boolean readonly scim_api_key?: string readonly provisioner?: ProvisionerConfig