diff --git a/.vscode/markdown.code-snippets b/.vscode/markdown.code-snippets index 0d1fcf3402223..bdd3463b48836 100644 --- a/.vscode/markdown.code-snippets +++ b/.vscode/markdown.code-snippets @@ -20,6 +20,14 @@ "body": "![${TM_SELECTED_TEXT:${1:alt}}](${2:url})$0", "description": "image" }, + "premium-feature": { + "prefix": "#premium-feature", + "body": [ + "
\n", + "${1:feature} ${2|is,are|} an Enterprise and Premium feature. [Learn more](https://coder.com/pricing#compare-plans).\n", + "
" + ] + }, "tabs": { "prefix": "#tabs", "body": [ diff --git a/docs/admin/external-auth.md b/docs/admin/external-auth.md index 51f11f53d2754..d859467aa6d7a 100644 --- a/docs/admin/external-auth.md +++ b/docs/admin/external-auth.md @@ -179,11 +179,16 @@ Optionally, you can request custom scopes: CODER_EXTERNAL_AUTH_0_SCOPES="repo:read repo:write write:gpg_key" ``` -## Multiple External Providers (enterprise) (premium) +## Multiple External Providers -Multiple providers are an Enterprise feature. -[Learn more](https://coder.com/pricing#compare-plans). Below is an example -configuration with multiple providers. +
+ +Multiple providers is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
+ +Below is an example configuration with multiple providers: ```env # Provider 1) github.com @@ -204,7 +209,7 @@ CODER_EXTERNAL_AUTH_1_TOKEN_URL="https://github.example.com/login/oauth/access_t CODER_EXTERNAL_AUTH_1_VALIDATE_URL="https://github.example.com/api/v3/user" ``` -To support regex matching for paths (e.g. github\.com/org), you'll need to add +To support regex matching for paths (e.g. `github\.com/org`), you'll need to add this to the [Coder agent startup script](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/agent#startup_script): diff --git a/docs/admin/infrastructure/validated-architectures/index.md b/docs/admin/infrastructure/validated-architectures/index.md index f0baa7c632b98..530f7d62cb5d7 100644 --- a/docs/admin/infrastructure/validated-architectures/index.md +++ b/docs/admin/infrastructure/validated-architectures/index.md @@ -343,7 +343,7 @@ could affect workspace users experience once the platform is live. versions into Coder from git. For example, on GitHub, you can use the [Setup Coder](https://github.com/marketplace/actions/setup-coder) action. 1. Evaluate enabling - [automatic template updates](../../templates/managing-templates/index.md#template-update-policies-enterprise-premium) + [automatic template updates](../../templates/managing-templates/index.md#template-update-policies) upon workspace startup. ### Observability diff --git a/docs/admin/monitoring/notifications/index.md b/docs/admin/monitoring/notifications/index.md index a9e6a87d78139..f527d7743ff87 100644 --- a/docs/admin/monitoring/notifications/index.md +++ b/docs/admin/monitoring/notifications/index.md @@ -78,9 +78,8 @@ can only be delivered to one method, and this method is configured globally with will be disabled. Premium customers can configure which method to use for each of the supported -[Events](#workspace-events); see the -[Preferences](#delivery-preferences-enterprise-premium) section below for more -details. +[Events](#workspace-events); see the [Preferences](#delivery-preferences) +section below for more details. ## SMTP (Email) @@ -232,7 +231,14 @@ notification is indicated on the right hand side of this table. ![User Notification Preferences](../../../images/admin/monitoring/notifications/user-notification-preferences.png) -## Delivery Preferences (enterprise) (premium) +## Delivery Preferences + +
+ +Delivery preferences is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Administrators can configure which delivery methods are used for each different [event type](#event-types). diff --git a/docs/admin/networking/index.md b/docs/admin/networking/index.md index e93c83938c125..522805c34e04c 100644 --- a/docs/admin/networking/index.md +++ b/docs/admin/networking/index.md @@ -176,7 +176,14 @@ coder server, so they can only be geo-distributed with High Availability mode in our Premium Edition. [Reach out to Sales](https://coder.com/contact) to learn more. -## Browser-only connections (enterprise) (premium) +## Browser-only connections + +
+ +Browser-only connections is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Some Coder deployments require that all access is through the browser to comply with security policies. In these cases, pass the `--browser-only` flag to @@ -186,7 +193,14 @@ With browser-only connections, developers can only connect to their workspaces via the web terminal and [web IDEs](../../user-guides/workspace-access/web-ides.md). -### Workspace Proxies (enterprise) (premium) +### Workspace Proxies + +
+ +Workspace proxies are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Workspace proxies are a Coder Enterprise feature that allows you to provide low-latency browser experiences for geo-distributed teams. diff --git a/docs/admin/networking/port-forwarding.md b/docs/admin/networking/port-forwarding.md index 692f933658538..e7a07ab4a4189 100644 --- a/docs/admin/networking/port-forwarding.md +++ b/docs/admin/networking/port-forwarding.md @@ -129,7 +129,14 @@ resource uses a different method of authentication and **is not impacted by the template's maximum sharing level**, nor the level of a shared port that points to the app. -### Configure maximum port sharing level (enterprise) (premium) +### Configure maximum port sharing level + +
+ +Configuring port sharing level is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Premium-licensed template admins can control the maximum port sharing level for workspaces under a given template in the template settings. By default, the diff --git a/docs/admin/setup/appearance.md b/docs/admin/setup/appearance.md index ddb94bc04d267..a1ff8ad1450ae 100644 --- a/docs/admin/setup/appearance.md +++ b/docs/admin/setup/appearance.md @@ -1,4 +1,11 @@ -# Appearance (enterprise) (premium) +# Appearance + +
+ +Customizing Coder's appearance is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Customize the look of your Coder deployment to meet your enterprise requirements. diff --git a/docs/admin/templates/managing-templates/index.md b/docs/admin/templates/managing-templates/index.md index a9e215bb71105..7cec832f39c2b 100644 --- a/docs/admin/templates/managing-templates/index.md +++ b/docs/admin/templates/managing-templates/index.md @@ -58,7 +58,14 @@ infrastructure, software, or security patches. Learn more about ![Updating a template](../../../images/templates/update.png) -### Template update policies (enterprise) (premium) +### Template update policies + +
+ +Template update policies are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Licensed template admins may want workspaces to always remain on the latest version of their parent template. To do so, enable **Template Update Policies** diff --git a/docs/admin/templates/managing-templates/schedule.md b/docs/admin/templates/managing-templates/schedule.md index ffbebef713de8..89185f7fa7df7 100644 --- a/docs/admin/templates/managing-templates/schedule.md +++ b/docs/admin/templates/managing-templates/schedule.md @@ -12,9 +12,8 @@ Template [admins](../../users/index.md) may define these default values: - [**Default autostop**](../../../user-guides/workspace-scheduling.md#autostop): How long a workspace runs without user activity before Coder automatically stops it. -- [**Autostop requirement**](#autostop-requirement-enterprise-premium): Enforce - mandatory workspace restarts to apply template updates regardless of user - activity. +- [**Autostop requirement**](#autostop-requirement): Enforce mandatory workspace + restarts to apply template updates regardless of user activity. - **Activity bump**: The duration of inactivity that must pass before a workspace is automatically stopped. - **Dormancy**: This allows automatic deletion of unused workspaces to reduce @@ -27,13 +26,27 @@ allow users to define their own autostart and autostop schedules. Admins can restrict the days of the week a workspace should automatically start to help manage infrastructure costs. -## Failure cleanup (enterprise) (premium) +## Failure cleanup + +
+ +Failure cleanup is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Failure cleanup defines how long a workspace is permitted to remain in the failed state prior to being automatically stopped. Failure cleanup is only available for licensed customers. -## Dormancy threshold (enterprise) (premium) +## Dormancy threshold + +
+ +Dormancy threshold is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Dormancy Threshold defines how long Coder allows a workspace to remain inactive before being moved into a dormant state. A workspace's inactivity is determined @@ -43,13 +56,27 @@ the user before being accessible. Coder stops workspaces during their transition to the dormant state if they are detected to be running. Dormancy Threshold is only available for licensed customers. -## Dormancy auto-deletion (enterprise) (premium) +## Dormancy auto-deletion + +
+ +Dormancy auto-deletion is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Dormancy Auto-Deletion allows a template admin to dictate how long a workspace is permitted to remain dormant before it is automatically deleted. Dormancy Auto-Deletion is only available for licensed customers. -## Autostop requirement (enterprise) (premium) +## Autostop requirement + +
+ +Autostop requirement is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Autostop requirement is a template setting that determines how often workspaces using the template must automatically stop. Autostop requirement ignores any @@ -79,7 +106,14 @@ Autostop requirement is disabled when the template is using the deprecated max lifetime feature. Templates can choose to use a max lifetime or an autostop requirement during the deprecation period, but only one can be used at a time. -## User quiet hours (enterprise) (premium) +## User quiet hours + +
+ +User quiet hours are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
User quiet hours can be configured in the user's schedule settings page. Workspaces on templates with an autostop requirement will only be forcibly diff --git a/docs/admin/templates/template-permissions.md b/docs/admin/templates/template-permissions.md index e09acdfb3124c..22452c23dc5b8 100644 --- a/docs/admin/templates/template-permissions.md +++ b/docs/admin/templates/template-permissions.md @@ -1,4 +1,11 @@ -# Permissions (enterprise) (premium) +# Permissions + +
+ +Template permissions are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Licensed Coder administrators can control who can use and modify the template. diff --git a/docs/admin/users/groups-roles.md b/docs/admin/users/groups-roles.md index e40efb0bd5a10..91647db34c8f1 100644 --- a/docs/admin/users/groups-roles.md +++ b/docs/admin/users/groups-roles.md @@ -31,7 +31,14 @@ Roles determine which actions users can take within the platform. A user may have one or more roles. All users have an implicit Member role that may use personal workspaces. -## Custom Roles (Premium) (Beta) +## Custom Roles + +
+ +Custom roles are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Starting in v2.16.0, Premium Coder deployments can configure custom roles on the [Organization](./organizations.md) level. You can create and assign custom roles diff --git a/docs/admin/users/idp-sync.md b/docs/admin/users/idp-sync.md index f9547cb85af6e..bb2d48d4a03f6 100644 --- a/docs/admin/users/idp-sync.md +++ b/docs/admin/users/idp-sync.md @@ -1,4 +1,11 @@ -# IDP Sync (enterprise) (premium) +# IDP Sync + +
+ +IDP sync is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
If your OpenID Connect provider supports group claims, you can configure Coder to synchronize groups in your auth provider to groups within Coder. To enable @@ -205,7 +212,14 @@ Users who are not in a matching group will see the following error: Unauthorized group error -## Role sync (enterprise) (premium) +## Role sync + +
+ +Role sync is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
If your OpenID Connect provider supports roles claims, you can configure Coder to synchronize roles in your auth provider to roles within Coder. @@ -337,7 +351,14 @@ Visit the Coder UI to confirm these changes: -## Organization Sync (Premium) +## Organization Sync + +
+ +Organization sync is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
If your OpenID Connect provider supports groups/role claims, you can configure Coder to synchronize claims in your auth provider to organizations within Coder. diff --git a/docs/admin/users/oidc-auth.md b/docs/admin/users/oidc-auth.md index bb960c38d11fd..fc4b0fd6559d7 100644 --- a/docs/admin/users/oidc-auth.md +++ b/docs/admin/users/oidc-auth.md @@ -130,7 +130,14 @@ your Coder deployment: CODER_DISABLE_PASSWORD_AUTH=true ``` -## SCIM (enterprise) (premium) +## SCIM + +
+ +SCIM is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Coder supports user provisioning and deprovisioning via SCIM 2.0 with header authentication. Upon deactivation, users are diff --git a/docs/user-guides/workspace-access/vscode.md b/docs/user-guides/workspace-access/vscode.md index 7eab386c7626f..5f7de223ef81e 100644 --- a/docs/user-guides/workspace-access/vscode.md +++ b/docs/user-guides/workspace-access/vscode.md @@ -16,7 +16,7 @@ extension, authenticates with Coder, and connects to the workspace. ![Demo](https://github.com/coder/vscode-coder/raw/main/demo.gif?raw=true) > The `VS Code Desktop` button can be hidden by enabling -> [Browser-only connections](../../admin/networking/index.md#browser-only-connections-enterprise-premium). +> [Browser-only connections](../../admin/networking/index.md#browser-only-connections). ### Manual Installation diff --git a/docs/user-guides/workspace-management.md b/docs/user-guides/workspace-management.md index 98158cf0233ef..1417b650cd650 100644 --- a/docs/user-guides/workspace-management.md +++ b/docs/user-guides/workspace-management.md @@ -88,7 +88,14 @@ manually updated the workspace. ![Automatic Updates](../images/workspace-automatic-updates.png) -## Bulk operations (enterprise) (premium) +## Bulk operations + +
+ +Bulk operations are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Licensed admins may apply bulk operations (update, delete, start, stop) in the **Workspaces** tab. Select the workspaces you'd like to modify with the diff --git a/docs/user-guides/workspace-scheduling.md b/docs/user-guides/workspace-scheduling.md index 322b7739def97..44f79519af236 100644 --- a/docs/user-guides/workspace-scheduling.md +++ b/docs/user-guides/workspace-scheduling.md @@ -49,7 +49,14 @@ Workspaces will automatically shut down after a period of inactivity. This can be configured at the template level, but is visible in the autostop description for your workspace. -## Autostop requirement (enterprise) (premium) +## Autostop requirement + +
+ +Autostop requirement is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Licensed template admins may enforce a required stop for workspaces to apply updates or undergo maintenance. These stops ignore any active connections or @@ -61,7 +68,14 @@ and specified quiet hours (see below). > Admins: See the template schedule settings for more information on configuring > Autostop Requirement. -### User quiet hours (enterprise) (premium) +### User quiet hours + +
+ +User quiet hours are an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
User quiet hours can be configured in the user's schedule settings page. Workspaces on templates with an autostop requirement will only be forcibly @@ -99,7 +113,14 @@ Let's say that both are set to 5 hours. When either your workspace autostarts or you sign in, you will have confidence that the only condition for shutdown is 5 hours of inactivity. -## Dormancy (enterprise) (premium) +## Dormancy + +
+ +Dormancy is an Enterprise and Premium feature. +[Learn more](https://coder.com/pricing#compare-plans). + +
Dormancy automatically deletes workspaces which remain unused for long durations. Template admins configure an inactivity period after which your diff --git a/enterprise/coderd/scim.go b/enterprise/coderd/scim.go index 618c1e6bf3c3f..3efbc89363ad6 100644 --- a/enterprise/coderd/scim.go +++ b/enterprise/coderd/scim.go @@ -69,7 +69,7 @@ func (api *API) scimServiceProviderConfig(rw http.ResponseWriter, _ *http.Reques enc.SetEscapeHTML(true) _ = enc.Encode(scim.ServiceProviderConfig{ Schemas: []string{"urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig"}, - DocURI: "https://coder.com/docs/admin/users/oidc-auth#scim-enterprise-premium", + DocURI: "https://coder.com/docs/admin/users/oidc-auth#scim", Patch: scim.Supported{ Supported: true, }, @@ -93,7 +93,7 @@ func (api *API) scimServiceProviderConfig(rw http.ResponseWriter, _ *http.Reques Type: "oauthbearertoken", Name: "HTTP Header Authentication", Description: "Authentication scheme using the Authorization header with the shared token", - DocURI: "https://coder.com/docs/admin/users/oidc-auth#scim-enterprise-premium", + DocURI: "https://coder.com/docs/admin/users/oidc-auth#scim", }, }, Meta: scim.ServiceProviderMeta{ diff --git a/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPageView.tsx b/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPageView.tsx index cb2f260bc160b..9c514c87756f2 100644 --- a/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPageView.tsx +++ b/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPageView.tsx @@ -51,9 +51,7 @@ export const SecuritySettingsPageView: FC = ({ title="Browser Only Connections" secondary description="Block all workspace access via SSH, port forward, and other non-browser connections." - docsHref={docs( - "/admin/networking#browser-only-connections-enterprise-premium", - )} + docsHref={docs("/admin/networking#browser-only-connections")} /> diff --git a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx index 271061e8390a2..63c71220daa09 100644 --- a/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx +++ b/site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx @@ -133,7 +133,7 @@ export const PublishTemplateVersionDialog: FC< {Language.activeVersionHelpBody}