From 8e7eb6a4a8bb146c8b6f0739a8d7397ba5b6cab5 Mon Sep 17 00:00:00 2001 From: Paul Gottschling Date: Tue, 5 Mar 2024 12:17:15 -0500 Subject: [PATCH] Remove Teleport Team mentions from the docs Backports #38940 - Remove the `team` scope from config.json. - Edit the Edition comparison table to remove the "Team" column. - Change the Teleport Team getting started guide to a Teleport Enterprise Cloud getting started guide. - Remove other Teleport Team mentions from the docs. --- docs/config.json | 96 ++++---------- docs/pages/access-controls/access-graph.mdx | 7 +- .../access-graph/self-hosted-helm.mdx | 6 +- .../access-graph/self-hosted.mdx | 6 +- .../pages/access-controls/idps/saml-guide.mdx | 2 +- docs/pages/access-controls/sso/github-sso.mdx | 5 +- docs/pages/access-controls/sso/okta.mdx | 6 +- docs/pages/agents/deploy-agents-terraform.mdx | 8 +- docs/pages/ai-assist.mdx | 8 +- docs/pages/choose-an-edition/introduction.mdx | 9 -- .../teleport-cloud/external-audit-storage.mdx | 3 +- .../choose-an-edition/teleport-cloud/faq.mdx | 18 +-- .../get-started.mdx} | 123 +++++++++--------- .../teleport-cloud/introduction.mdx | 8 +- .../teleport-enterprise/introduction.mdx | 5 +- docs/pages/core-concepts.mdx | 9 -- docs/pages/database-access/faq.mdx | 4 +- .../reference/configuration.mdx | 10 +- docs/pages/desktop-access/getting-started.mdx | 2 +- docs/pages/documentation-overview.mdx | 5 +- docs/pages/faq.mdx | 3 +- docs/pages/includes/cloud/call-to-action.mdx | 6 +- .../includes/configure-event-handler.mdx | 4 +- .../includes/database-access/create-user.mdx | 2 +- .../database-access/db-configure-start.mdx | 2 +- docs/pages/includes/edition-comparison.mdx | 106 +++++++-------- docs/pages/includes/edition-prereqs-tabs.mdx | 29 +---- docs/pages/includes/ent-vs-community-faq.mdx | 2 +- docs/pages/includes/install-linux.mdx | 16 --- docs/pages/includes/install-windows.mdx | 5 - docs/pages/includes/no-oss-prereqs-tabs.mdx | 19 --- docs/pages/includes/plugins/enroll.mdx | 4 +- docs/pages/index.mdx | 7 +- docs/pages/installation.mdx | 4 +- .../kubernetes-access/getting-started.mdx | 2 +- .../management/admin/trustedclusters.mdx | 6 +- .../management/admin/uninstall-teleport.mdx | 10 +- docs/pages/management/admin/users.mdx | 2 +- docs/pages/management/dynamic-resources.mdx | 11 +- .../management/operations/backup-restore.mdx | 10 +- .../management/operations/tls-routing.mdx | 7 +- docs/pages/reference/audit.mdx | 11 +- docs/pages/reference/authentication.mdx | 21 --- docs/pages/upgrading/cloud-kubernetes.mdx | 8 +- docs/pages/upgrading/cloud-linux.mdx | 9 +- docs/pages/upgrading/overview.mdx | 7 +- 46 files changed, 247 insertions(+), 406 deletions(-) rename docs/pages/choose-an-edition/{teleport-team.mdx => teleport-cloud/get-started.mdx} (59%) diff --git a/docs/config.json b/docs/config.json index 22b4c94455fce..70125551023db 100644 --- a/docs/config.json +++ b/docs/config.json @@ -31,18 +31,12 @@ { "title": "Teleport Cloud Agents (Linux)", "slug": "/upgrading/cloud-linux/", - "forScopes": [ - "cloud", - "team" - ] + "forScopes": ["cloud"] }, { "title": "Teleport Cloud Agents (Kubernetes)", "slug": "/upgrading/cloud-kubernetes/", - "forScopes": [ - "cloud", - "team" - ] + "forScopes": ["cloud"] }, { "title": "Self-Hosted Linux", @@ -76,11 +70,7 @@ { "title": "Usage Reporting and Billing", "slug": "/usage-billing/", - "forScopes": [ - "cloud", - "team", - "enterprise" - ] + "forScopes": ["cloud", "enterprise"] }, { "title": "Upcoming Releases", @@ -108,13 +98,6 @@ "title": "Introduction", "slug": "/choose-an-edition/introduction/" }, - { - "title": "Teleport Team", - "slug": "/choose-an-edition/teleport-team/", - "forScopes": [ - "team" - ] - }, { "title": "Teleport Enterprise Cloud", "slug": "/choose-an-edition/teleport-cloud/introduction/", @@ -122,6 +105,11 @@ "cloud" ], "entries": [ + { + "title": "Get Started", + "slug": "/choose-an-edition/teleport-cloud/get-started/", + "forScopes": ["cloud"] + }, { "title": "Architecture", "slug": "/choose-an-edition/teleport-cloud/architecture/", @@ -421,12 +409,7 @@ { "title": "Single Sign-On (SSO)", "slug": "/access-controls/sso/", - "forScopes": [ - "oss", - "team", - "enterprise", - "cloud" - ], + "forScopes": ["oss", "enterprise", "cloud"], "entries": [ { "title": "Active Directory (ADFS)", @@ -447,12 +430,7 @@ { "title": "GitHub", "slug": "/access-controls/sso/github-sso/", - "forScopes": [ - "oss", - "team", - "enterprise", - "cloud" - ] + "forScopes": ["oss", "enterprise", "cloud"] }, { "title": "GitLab", @@ -499,47 +477,27 @@ { "title": "Teleport as an IdP", "slug": "/access-controls/idps/", - "forScopes": [ - "enterprise", - "cloud", - "team" - ], + "forScopes": ["enterprise", "cloud"], "entries": [ { "title": "SAML Identity Provider Guide", "slug": "/access-controls/idps/saml-guide/", - "forScopes": [ - "enterprise", - "cloud", - "team" - ] + "forScopes": ["enterprise", "cloud"] }, { "title": "SAML Attribute Mapping", "slug": "/access-controls/idps/saml-attribute-mapping/", - "forScopes": [ - "enterprise", - "cloud", - "team" - ] + "forScopes": ["enterprise", "cloud"] }, { "title": "Authenticate to Grafana with Teleport SAML", "slug": "/access-controls/idps/saml-grafana/", - "forScopes": [ - "enterprise", - "cloud", - "team" - ] + "forScopes": ["enterprise", "cloud"] }, { "title": "SAML Identity Provider Reference", "slug": "/access-controls/idps/saml-reference/", - "forScopes": [ - "enterprise", - "cloud", - "team" - ] + "forScopes": ["enterprise", "cloud"] } ] }, @@ -589,8 +547,7 @@ "slug": "/access-controls/device-trust/", "forScopes": [ "enterprise", - "cloud", - "team" + "cloud" ], "entries": [ { @@ -598,8 +555,7 @@ "slug": "/access-controls/device-trust/guide/", "forScopes": [ "enterprise", - "cloud", - "team" + "cloud" ] }, { @@ -607,8 +563,7 @@ "slug": "/access-controls/device-trust/device-management/", "forScopes": [ "enterprise", - "cloud", - "team" + "cloud" ] }, { @@ -616,8 +571,7 @@ "slug": "/access-controls/device-trust/enforcing-device-trust/", "forScopes": [ "enterprise", - "cloud", - "team" + "cloud" ] }, { @@ -660,7 +614,6 @@ "title": "Access Graph", "slug": "/access-controls/access-graph/", "forScopes": [ - "team", "enterprise" ], "entries": [ @@ -2720,7 +2673,7 @@ }, { "source": "/cloud/getting-started/", - "destination": "/choose-an-edition/teleport-team/", + "destination": "/choose-an-edition/teleport-cloud/get-started/", "permanent": true }, { @@ -2985,7 +2938,7 @@ }, { "source": "/deploy-a-cluster/teleport-cloud/getting-started/", - "destination": "/choose-an-edition/teleport-team/", + "destination": "/choose-an-edition/teleport-cloud/get-started/", "permanent": true }, { @@ -3085,7 +3038,7 @@ }, { "source": "/choose-an-edition/teleport-cloud/getting-started/", - "destination": "/choose-an-edition/teleport-team/", + "destination": "/choose-an-edition/teleport-cloud/get-started/", "permanent": true }, { @@ -3492,6 +3445,11 @@ "source": "/server-access/guides/openssh/openssh/", "destination": "/server-access/openssh/openssh/", "permanent": true + }, + { + "source": "/choose-an-edition/teleport-team/", + "destination": "/choose-an-edition/teleport-cloud/get-started/", + "permanent": true } ] } diff --git a/docs/pages/access-controls/access-graph.mdx b/docs/pages/access-controls/access-graph.mdx index 97ffb15a9b227..ed6753cc920b0 100644 --- a/docs/pages/access-controls/access-graph.mdx +++ b/docs/pages/access-controls/access-graph.mdx @@ -4,8 +4,7 @@ description: A reference for Teleport Access Graph. --- - Teleport Access Graph is currently in Preview. Currently, it is only available - to Teleport Team users, and only visualizes access to resources enrolled with your Teleport clusters. + Teleport Access Graph is currently in Preview. Teleport Access Graph visualizes and helps you understand access to your @@ -17,6 +16,10 @@ questions like: - What users can access a specific resource? - What are the relationships between users, roles, and resources? +Teleport Access Graph is a feature of the [Teleport +Policy](https://goteleport.com/platform/policy/) product that is only available +to Teleport Enterprise customers. + After logging into the Teleport UI, go to the Management tab. If enabled, Access Graph options can be found under the Permission Management section. diff --git a/docs/pages/access-controls/access-graph/self-hosted-helm.mdx b/docs/pages/access-controls/access-graph/self-hosted-helm.mdx index 011725057ddda..944fbefaccc07 100644 --- a/docs/pages/access-controls/access-graph/self-hosted-helm.mdx +++ b/docs/pages/access-controls/access-graph/self-hosted-helm.mdx @@ -14,9 +14,9 @@ and enable the Access Graph feature in your Teleport cluster. The full listing of supported parameters can be found in the [`teleport-access-graph` Helm chart reference](../../reference/helm-reference/teleport-access-graph.mdx). -Teleport Access Graph is enabled by default for Teleport Team users. -You can skip the setup process and start using Access Graph right away -by signing up for a [Teleport Team trial](https://goteleport.com/signup/). +Teleport Access Graph is a feature of the [Teleport +Policy](https://goteleport.com/platform/policy/) product that is only available +to Teleport Enterprise customers. ## Prerequisites diff --git a/docs/pages/access-controls/access-graph/self-hosted.mdx b/docs/pages/access-controls/access-graph/self-hosted.mdx index 00fdac4415fe7..c076ee0b1f993 100644 --- a/docs/pages/access-controls/access-graph/self-hosted.mdx +++ b/docs/pages/access-controls/access-graph/self-hosted.mdx @@ -12,9 +12,9 @@ to collect information about resources and access. This guide will help you set up the TAG service and enable the Access Graph feature in your Teleport cluster. -Teleport Access Graph is enabled by default for Teleport Team users. -You can skip the setup process here and start using Access Graph right away -by signing up for a [Teleport Team trial](https://goteleport.com/signup/). +Teleport Access Graph is a feature of the [Teleport +Policy](https://goteleport.com/platform/policy/) product that is only available +to Teleport Enterprise customers. ## Prerequisites diff --git a/docs/pages/access-controls/idps/saml-guide.mdx b/docs/pages/access-controls/idps/saml-guide.mdx index 2ec16f7fcab5a..0e3484ee25b51 100644 --- a/docs/pages/access-controls/idps/saml-guide.mdx +++ b/docs/pages/access-controls/idps/saml-guide.mdx @@ -24,7 +24,7 @@ authenticate to external services. The minimum configuration values required to add a service provider are: 1. **Entity ID:** The SAML metadata endpoint of the service provider. -2. **ACS URL:** The endpoint where users will be redirected after SAML authentication. ACS URL +1. **ACS URL:** The endpoint where users will be redirected after SAML authentication. ACS URL is also referred to as SAML SSO URL. The following `saml_idp_service_provider` spec is a reference for adding samltest.id to Teleport: diff --git a/docs/pages/access-controls/sso/github-sso.mdx b/docs/pages/access-controls/sso/github-sso.mdx index ae7182def5ee8..b0e0658403e6f 100644 --- a/docs/pages/access-controls/sso/github-sso.mdx +++ b/docs/pages/access-controls/sso/github-sso.mdx @@ -12,9 +12,8 @@ Teleport. - A GitHub organization with at least one team. - In Teleport Community Edition and Teleport Team, this organization must not - have external SSO set up, or Teleport will refuse to create the GitHub - authentication connector. + In Teleport Community Edition, this organization must not have external SSO + set up, or Teleport will refuse to create the GitHub authentication connector. In Teleport Enterprise and Enterprise Cloud, organization can be hosted from either GitHub Cloud or GitHub Enterprise Server. diff --git a/docs/pages/access-controls/sso/okta.mdx b/docs/pages/access-controls/sso/okta.mdx index 6095f86c74094..dbe91b355f5a7 100644 --- a/docs/pages/access-controls/sso/okta.mdx +++ b/docs/pages/access-controls/sso/okta.mdx @@ -16,9 +16,9 @@ Teleport administrators to define policies like:
-In Teleport Team, Teleport Enterprise Cloud and Self-Hosted Teleport Enterprise, -Teleport can automatically configure an SSO connector for you when as part of -[enrolling the hosted Okta integration](../../). +In Teleport Enterprise Cloud and Self-Hosted Teleport Enterprise, Teleport can +automatically configure an SSO connector for you when as part of [enrolling the +hosted Okta integration](../../). You can enroll the Okta integration from the Teleport Web UI. diff --git a/docs/pages/agents/deploy-agents-terraform.mdx b/docs/pages/agents/deploy-agents-terraform.mdx index 95af299b12edc..0849aa19dbd87 100644 --- a/docs/pages/agents/deploy-agents-terraform.mdx +++ b/docs/pages/agents/deploy-agents-terraform.mdx @@ -36,7 +36,7 @@ see how an agent pool works. After you are familiar with the setup, apply the lessons from this guide to protect your infrastructure. You can get started with a demo cluster using: - A demo deployment on a [Linux server](../index.mdx) -- A [Teleport Team trial](https://goteleport.com/signup) +- A [Teleport Enterprise Cloud trial](https://goteleport.com/signup) @@ -45,9 +45,9 @@ a demo cluster using: - Cloud infrastructure that enables virtual machine instances to connect to the Teleport Proxy Service. For example: - - An AWS subnet with a public NAT gateway or NAT instance. - - Google Cloud NAT - - Azure NAT Gateway + - An AWS subnet with a public NAT gateway or NAT instance. + - Google Cloud NAT + - Azure NAT Gateway In minimum-security demo clusters, you can also configure the VM instances you deploy to have public IP addresses. diff --git a/docs/pages/ai-assist.mdx b/docs/pages/ai-assist.mdx index 4c9805f7145e4..b2f75aab8e56b 100644 --- a/docs/pages/ai-assist.mdx +++ b/docs/pages/ai-assist.mdx @@ -28,15 +28,9 @@ Before you get started with Teleport Assist, make sure you have the following: - **OpenAI Account**: You will need an active OpenAI account with GPT-4 API access as Teleport Assist relies on OpenAI services. - -If you don't have access to OpenAI GPT-4 API, you can still try out Teleport -Assist by signing up for a -[Teleport Team plan](https://goteleport.com/pricing/). - - Teleport Assist currently doesn't support Teleport clusters using the etcd backend. If your installation is using etcd, you can create a new cluster with -any other backend or sign up for the Teleport Team plan. +any other backend. ## Step 1/3. Generate an OpenAI API key diff --git a/docs/pages/choose-an-edition/introduction.mdx b/docs/pages/choose-an-edition/introduction.mdx index 6dcf85de17061..2ef8f927dd917 100644 --- a/docs/pages/choose-an-edition/introduction.mdx +++ b/docs/pages/choose-an-edition/introduction.mdx @@ -8,15 +8,6 @@ which edition is most appropriate for your use case. ## Editions -### Teleport Team - -Teleport Team makes it easier for small organizations to get started enabling -secure access to their infrastructure. It includes a subset of Teleport -Enterprise Cloud features, and teams can switch to Teleport Enterprise Cloud as -they scale up. - -[Read more about Teleport Team](./teleport-team.mdx). - ### Teleport Enterprise Cloud Our team at Teleport manages the Auth and Proxy Services, giving you a running diff --git a/docs/pages/choose-an-edition/teleport-cloud/external-audit-storage.mdx b/docs/pages/choose-an-edition/teleport-cloud/external-audit-storage.mdx index 8f23b7fcfa44e..328c39f3adec4 100644 --- a/docs/pages/choose-an-edition/teleport-cloud/external-audit-storage.mdx +++ b/docs/pages/choose-an-edition/teleport-cloud/external-audit-storage.mdx @@ -24,8 +24,7 @@ above. ## Prerequisites 1. A Teleport Enterprise Cloud account. If you do not have one, [sign - up](https://goteleport.com/signup/) for a Teleport Team account and upgrade - to Teleport Enterprise Cloud. + up](https://goteleport.com/signup/) for a free trial. 1. To store and query audit events and session recordings, you need to set up the following four components in an AWS account of your choosing. The Teleport Web UI walks you through the infrastructure you need to create, but diff --git a/docs/pages/choose-an-edition/teleport-cloud/faq.mdx b/docs/pages/choose-an-edition/teleport-cloud/faq.mdx index 325ff2b12f085..616b18b641d14 100644 --- a/docs/pages/choose-an-edition/teleport-cloud/faq.mdx +++ b/docs/pages/choose-an-edition/teleport-cloud/faq.mdx @@ -142,7 +142,7 @@ The ability to download recordings for offline viewing will be available in a fu ### Will Teleport be updated automatically? -The Teleport Auth Service and Teleport Proxy Service for Teleport Team and Teleport Enterprise Cloud +The Teleport Auth Service and Teleport Proxy Service for Teleport Enterprise Cloud are automatically kept up to date with patches and minor releases following the release schedule described in [Teleport Upcoming Releases](../../upcoming-releases.mdx). @@ -153,10 +153,10 @@ described in [Teleport Upcoming Releases](../../upcoming-releases.mdx). during your scheduled maintenance window. - Teleport agents are only updated automatically if you enroll them in automatic updates. -If you have Teleport agents connected to a Teleport Team or Teleport Enterprise -cluster that are more than one major version behind, you might experience -compatibility issues unless your agents are enrolled in automatic updates. See -the [Upgrading Overview](../../upgrading/overview.mdx) for more information. +If you have Teleport agents connected to a Teleport Enterprise Cloud cluster +that are more than one major version behind, you might experience compatibility +issues unless your agents are enrolled in automatic updates. See the [Upgrading +Overview](../../upgrading/overview.mdx) for more information. To get version information for your agents, see [How can I find version information on connected agents?](#how-can-i-find-version-information-on-connected-agents). @@ -185,9 +185,9 @@ new releases. ### When are agents automatically updated? -Teleport Team and Teleport Enterprise Cloud must be set to receive automatic updates -to use the Teleport Cloud version server for automatic agent updates. With automatic -agent updates, agents periodically check the version server for new releases and +Teleport Enterprise Cloud must be set to receive automatic updates to use the +Teleport Cloud version server for automatic agent updates. With automatic agent +updates, agents periodically check the version server for new releases and update the software when new versions are found. If you enroll in automatic agent updates, Teleport agents are automatically @@ -339,4 +339,4 @@ address traffic to any individual software instance within the cluster. ### How do I set up recovery codes for my account so I don't lose access? -We have a [short step-by-step guide](https://github.com/gravitational/teleport/discussions/12379) on setting up recovery codes. \ No newline at end of file +We have a [short step-by-step guide](https://github.com/gravitational/teleport/discussions/12379) on setting up recovery codes. diff --git a/docs/pages/choose-an-edition/teleport-team.mdx b/docs/pages/choose-an-edition/teleport-cloud/get-started.mdx similarity index 59% rename from docs/pages/choose-an-edition/teleport-team.mdx rename to docs/pages/choose-an-edition/teleport-cloud/get-started.mdx index e818f4b3fe2e8..25d70a629c7c7 100644 --- a/docs/pages/choose-an-edition/teleport-team.mdx +++ b/docs/pages/choose-an-edition/teleport-cloud/get-started.mdx @@ -1,60 +1,63 @@ --- -title: "Introduction to Teleport Team" -description: "Teleport Team makes it easy for small organizations set up secure role-based access control for their infrastructure." +title: "Get Started with Teleport Enterprise Cloud" +description: "Shows you how to set up a Teleport Enterprise Cloud account and protect your first resource with Teleport." tocDepth: 3 --- -Teleport Team helps small organizations provide secure access to their infrastructure, with -minimal configuration and cluster management. +Teleport Enterprise Cloud helps organizations provide secure access to their +infrastructure with minimal configuration and cluster management. -With Teleport Team, the Teleport Auth Service and Teleport Proxy Service are managed for you as cloud-based services. -These services provide you with immediate access to a scalable and fault tolerant certificate authority and reverse -proxy that you don't need to manage or maintain. You can focus on enrolling the resources you want to protect and -configuring secure role-based access for private and public networks across the globe. +With Teleport Enterprise Cloud, the Teleport Auth Service and Teleport Proxy +Service are managed for you as cloud-based services. These services provide you +with immediate access to a scalable and fault-tolerant certificate authority and +reverse proxy that you don't need to manage or maintain. You can focus on +enrolling the resources you want to protect and configuring secure role-based +access for private and public networks across the globe. -After you start a [free trial](https://goteleport.com/signup) of Teleport Team, -you can set up role-based access control (RBAC), enable single sign-on with GitHub -or the Teleport identity provider, and prevent unauthorized use of organization resources. - -![Teleport Team architecture diagram](../../img/team-diagram.png) +After you start a [free trial](https://goteleport.com/signup) of Teleport +Enterprise Cloud, you can set up role-based access control (RBAC), enable single +sign-on, and prevent unauthorized use of organization resources. -For a detailed comparison of Teleport's editions, including how Teleport Team -compares to Teleport Enterprise Cloud and Teleport Enterprise, see -[Choose an Edition](introduction.mdx). +For a detailed comparison of Teleport editions, including how Teleport +Enterprise Cloud compares to Teleport Enterprise, see [Choose an +Edition](introduction.mdx). -This guide explains how to register a local server with a Teleport Team account. -After you register the server, you can access it through the Teleport Web UI in a browser or using the terminal. -You can also record your sessions, so you can review them later. +This guide explains how to register a local server with a Teleport Enterprise +Cloud account. After you register the server, you can access it through the +Teleport Web UI in a browser or using the terminal. You can also record your +sessions, so you can review them later. ## Prerequisites -- A Teleport Team account. You can sign up for a free trial at the following page: +- A Teleport Enterprise Cloud account. You can sign up for a free trial at the + following page: https://goteleport.com/signup/ After you sign up, you receive an email invitation to activate your account. Use this account to authenticate your identity when you access the Teleport - Team cluster. + Enterprise Cloud cluster. - Docker installed on your workstation. - This guide illustrates how to register a server with Teleport Team using a Docker - container and the Teleport SSH Service. - Docker is only required for the local demo environment used in this guide. - You can find installation instructions for Docker on [Docker's website](https://docs.docker.com/get-docker/). - If you want to register servers in Teleport Team without using Docker, see the getting started guide for - [server access](../server-access/getting-started.mdx). + This guide illustrates how to register a server with Teleport Enterprise Cloud + using a Docker container and the Teleport SSH Service. Docker is only required + for the local demo environment used in this guide. You can find installation + instructions for Docker on [Docker's + website](https://docs.docker.com/get-docker/). If you want to register servers + in Teleport without using Docker, see the getting started guide for + [server access](../../server-access/getting-started.mdx). - The `tsh` client tool. - The `tsh` client tool is only required to access the server from a terminal. - For installation instructions, see [Installation Guide](../installation.mdx). - If you don't install the `tsh` client tool, you can access the server in - Teleport Team using the Web UI through your browser. + The `tsh` client tool is only required to access the server from a terminal. + For installation instructions, see [Installation Guide](../../installation.mdx). + If you don't install the `tsh` client tool, you can access the server in + Teleport Enterprise Cloud using the Web UI through your browser. ## Step 1/5. Spin up a server @@ -63,7 +66,7 @@ To spin up a new server using Docker: 1. Open a terminal shell on your workstation. 1. Start a Docker container on your workstation to prepare a server that you want enroll -as a resource in your Teleport Team cluster: +as a resource in your Teleport Enterprise Cloud cluster: ```code $ docker run --interactive --tty ubuntu:22.04 /bin/bash @@ -85,22 +88,21 @@ as a resource in your Teleport Team cluster: To install the Teleport SSH Service on your server: -1. Open a browser and go to the address for your Teleport Team cluster. For - example, if your Teleport Team account is `example`, open - `https://example.teleport.sh`. +1. Open a browser and go to the address for your Teleport cluster. For example, + if your Teleport account is `example`, open `https://example.teleport.sh`. -1. Sign in with the account credentials you used to activate your Teleport Team account. +1. Sign in with the account credentials you used to activate your Teleport account. The first time you sign in, you are prompted to add your first resource: - ![Add your first resource](../../img/cloud/getting-started/add-my-first-resource@2x.png) + ![Add your first resource](../../../img/cloud/getting-started/add-my-first-resource@2x.png) 1. Click **Add my first resource**, and you will see the option to enroll resources in your Teleport cluster. 1. Type *server* in the search box to filter the list of resources: - ![Select resource type](../../img/cloud/getting-started/choose-resource@2x.png) + ![Select resource type](../../../img/cloud/getting-started/choose-resource@2x.png) 1. Click *Ubuntu 14.04+* to register the server in the Docker container. @@ -108,7 +110,7 @@ To install the Teleport SSH Service on your server: for your multi-factor authentication device, then displays a script to install and configure the Teleport SSH Service. For example: - ![Configure resource](../../img/cloud/getting-started/paste-script@2x.png) + ![Configure resource](../../../img/cloud/getting-started/paste-script@2x.png) 1. The Teleport installation script uses `sudo`, which is not installed on your Docker container. Before copying the command to run the installation script, @@ -127,26 +129,26 @@ into the container shell session. Leave the script running in the shell. After Teleport is installed on the server, you'll see a message in the Web UI that your new Teleport instance was successfully detected: - ![Connected successfully](../../img/cloud/getting-started/successfully-connected@2x.png) + ![Connected successfully](../../../img/cloud/getting-started/successfully-connected@2x.png) To continue, click **Next**. 1. Confirm that you want to authenticate as the `root` user and click **Next**: - ![Choose your user](../../img/cloud/getting-started/set-up-access@2x.png) + ![Choose your user](../../../img/cloud/getting-started/set-up-access@2x.png) 1. Respond to the MFA prompt again, then click **Test Connection** to verify access to the server. - ![Start session](../../img/cloud/getting-started/test-connection@2x.png) + ![Start session](../../../img/cloud/getting-started/test-connection@2x.png) ## Step 3/5. Start a session -To start a session on the server you just added to Teleport Team: +To start a session on the server you just added to Teleport: 1. Click **Start Session** to start an interactive session. - You should see a terminal prompt in a new browser window. Your Teleport Team + You should see a terminal prompt in a new browser window. Your Teleport account routes your SSH connection through the Teleport Proxy Service, which connects to your container through a reverse tunnel. Reverse tunnels allow Teleport to manage access to resources like Kubernetes @@ -166,7 +168,7 @@ To start a session on the server you just added to Teleport Team: ## Step 4/5. Play back your session -As Teleport Team proxies SSH connections to registered servers, it records the +As Teleport proxies SSH connections to registered servers, it records the commands that users execute during their sessions so operators can play them back later to investigate issues. @@ -180,7 +182,7 @@ To play back a session in the Teleport Web UI: step listed. For example: ![Session - recordings](../../img/cloud/getting-started/session-recordings@2x.png) + recordings](../../../img/cloud/getting-started/session-recordings@2x.png) 1. Click **Play** to see a full recording of your session. @@ -190,7 +192,7 @@ To access the server using commands in a terminal: 1. Open a new terminal window. -1. Sign in to your Teleport Team cluster by running the `tsh login` command with the URL +1. Sign in to your Teleport cluster by running the `tsh login` command with the URL of your cluster and the name of your Teleport user: ```code @@ -198,7 +200,7 @@ of your cluster and the name of your Teleport user: ``` When prompted, authenticate using your password, authenticator app, or hardware key. - The command displays information about your Teleport Team cluster and account. For example: + The command displays information about your Teleport cluster and account. For example: ```code > Profile URL: https://example.teleport.sh:443 @@ -233,21 +235,18 @@ of your cluster and the name of your Teleport user: ## Next steps -This guide introduced how you can use Teleport Team to protect your -infrastructure by demonstrating how to register a server with your Teleport Team +This guide introduced how you can use Teleport Enterprise Cloud to protect your +infrastructure by demonstrating how to register a server with your Teleport cluster. -You can provide secure access to more of your infrastructure through -Teleport Team by deploying one or more Teleport **agents** and configuring -role-based access control for users. Agents proxy traffic to all of -your infrastructure resources—including servers, databases, Kubernetes -clusters, cloud provider APIs, and Windows desktops. Role-based access control -ensures that only authorized users are allowed access to those resources. +You can provide secure access to more of your infrastructure through Teleport by +deploying one or more Teleport **agents** and configuring role-based access +control for users. -To learn more information about deploying agents, see [Deploy Teleport Agents -with Terraform](../agents/deploy-agents-terraform.mdx). +Agents proxy traffic to all of your infrastructure resources—including servers, +databases, Kubernetes clusters, cloud provider APIs, and Windows desktops. +Role-based access control ensures that only authorized users are allowed access +to those resources. -You can deploy a limited number of agents and protect a limited number of resources -during the free trial. After you finish the free trial, charges for Teleport Team -are based on the number of active users, protected resources, and authorizations performed. -Check the [pricing page](https://goteleport.com/pricing/) for detailed billing information. +To learn more information about deploying agents, see [Deploy Teleport Agents +with Terraform](../../agents/deploy-agents-terraform.mdx). diff --git a/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx b/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx index fde45c015d001..a2477cb3d3110 100644 --- a/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx +++ b/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx @@ -7,10 +7,10 @@ videoBanner: 1jhKOtBinm4 Teleport Enterprise Cloud is a managed service to provide access to secure infrastructure all over the world without passwords or shared secrets. -When you [sign up for a Teleport Team account](https://goteleport.com/signup/) -(which you can upgrade to a Teleport Enterprise Cloud account), you will receive -a subdomain of `teleport.sh` that is dedicated to your tenant and points to the -Teleport Proxy Service. +When you [sign up for a Teleport Enterprise Cloud +account](https://goteleport.com/signup/), you will receive a subdomain of +`teleport.sh` that is dedicated to your tenant and points to the Teleport Proxy +Service. Our Teleport Enterprise Cloud team handles the following tasks for you: diff --git a/docs/pages/choose-an-edition/teleport-enterprise/introduction.mdx b/docs/pages/choose-an-edition/teleport-enterprise/introduction.mdx index bc41b4bada6b3..4f5c2fb1c4144 100644 --- a/docs/pages/choose-an-edition/teleport-enterprise/introduction.mdx +++ b/docs/pages/choose-an-edition/teleport-enterprise/introduction.mdx @@ -22,9 +22,8 @@ organizations with particular security needs and compliance requirements. Teleport Enterprise Cloud offers most of the functionality available in self-hosted deployments of Teleport Enterprise. If you are interested in trying Teleport for the first time, we recommend signing up for a [free -trial](https://goteleport.com/signup) of Teleport Team, which manages the -Teleport Auth Service and Proxy Service for you. You can then upgrade your -account to Teleport Enterprise Cloud. +trial](https://goteleport.com/signup) of Teleport Enterprise Cloud, which +manages the Teleport Auth Service and Proxy Service for you. Once you have determined that your organization would benefit most from Teleport Enterprise, [contact sales](https://goteleport.com/signup/enterprise/) to diff --git a/docs/pages/core-concepts.mdx b/docs/pages/core-concepts.mdx index 686ee016a66ff..72ad2aa86d9ce 100644 --- a/docs/pages/core-concepts.mdx +++ b/docs/pages/core-concepts.mdx @@ -132,15 +132,6 @@ on GitHub. You can find a detailed comparison of the features available in each Teleport edition in [Choose an edition](./choose-an-edition/introduction.mdx). -### Teleport Team - -Teleport Team makes it easier for small organizations to get started with -enabling secure access to their infrastructure. It includes a subset of Teleport -Enterprise Cloud features, and teams can switch to Teleport Enterprise Cloud -as they scale up their Teleport usage. - -[Read more about Teleport Team](choose-an-edition/teleport-team.mdx). - ### Teleport Enterprise Cloud **Teleport Enterprise Cloud** is a managed deployment of the **Teleport Auth diff --git a/docs/pages/database-access/faq.mdx b/docs/pages/database-access/faq.mdx index 7e52d941e57cb..f2479b35f7081 100644 --- a/docs/pages/database-access/faq.mdx +++ b/docs/pages/database-access/faq.mdx @@ -61,8 +61,8 @@ on a plain TCP load balancer (e.g. NLB in AWS). -In Teleport Team and Teleport Enterprise Cloud, the Proxy Service uses the -following ports for Database Service client traffic: +In Teleport Enterprise Cloud, the Proxy Service uses the following ports for +Database Service client traffic: |Configuration setting|Port| |---|---| diff --git a/docs/pages/database-access/reference/configuration.mdx b/docs/pages/database-access/reference/configuration.mdx index de8fafd156fa6..a333e43e244e0 100644 --- a/docs/pages/database-access/reference/configuration.mdx +++ b/docs/pages/database-access/reference/configuration.mdx @@ -58,12 +58,12 @@ proxy_service: ``` - + -Teleport Team and Teleport Enterprise Cloud automatically configure the Teleport -Proxy Service with the following settings that are relevant to database access. -This reference configuration uses `mytenant.teleport.sh` in place of your -Teleport Team/Enterprise Cloud tenant address. +Teleport Enterprise Cloud automatically configures the Teleport Proxy Service +with the following settings that are relevant to database access. This reference +configuration uses `example.teleport.sh` in place of your Teleport Enterprise +Cloud tenant address: ```yaml proxy_service: diff --git a/docs/pages/desktop-access/getting-started.mdx b/docs/pages/desktop-access/getting-started.mdx index e1cfafe4e239e..89352c4910a4c 100644 --- a/docs/pages/desktop-access/getting-started.mdx +++ b/docs/pages/desktop-access/getting-started.mdx @@ -56,7 +56,7 @@ $ curl -o teleport-windows-auth-setup-v(=teleport.version=)-amd64.exe https://cd ``` - + 3. Download the Teleport Windows Auth setup program: diff --git a/docs/pages/documentation-overview.mdx b/docs/pages/documentation-overview.mdx index f5a46d5a1aa32..46fe9ae0d88a1 100644 --- a/docs/pages/documentation-overview.mdx +++ b/docs/pages/documentation-overview.mdx @@ -30,8 +30,8 @@ probably need to consult at some point: - [Installation](./installation.mdx): How to install Teleport binaries on your environment. If you are just getting started with Teleport, we recommend - spinning up a [demo cluster](./index.mdx) or signing up for a [Teleport Team - trial](https://goteleport.com/signup). + spinning up a [demo cluster](./index.mdx) or signing up for a [Teleport + Enterprise Cloud trial](https://goteleport.com/signup). - [Frequently Asked Questions](./faq.mdx): If this page does not answer your question, try our AI-assisted search box on the left sidebar. - [Usage Reporting and Billing](./usage-billing.mdx): How Teleport calculates @@ -46,7 +46,6 @@ probably need to consult at some point: After trying out Teleport, you are ready to deploy a cluster to your infrastructure. Teleport has four editions: -- Teleport Team - Teleport Enterprise Cloud - Teleport Enterprise - Teleport Community Edition diff --git a/docs/pages/faq.mdx b/docs/pages/faq.mdx index 74f34b070648a..56dfd78cd04e3 100644 --- a/docs/pages/faq.mdx +++ b/docs/pages/faq.mdx @@ -78,9 +78,8 @@ time you run `tsh`. ## How is Open Source different from Enterprise? -Teleport provides four editions: +Teleport provides three editions: -- Teleport Team - Teleport Enterprise - Teleport Enterprise Cloud - Teleport Community Edition diff --git a/docs/pages/includes/cloud/call-to-action.mdx b/docs/pages/includes/cloud/call-to-action.mdx index 17b63150da8ee..a0f242dc1ef4b 100644 --- a/docs/pages/includes/cloud/call-to-action.mdx +++ b/docs/pages/includes/cloud/call-to-action.mdx @@ -2,10 +2,10 @@ type="tip" > -Teleport Team takes care of this setup for you so you can provide secure access -to your infrastructure right away. +Teleport Enterprise Cloud takes care of this setup for you so you can provide +secure access to your infrastructure right away. Get started with a [free trial](https://goteleport.com/signup?t_source=docs) of -Teleport Team. +Teleport Enterprise Cloud. diff --git a/docs/pages/includes/configure-event-handler.mdx b/docs/pages/includes/configure-event-handler.mdx index 8e08ca0ca057a..f73a8699bfedf 100644 --- a/docs/pages/includes/configure-event-handler.mdx +++ b/docs/pages/includes/configure-event-handler.mdx @@ -2,8 +2,8 @@ Run the `configure` command to generate a sample configuration. Replace -`mytenant.teleport.sh` with the DNS name of your Teleport Team or Teleport -Enterprise Cloud tenant: +`mytenant.teleport.sh` with the DNS name of your Teleport Enterprise Cloud +tenant: ```code $ teleport-event-handler configure . mytenant.teleport.sh:443 diff --git a/docs/pages/includes/database-access/create-user.mdx b/docs/pages/includes/database-access/create-user.mdx index 795f7a98b41df..4050eb4e72ac8 100644 --- a/docs/pages/includes/database-access/create-user.mdx +++ b/docs/pages/includes/database-access/create-user.mdx @@ -5,7 +5,7 @@ To modify an existing user to provide access to the Database Service, see [Datab - + Create a local Teleport user with the built-in `access` role: ```code diff --git a/docs/pages/includes/database-access/db-configure-start.mdx b/docs/pages/includes/database-access/db-configure-start.mdx index ab512b3290e41..e0df87420e930 100644 --- a/docs/pages/includes/database-access/db-configure-start.mdx +++ b/docs/pages/includes/database-access/db-configure-start.mdx @@ -25,7 +25,7 @@ $ sudo teleport db configure create \ ``` - + ```code $ sudo teleport db configure create \ diff --git a/docs/pages/includes/edition-comparison.mdx b/docs/pages/includes/edition-comparison.mdx index 507f866bb4ef0..b5bff04010dc5 100644 --- a/docs/pages/includes/edition-comparison.mdx +++ b/docs/pages/includes/edition-comparison.mdx @@ -1,79 +1,79 @@ ### Access Controls -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|[Dual Authorization](../access-controls/guides/dual-authz.mdx)|✖|✔|✔|✖| -|[Hardware Key Support](../access-controls/guides/hardware-key-support.mdx)|✖|✔|✔|✖| -|[Moderated Sessions](../access-controls/guides/moderated-sessions.mdx)|✖|✔|✔|✖| -|[Role-Based Access Control](../access-controls/guides/role-templates.mdx)|✔|✔|✔|✔| -|[Single Sign-On](../access-controls/sso.mdx)|GitHub|GitHub, Google Workspace, OIDC, SAML, Teleport|GitHub, Google Workspace, OIDC, SAML, Teleport|GitHub, Teleport| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|[Dual Authorization](../access-controls/guides/dual-authz.mdx)|✖|✔|✔| +|[Hardware Key Support](../access-controls/guides/hardware-key-support.mdx)|✖|✔|✔| +|[Moderated Sessions](../access-controls/guides/moderated-sessions.mdx)|✖|✔|✔| +|[Role-Based Access Control](../access-controls/guides/role-templates.mdx)|✔|✔|✔| +|[Single Sign-On](../access-controls/sso.mdx)|GitHub|GitHub, Google Workspace, OIDC, SAML, Teleport|GitHub, Google Workspace, OIDC, SAML, Teleport| ### Audit logging and session recording -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|[Enhanced Session Recording](../server-access/guides/bpf-session-recording.mdx)|✔|✔|✔|✔| -|[Recording Proxy Mode](../server-access/guides/recording-proxy-mode.mdx)|✔|✔|✖|✖| -|[Session Recording with Playback](../architecture/session-recording.mdx)|✔|✔|✔|✔| -|[Structured Audit Logs](../reference/audit.mdx)|✔|✔|✔|✔| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|[Enhanced Session Recording](../server-access/guides/bpf-session-recording.mdx)|✔|✔|✔| +|[Recording Proxy Mode](../server-access/guides/recording-proxy-mode.mdx)|✔|✔|✖| +|[Session Recording with Playback](../architecture/session-recording.mdx)|✔|✔|✔| +|[Structured Audit Logs](../reference/audit.mdx)|✔|✔|✔| ### Compliance -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|[FedRAMP Control](../access-controls/compliance-frameworks/fedramp.mdx)|✖|✔|✖|✖| -|FIPS-compliant binaries available for FedRAMP High|✖|✔|✖|✖| -|IP-Based Restrictions|✖|✔|✔|✖| -|PCI DSS Features|Limited|✔|✔|Limited| -|SOC 2 Features|Limited|✔|✔|Limited| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|[FedRAMP Control](../access-controls/compliance-frameworks/fedramp.mdx)|✖|✔|✖| +|FIPS-compliant binaries available for FedRAMP High|✖|✔|✖| +|IP-Based Restrictions|✖|✔|✔| +|PCI DSS Features|Limited|✔|✔| +|SOC 2 Features|Limited|✔|✔| ### Identity _Available as an add-on to Teleport Enterprise_ -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|Access Monitoring & Response|✖|✔|✔|✖| -|[Access Lists & Access Reviews](../access-controls/access-lists.mdx)|✖|✔|✔|✖| -|[Device Trust](../access-controls/device-trust/guide.mdx)|✖|✔|✔|✖| -|[Endpoint Management: Jamf](../access-controls/device-trust/jamf-integration.mdx)|✖|✔|✔|✖| -|[JIT Access Requests](../access-controls/guides/dual-authz.mdx)|Limited|✔|✔|✖| -|Session & Identity Locks|✖|✔|✔|✖| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|Access Monitoring & Response|✖|✔|✔| +|[Access Lists & Access Reviews](../access-controls/access-lists.mdx)|✖|✔|✔| +|[Device Trust](../access-controls/device-trust/guide.mdx)|✖|✔|✔| +|[Endpoint Management: Jamf](../access-controls/device-trust/jamf-integration.mdx)|✖|✔|✔| +|[JIT Access Requests](../access-controls/guides/dual-authz.mdx)|Limited|✔|✔| +|Session & Identity Locks|✖|✔|✔| ### Infrastructure access -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|Agentless Integration with [OpenSSH Servers](../server-access/openssh/openssh.mdx)|✔|✔|✔|✔| -|[Application Access](../application-access/getting-started.mdx)|✔|✔|✔|✔| -|[Database Access](../database-access/getting-started.mdx)|✔|✔|✔|✔| -|[Desktop Access](../desktop-access/introduction.mdx)|✔|✔|✔|✔| -|[Kubernetes Access](../kubernetes-access/getting-started.mdx)|✔|✔|✔|✔| -|[Machine ID](../machine-id/getting-started.mdx)|✔|✔|✔|✔| -|[Server Access](../server-access/getting-started.mdx)|✔|✔|✔|✔| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|Agentless Integration with [OpenSSH Servers](../server-access/openssh/openssh.mdx)|✔|✔|✔| +|[Application Access](../application-access/getting-started.mdx)|✔|✔|✔| +|[Database Access](../database-access/getting-started.mdx)|✔|✔|✔| +|[Desktop Access](../desktop-access/introduction.mdx)|✔|✔|✔| +|[Kubernetes Access](../kubernetes-access/getting-started.mdx)|✔|✔|✔| +|[Machine ID](../machine-id/getting-started.mdx)|✔|✔|✔| +|[Server Access](../server-access/getting-started.mdx)|✔|✔|✔| ### Licensing and usage management -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|Annual or multi-year contracts, volume discounts|✖|✔|✔|✖| -|Anonymized Usage Tracking|Opt-in|✔|✔|✔| -|License|Apache 2|Commercial|Commercial|Commercial| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|Annual or multi-year contracts, volume discounts|✖|✔|✔| +|Anonymized Usage Tracking|Opt-in|✔|✔| +|License|Apache 2|Commercial|Commercial| ### Operations -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|Auth Service and Proxy Service Management|Self-hosted|Self-hosted|Fully managed|Fully managed| -|[Backend support](../reference/backends.mdx)|Any S3-compatible storage for session records, many managed backends for custom audit log storage.|Any S3-compatible storage for session records, many managed backends for custom audit log storage|All data is stored in DynamoDB and S3 with server-side encryption.|All data is stored in DynamoDB and S3 with server-side encryption.| -|Data storage location|Can store data anywhere in the world, on most managed cloud backends|Can store data anywhere in the world, on most managed cloud backends|Data is stored in Teleport's AWS infrastructure with audit logs/sessions optionally in customer AWS accounts. Proxy Service instances are deployed across the world for low-latency access.|Data is stored in Teleport's AWS infrastructure. Proxy Service instances are deployed across the world for low-latency access.| -|[Hardware Security Module support](../choose-an-edition/teleport-enterprise/hsm.mdx) for encryption at rest|✖|✔|✖|✖| -|Proxy Service domain name|Custom|Custom|A subdomain of `teleport.sh`|A subdomain of `teleport.sh`| -|Version support|All supported releases available to install and download.|All supported releases available to install and download.|Deploys last stable release with 2-3 week lag for stability.|Deploys last stable release with 2-3 week lag for stability.| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|Auth Service and Proxy Service Management|Self-hosted|Self-hosted|Fully managed| +|[Backend support](../reference/backends.mdx)|Any S3-compatible storage for session records, many managed backends for custom audit log storage.|Any S3-compatible storage for session records, many managed backends for custom audit log storage|All data is stored in DynamoDB and S3 with server-side encryption.| +|Data storage location|Can store data anywhere in the world, on most managed cloud backends|Can store data anywhere in the world, on most managed cloud backends|Data is stored in Teleport's AWS infrastructure with audit logs/sessions optionally in customer AWS accounts. Proxy Service instances are deployed across the world for low-latency access.| +|[Hardware Security Module support](../choose-an-edition/teleport-enterprise/hsm.mdx) for encryption at rest|✖|✔|✖| +|Proxy Service domain name|Custom|Custom|A subdomain of `teleport.sh`| +|Version support|All supported releases available to install and download.|All supported releases available to install and download.|Deploys last stable release with 2-3 week lag for stability.| ### Support -||Community Edition|Enterprise|Cloud|Team| -|---|---|---|---|---| -|Support|Community|24x7 support with premium SLAs and account managers|24x7 support with premium SLAs and account managers|Community| +||Community Edition|Enterprise|Cloud| +|---|---|---|---| +|Support|Community|24x7 support with premium SLAs and account managers|24x7 support with premium SLAs and account managers| diff --git a/docs/pages/includes/edition-prereqs-tabs.mdx b/docs/pages/includes/edition-prereqs-tabs.mdx index ec30ddd9f449b..e04e14b11e3dc 100644 --- a/docs/pages/includes/edition-prereqs-tabs.mdx +++ b/docs/pages/includes/edition-prereqs-tabs.mdx @@ -22,30 +22,6 @@ Proxy: (=teleport.url=) ``` - - -- A Teleport Team account. If you don't have an account, sign -up to begin your [free trial](https://goteleport.com/signup/). - -- The Enterprise `tctl` admin tool and `tsh` client tool, version >= (=cloud.version=). - - You can download these tools from the [Cloud Downloads page](../choose-an-edition/teleport-cloud/downloads.mdx). - -To check version information, run the `tctl version` and `tsh version` commands. -For example: - -```code -$ tctl version -# Teleport Enterprise v(=cloud.version=) git:(=teleport.git=) go(=teleport.golang=) - -$ tsh version -# Teleport v(=cloud.version=) go(=teleport.golang=) -Proxy version: (=cloud.version=) -Proxy: (=teleport.url=) -``` - - - @@ -75,9 +51,8 @@ Proxy: (=teleport.url=) -- A Teleport Enterprise Cloud account. If you don't have an account, - sign up to begin a [free trial](https://goteleport.com/signup/) of Teleport Team - and upgrade to Teleport Enterprise Cloud. +- A Teleport Enterprise Cloud account. If you don't have an account, sign up to + begin a [free trial](https://goteleport.com/signup/). - The Enterprise `tctl` admin tool and `tsh` client tool version >= (=cloud.version=). diff --git a/docs/pages/includes/ent-vs-community-faq.mdx b/docs/pages/includes/ent-vs-community-faq.mdx index 05be6c16766dd..8da3cc463335e 100644 --- a/docs/pages/includes/ent-vs-community-faq.mdx +++ b/docs/pages/includes/ent-vs-community-faq.mdx @@ -1,4 +1,4 @@ -Teleport Team, Enterprise, and Enterprise Cloud customers should use the Enterprise release of the +Teleport Enterprise and Enterprise Cloud customers should use the Enterprise release of the `teleport` binary for agents. Running the Community Edition binary could result in incompatibility to these cluster editions for certain features. diff --git a/docs/pages/includes/install-linux.mdx b/docs/pages/includes/install-linux.mdx index 210442bce9757..bcecbb6a139c8 100644 --- a/docs/pages/includes/install-linux.mdx +++ b/docs/pages/includes/install-linux.mdx @@ -5,22 +5,6 @@ Select an edition, then follow the instructions for that edition to install Tele (!docs/pages/includes/install-linux-oss.mdx!) - - - (!docs/pages/includes/cloud/install-linux-cloud.mdx!) - - (!docs/pages/includes/repo-channels.mdx!) - -
- - Before installing a `teleport` binary with a version besides - v(=cloud.major_version=), read our compatibility rules to ensure that the - binary is compatible with Teleport Cloud. - - (!docs/pages/includes/compatibility.mdx!) - -
- (!docs/pages/includes/install-linux-ent-self-hosted.mdx!) diff --git a/docs/pages/includes/install-windows.mdx b/docs/pages/includes/install-windows.mdx index 38eea8bf975fb..37b12849d8239 100644 --- a/docs/pages/includes/install-windows.mdx +++ b/docs/pages/includes/install-windows.mdx @@ -8,11 +8,6 @@ To install `tsh` on Windows, run the following commands in **PowerShell** (these (!docs/pages/includes/install-windows-tsh.mdx version="(=teleport.version=)" !) - - - - (!docs/pages/includes/install-windows-tsh.mdx version="(=teleport.version=)" !) - diff --git a/docs/pages/includes/no-oss-prereqs-tabs.mdx b/docs/pages/includes/no-oss-prereqs-tabs.mdx index 6d08414ec7463..5c468601f818c 100644 --- a/docs/pages/includes/no-oss-prereqs-tabs.mdx +++ b/docs/pages/includes/no-oss-prereqs-tabs.mdx @@ -1,23 +1,4 @@ - - -- A Teleport Team account. If you do not have one, visit the [signup - page](https://goteleport.com/signup/) to begin your free trial. - -- The Enterprise `tctl` admin tool and `tsh` client tool version >= - (=cloud.version=). - - You can download these tools from the [Cloud Downloads page](../choose-an-edition/teleport-cloud/downloads.mdx). - - ```code - $ tctl version - # Teleport Enterprise v(=cloud.version=) go(=teleport.golang=) - - $ tsh version - # Teleport v(=cloud.version=) go(=teleport.golang=) - ``` - - diff --git a/docs/pages/includes/plugins/enroll.mdx b/docs/pages/includes/plugins/enroll.mdx index f9cb061d7ab52..c548344e95e6e 100644 --- a/docs/pages/includes/plugins/enroll.mdx +++ b/docs/pages/includes/plugins/enroll.mdx @@ -1,6 +1,6 @@ {{ name="this integration" }} -In Teleport Team and Teleport Enterprise Cloud, Teleport manages {{ name }} for -you, and you can enroll {{ name }} from the Teleport Web UI. +In Teleport Enterprise Cloud, Teleport manages {{ name }} for you, and you can +enroll {{ name }} from the Teleport Web UI. Visit the Teleport Web UI and click **Access Management** on the menu bar at the top of the screen. diff --git a/docs/pages/index.mdx b/docs/pages/index.mdx index 66253f76df4a2..9fb54ee0d3d93 100644 --- a/docs/pages/index.mdx +++ b/docs/pages/index.mdx @@ -23,8 +23,8 @@ Community Edition. Once you deploy the cluster, you can configure RBAC, register resources, and protect your small-scale demo environments or home lab. You can also get started right away with a production-ready Teleport cluster by -signing up for a [free trial of Teleport -Team](./choose-an-edition/teleport-team.mdx). +signing up for a [free trial of Teleport Enterprise +Cloud](https://goteleport.com/signup/). ## Set up a demo cluster @@ -49,7 +49,8 @@ We will run the following Teleport services: You will need the following to deploy a demo Teleport cluster. If your environment doesn't meet the prerequisites, you can get started with Teleport by -signing up for a [free trial of Teleport Team](https://goteleport.com/signup/). +signing up for a [free trial of Teleport Enterprise +Cloud](https://goteleport.com/signup/). If you want to get a feel for Teleport commands and capabilities without setting up any infrastructure, take a look at the browser-based [Teleport diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index 4b64521fc8401..d08317071f505 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -169,7 +169,7 @@ For testing, we always recommend that you use the latest release version of Teleport Enterprise, which is currently `(=teleport.latest_ent_docker_image=)`. - + | Image name | Includes troubleshooting tools | Image base | | - | - | - | @@ -466,7 +466,7 @@ chart. ## macOS - + You can download one of the following .pkg installers for macOS: diff --git a/docs/pages/kubernetes-access/getting-started.mdx b/docs/pages/kubernetes-access/getting-started.mdx index 821585eab1870..d3f89c31195fa 100644 --- a/docs/pages/kubernetes-access/getting-started.mdx +++ b/docs/pages/kubernetes-access/getting-started.mdx @@ -23,7 +23,7 @@ For information about other ways to enroll and discover Kubernetes clusters, see - Access to a running Teleport cluster, `tctl` admin tool, and `tsh` client tool, version >= (=teleport.version=). - For Teleport Enterprise, Teleport Team, and Teleport Enterprise Cloud, you should + For Teleport Enterprise and Teleport Enterprise Cloud, you should use the Enterprise version of `tctl`. You can verify the tools you have installed by running the following commands: diff --git a/docs/pages/management/admin/trustedclusters.mdx b/docs/pages/management/admin/trustedclusters.mdx index 9e54891d3c4ea..86a4d3d8d2a60 100644 --- a/docs/pages/management/admin/trustedclusters.mdx +++ b/docs/pages/management/admin/trustedclusters.mdx @@ -139,9 +139,9 @@ To complete the steps in this guide, verify your environment meets the following - The `tctl` admin tool and `tsh` client tool version >= (=teleport.version=). - For Teleport Enterprise, Teleport Team, and Teleport Enterprise cloud, you should have - the Enterprise version of `tctl` and `tsh` installed. - You can verify the tools you have installed by running the following commands: + For Teleport Enterprise and Teleport Enterprise cloud, you should have the + Enterprise version of `tctl` and `tsh` installed. You can verify the tools + you have installed by running the following commands: ```code $ tctl version diff --git a/docs/pages/management/admin/uninstall-teleport.mdx b/docs/pages/management/admin/uninstall-teleport.mdx index 90793d05ca67b..b098b49a61a1f 100644 --- a/docs/pages/management/admin/uninstall-teleport.mdx +++ b/docs/pages/management/admin/uninstall-teleport.mdx @@ -294,7 +294,7 @@ $ docker stop teleport - + @@ -303,7 +303,7 @@ $ docker stop teleport ```code $ sudo apt-get -y remove teleport-ent - # NOTE: Older Team/Cloud users may be running Teleport Community Edition binaries instead + # NOTE: Older Teleport Enterprise Cloud users may be running Teleport Community Edition binaries instead # $ sudo apt-get -y remove teleport ``` @@ -318,7 +318,7 @@ $ docker stop teleport ```code $ sudo dpkg -r teleport-ent - # NOTE: Older Team/Cloud users may be running Teleport Community Edition binaries instead + # NOTE: Older Teleport Enterprise Cloud users may be running Teleport Community Edition binaries instead # $ sudo dpkg -r teleport ``` @@ -332,7 +332,7 @@ $ docker stop teleport $ sudo yum -y remove teleport-ent # Optional: Use DNF on newer distributions # $ sudo dnf -y remove teleport-ent - # NOTE: Older Team/Cloud users may be running Teleport Community Edition binaries instead + # NOTE: Older Teleport Enterprise Cloud users may be running Teleport Community Edition binaries instead # $ sudo yum -y remove teleport # $ sudo dnf -y remove teleport ``` @@ -348,7 +348,7 @@ $ docker stop teleport ```code $ sudo rpm -e teleport-ent - # NOTE: Older Team/Cloud users may be running Teleport Community Edition binaries instead + # NOTE: Older Teleport Enterprise Cloud users may be running Teleport Community Edition binaries instead # $ sudo rpm -e teleport ``` diff --git a/docs/pages/management/admin/users.mdx b/docs/pages/management/admin/users.mdx index c8c1e6516be1b..cd095a2e226b8 100644 --- a/docs/pages/management/admin/users.mdx +++ b/docs/pages/management/admin/users.mdx @@ -124,7 +124,7 @@ For more information, see: - [Single Sign-On](../../access-controls/sso.mdx) - + In addition to users, you can use `tctl` to manage roles and other dynamic resources. See our [Teleport Resources Reference](../../reference/resources.mdx). diff --git a/docs/pages/management/dynamic-resources.mdx b/docs/pages/management/dynamic-resources.mdx index d74b2eef65f39..8b3f57d4ced8a 100644 --- a/docs/pages/management/dynamic-resources.mdx +++ b/docs/pages/management/dynamic-resources.mdx @@ -38,9 +38,9 @@ Every resource in Teleport has three required fields: All other fields are specific to a resource. -While Teleport Enterprise Cloud and Teleport Team do not expose the static -configuration file to operators, they do use a static configuration file for -certain settings. Read how Teleport [reconciles static and dynamic +While Teleport Enterprise Cloud does not expose the static configuration file to +operators, they do use a static configuration file for certain settings. Read +how Teleport [reconciles static and dynamic resources](#reconciling-the-configuration-file-with-dynamic-resources) to understand how to see the values of static configuration settings that also appear in dynamic resources. @@ -240,9 +240,8 @@ its configuration fields to the default values and add the Cloud-hosted Teleport deployments use configuration files, but these are not -available for operators to modify. Users of Teleport Enterprise Cloud and -Teleport Team may see configuration resources with the -`teleport.dev/origin=config-file` label. +available for operators to modify. Users of Teleport Enterprise Cloud may see +configuration resources with the `teleport.dev/origin=config-file` label. diff --git a/docs/pages/management/operations/backup-restore.mdx b/docs/pages/management/operations/backup-restore.mdx index c2d38e10b04b0..fd6b3ad71b568 100644 --- a/docs/pages/management/operations/backup-restore.mdx +++ b/docs/pages/management/operations/backup-restore.mdx @@ -47,10 +47,9 @@ Teleport audit logs, logged events have a TTL of 1 year. | Firestore | [Follow GCP's guidelines for automated backups](https://firebase.google.com/docs/database/backups) | - + -Teleport Team and Teleport Enterprise Cloud manage all Auth Service and Proxy -Service backups. +Teleport Enterprise Cloud manages all Auth Service and Proxy Service backups. While Teleport Nodes are stateless, you should ensure that you can restore their configuration files. @@ -225,10 +224,9 @@ also apply to a new cluster being bootstrapped from the state of an old cluster: dynamically will need to be re-invited. - + -In Teleport Team and Teleport Enterprise Cloud, backend data is managed for you -automatically. +In Teleport Enterprise Cloud, backend data is managed for you automatically. If you would like to migrate configuration resources to a self-hosted Teleport cluster, follow our recommended backup practice of storing configuration diff --git a/docs/pages/management/operations/tls-routing.mdx b/docs/pages/management/operations/tls-routing.mdx index 10ae986e6c811..2a3cb1afc139e 100644 --- a/docs/pages/management/operations/tls-routing.mdx +++ b/docs/pages/management/operations/tls-routing.mdx @@ -20,9 +20,10 @@ Upgrading Teleport will not enable TLS routing by default and the cluster will keep working in backwards-compatibility mode. Follow this guide to migrate your Teleport installation to TLS routing. -Teleport Team manages the Proxy Service's networking configuration for you. Get -started with a [free trial](https://goteleport.com/signup?t_source=docs) of -Teleport Team. +Teleport Enterprise Cloud manages the Proxy Service's networking configuration +for you. Get started with a [free +trial](https://goteleport.com/signup?t_source=docs) of Teleport Enterprise +Cloud. ## Prerequisites diff --git a/docs/pages/reference/audit.mdx b/docs/pages/reference/audit.mdx index 88e93e73e8e9c..ff45f06ef67a5 100644 --- a/docs/pages/reference/audit.mdx +++ b/docs/pages/reference/audit.mdx @@ -72,10 +72,10 @@ $ ls -l /var/lib/teleport/log/ ``` - + -Teleport Team and Teleport Enterprise Cloud manage the storage of audit logs for -you. You can access your audit logs via the Teleport Web UI by clicking: +Teleport Enterprise Cloud manages the storage of audit logs for you. You can +access your audit logs via the Teleport Web UI by clicking: **Activity** > **Audit Log** @@ -181,10 +181,9 @@ $ tsh play 4c146ec8-eab6-11e6-b1b3-40167e68e931 --format=json ``` - + -Teleport Team and Teleport Enterprise Cloud automatically store recorded -sessions. +Teleport Enterprise Cloud automatically stores recorded sessions. You can replay recorded sessions using the [`tsh play`](./cli/tsh.mdx#tsh-play) command or the Web UI. diff --git a/docs/pages/reference/authentication.mdx b/docs/pages/reference/authentication.mdx index d563075e3f5bb..93f3b3f3b4ae5 100644 --- a/docs/pages/reference/authentication.mdx +++ b/docs/pages/reference/authentication.mdx @@ -164,27 +164,6 @@ The user will now be unblocked from login attempts and can attempt to authentica ## Authentication connectors - - -### GitHub - -This connector implements GitHub's OAuth 2.0 authentication flow. Please refer to GitHub's documentation on [Creating an OAuth App](https://developer.github.com/apps/building-oauth-apps/creating-an-oauth-app/) -to learn how to create and register an OAuth app. - -Here is an example of this setting in a `cluster_auth_preference` resource: - -```yaml -kind: cluster_auth_preference -metadata: - name: cluster-auth-preference -spec: - type: github -version: v2 -``` - -See [GitHub OAuth 2.0](../access-controls/sso/github-sso.mdx) for details on how to configure it. - - ### GitHub diff --git a/docs/pages/upgrading/cloud-kubernetes.mdx b/docs/pages/upgrading/cloud-kubernetes.mdx index b32ec07ff5512..4b348dbbe80ba 100644 --- a/docs/pages/upgrading/cloud-kubernetes.mdx +++ b/docs/pages/upgrading/cloud-kubernetes.mdx @@ -13,10 +13,10 @@ upgrade them manually using the method you used to install Teleport. - Familiarity with the [Upgrading Compatibility Overview](./overview.mdx) guide, which describes the sequence in which to upgrade components of your cluster. -- Teleport Enterprise Cloud or Teleport Team account. You can determine the - current version of these services by running the following command, where - `mytenant` is the name of your Teleport Team or Teleport Enterprise Cloud - tenant. This requires the [`jq` CLI tool](https://jqlang.github.io/jq/): +- Teleport Enterprise Cloud. You can determine the current version of these + services by running the following command, where `mytenant` is the name of + your Teleport Enterprise Cloud tenant. This requires the + [`jq` CLI tool](https://jqlang.github.io/jq/): ```code $ curl -s https://mytenant.teleport.sh/webapi/ping | jq '.server_version' diff --git a/docs/pages/upgrading/cloud-linux.mdx b/docs/pages/upgrading/cloud-linux.mdx index 89e6b4bc859f1..2dc14991b2810 100644 --- a/docs/pages/upgrading/cloud-linux.mdx +++ b/docs/pages/upgrading/cloud-linux.mdx @@ -13,11 +13,10 @@ upgrades or upgrade them manually using the method you used to install Teleport. - Familiarity with the [Upgrading Compatibility Overview](./overview.mdx) guide, which describes the sequence in which to upgrade components in your cluster. -- A Teleport Enterprise Cloud or Teleport Team account. You can determine the - current version of the Auth Service and Proxy Service by running the following - command, where `mytenant` is the name of your Teleport Team or Teleport - Enterprise Cloud account. This requires the [`jq` CLI - tool](https://jqlang.github.io/jq/): +- A Teleport Enterprise Cloud account. You can determine the current version of + the Auth Service and Proxy Service by running the following command, where + `mytenant` is the name of your Teleport Enterprise Cloud account. This + requires the [`jq` CLI tool](https://jqlang.github.io/jq/): ```code $ curl -s https://mytenant.teleport.sh/webapi/ping | jq '.server_version' diff --git a/docs/pages/upgrading/overview.mdx b/docs/pages/upgrading/overview.mdx index a169588f3c61c..0f098a6e85690 100644 --- a/docs/pages/upgrading/overview.mdx +++ b/docs/pages/upgrading/overview.mdx @@ -14,10 +14,9 @@ Teleport cluster while preserving compatibility. (!docs/pages/includes/compatibility.mdx!) -In Teleport Team and Teleport Enterprise Cloud, we manage the Auth and Proxy -Services for you. You can determine the current version of these services by -running the following command, where `mytenant` is the name of your Teleport -Team or Teleport Enterprise Cloud tenant: +In Teleport Enterprise Cloud, we manage the Auth and Proxy Services for you. You +can determine the current version of these services by running the following +command, where `mytenant` is the name of your Teleport Enterprise Cloud tenant: ```code $ curl -s https://mytenant.teleport.sh/webapi/ping | jq '.server_version'