From 5ade18c9f1bc24c85f859fd91b5ebe1d733f2876 Mon Sep 17 00:00:00 2001 From: Paul Gottschling Date: Thu, 16 Jan 2025 13:17:35 -0500 Subject: [PATCH] Fix outdated docs URLs Backports #50923 - Web UI source - README - lib - api Do not touch docs URLs in test case names or test data where we don't expect users to navigate to the URLs. --- README.md | 17 +++---- api/client/README.md | 6 +-- api/types/authentication.go | 6 +-- lib/auth/auth_with_roles.go | 2 +- lib/auth/init.go | 2 +- lib/auth/rotate.go | 2 +- lib/client/db/dbcmd/error.go | 2 +- lib/config/configuration_test.go | 2 +- lib/config/database.go | 45 +++++++++---------- lib/config/fileconf.go | 2 +- lib/devicetrust/native/device_linux.go | 2 +- lib/integrations/azureoidc/provision_sso.go | 3 +- lib/kube/proxy/response_rewriter.go | 5 ++- lib/kube/proxy/response_rewriter_test.go | 2 +- lib/puttyhosts/puttyhosts.go | 2 +- lib/service/servicecfg/app.go | 2 +- lib/services/app.go | 2 +- lib/services/role_test.go | 2 +- lib/srv/app/connections_handler.go | 2 +- .../db/cloud/resource_checker_credentials.go | 2 +- lib/srv/db/common/errors.go | 6 +-- lib/tbot/config/config.go | 4 +- lib/tbot/service_diagnostics.go | 2 +- lib/utils/cli.go | 2 +- lib/utils/errors.go | 2 +- lib/web/apiserver_test.go | 7 +-- lib/web/app/middleware.go | 2 +- lib/web/join_tokens.go | 2 +- .../database/sqlserver/configure-ad.ps1 | 2 +- lib/web/scripts/node-join/install.sh | 2 +- .../teleport/src/Apps/AddApp/Manually.tsx | 4 +- .../src/AuthConnectors/AuthConnectors.tsx | 2 +- .../teleport/src/Bots/Add/AddBotsPicker.tsx | 20 ++++----- .../Databases/ConnectDialog/ConnectDialog.tsx | 2 +- .../__snapshots__/ConnectDialog.test.tsx.snap | 4 +- .../Kubernetes/HelmChart/HelmChart.tsx | 2 +- .../SelectResource.story.test.tsx.snap | 4 +- .../src/Discover/SelectResource/resources.tsx | 3 +- web/packages/teleport/src/Roles/Roles.tsx | 4 +- web/packages/teleport/src/Support/Support.tsx | 10 +++-- .../__snapshots__/Support.story.test.tsx.snap | 28 ++++++------ .../src/TrustedClusters/TrustedClusters.tsx | 2 +- .../templates/trusted_cluster_enterprise.yaml | 2 +- .../AgentErrorMessage/AgentErrorMessage.tsx | 2 +- .../src/components/Empty/Empty.test.tsx | 3 +- .../LabelSelector/LabelSelector.tsx | 6 +-- web/packages/teleport/src/ironrdp/src/lib.rs | 2 +- .../teleterm/src/mainProcess/mainProcess.ts | 3 +- .../DocumentGateway/OnlineDocumentGateway.tsx | 2 +- 49 files changed, 126 insertions(+), 120 deletions(-) diff --git a/README.md b/README.md index 0c5f9179477e4..acd68e877f4c6 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Here is why you might use Teleport: Teleport works with SSH, Kubernetes, databases, RDP, and web services. -* Architecture: https://goteleport.com/docs/reference/architecture/architecture -* Getting Started: https://goteleport.com/docs/getting-started/ +* Architecture: https://goteleport.com/docs/reference/architecture/ +* Getting Started: https://goteleport.com/docs/get-started/
@@ -61,7 +61,7 @@ We have implemented Teleport as a single Go binary that integrates with multiple * [Windows Hosts](https://goteleport.com/docs/desktop-access/introduction/). * [Networked servers](https://goteleport.com/docs/server-access/introduction/). -You can set up Teleport as a [Linux daemon](https://goteleport.com/docs/#set-up-a-demo-cluster) or a [Kubernetes deployment](https://goteleport.com/docs/deploy-a-cluster/helm-deployments/). +You can set up Teleport as a [Linux daemon](https://goteleport.com/docs/admin-guides/deploy-a-cluster/linux-demo) or a [Kubernetes deployment](https://goteleport.com/docs/admin-guides/deploy-a-cluster/helm-deployments/). Teleport focuses on best practices for infrastructure security: @@ -97,8 +97,8 @@ infrastructure. [Sign up for a free trial](https://goteleport.com/signup) of Teleport Team. Follow our guide to [registering your first -server](https://goteleport.com/docs/choose-an-edition/teleport-team/) with -Teleport Team +server](https://goteleport.com/docs/get-started/) +with Teleport Enterprise Cloud. ## Docker @@ -354,9 +354,10 @@ We had a choice, either start a security consulting business or build a solution ## More Information -* [Teleport Getting Started](https://goteleport.com/docs/getting-started/) -* [Teleport Architecture](https://goteleport.com/teleport/docs/architecture) -* [Reference](https://goteleport.com/docs/reference) +* [Teleport Getting Started](https://goteleport.com/docs/get-started/) +* [Teleport + Architecture](https://goteleport.com/teleport/docs/architecture/introduction) +* [Reference](https://goteleport.com/docs/reference/) * [FAQ](https://goteleport.com/docs/faq) ## Support and Contributing diff --git a/api/client/README.md b/api/client/README.md index 37d94a6e7e002..4ead62cd70632 100644 --- a/api/client/README.md +++ b/api/client/README.md @@ -2,9 +2,9 @@ This package is documented using a combination of [pkg.go.dev](https://pkg.go.de ## Reference -- [Introduction](https://goteleport.com/docs/reference/api/introduction/) -- [Getting Started](https://goteleport.com/docs/reference/api/getting-started/) -- [Architecture](https://goteleport.com/docs/reference/api/architecture/) +- [Introduction](https://goteleport.com/docs/admin-guides/api/) +- [Getting Started](https://goteleport.com/docs/admin-guides/api/getting-started/) +- [Architecture](https://goteleport.com/docs/reference/architecture/api-architecture/) - [pkg.go.dev](https://pkg.go.dev/github.com/gravitational/teleport/api/client/) - [Using the client](https://pkg.go.dev/github.com/gravitational/teleport/api/client#Client/) - [Working with credentials](https://pkg.go.dev/github.com/gravitational/teleport/api/client#Credentials/) diff --git a/api/types/authentication.go b/api/types/authentication.go index 64a8d972f4347..18c5dbfa7d1e5 100644 --- a/api/types/authentication.go +++ b/api/types/authentication.go @@ -379,7 +379,7 @@ func (c *AuthPreferenceV2) SetConnectorName(cn string) { // GetU2F gets the U2F configuration settings. func (c *AuthPreferenceV2) GetU2F() (*U2F, error) { if c.Spec.U2F == nil { - return nil, trace.NotFound("U2F is not configured in this cluster, please contact your administrator and ask them to follow https://goteleport.com/docs/access-controls/guides/u2f/") + return nil, trace.NotFound("U2F is not configured in this cluster") } return c.Spec.U2F, nil } @@ -391,7 +391,7 @@ func (c *AuthPreferenceV2) SetU2F(u2f *U2F) { func (c *AuthPreferenceV2) GetWebauthn() (*Webauthn, error) { if c.Spec.Webauthn == nil { - return nil, trace.NotFound("Webauthn is not configured in this cluster, please contact your administrator and ask them to follow https://goteleport.com/docs/access-controls/guides/webauthn/") + return nil, trace.NotFound("Webauthn is not configured in this cluster, please contact your administrator and ask them to follow https://goteleport.com/docs/admin-guides/access-controls/guides/webauthn/") } return c.Spec.Webauthn, nil } @@ -596,7 +596,7 @@ func (c *AuthPreferenceV2) CheckAndSetDefaults() error { log.Warnf(`` + `Second Factor "u2f" is deprecated and marked for removal, using "webauthn" instead. ` + `Please update your configuration to use WebAuthn. ` + - `Refer to https://goteleport.com/docs/access-controls/guides/webauthn/`) + `Refer to https://goteleport.com/docs/admin-guides/access-controls/guides/webauthn/`) c.Spec.SecondFactor = constants.SecondFactorWebauthn } diff --git a/lib/auth/auth_with_roles.go b/lib/auth/auth_with_roles.go index 531f6039cd1dc..0ebb1bdd74fba 100644 --- a/lib/auth/auth_with_roles.go +++ b/lib/auth/auth_with_roles.go @@ -5224,7 +5224,7 @@ func (a *ServerWithRoles) GenerateSnowflakeJWT(ctx context.Context, req *proto.S if err := a.canImpersonateBuiltinRole(types.RoleDatabase); err != nil { log.WithError(err).Warnf("User %v tried to generate database certificate but is not allowed to impersonate %q system role.", a.context.User.GetName(), types.RoleDatabase) - return nil, trace.AccessDenied(`access denied. The user must be able to impersonate the builtin role and user "Db" in order to generate database certificates, for more info see https://goteleport.com/docs/database-access/reference/cli/#tctl-auth-sign.`) + return nil, trace.AccessDenied(`access denied. The user must be able to impersonate the builtin role and user "Db" in order to generate database certificates, for more info see https://goteleport.com/docs/reference/agent-services/database-access-reference/cli/#tctl-auth-sign.`) } } return a.authServer.GenerateSnowflakeJWT(ctx, req) diff --git a/lib/auth/init.go b/lib/auth/init.go index b41326bb9ee37..e03eb4e2eec10 100644 --- a/lib/auth/init.go +++ b/lib/auth/init.go @@ -705,7 +705,7 @@ func initializeAuthority(ctx context.Context, asrv *Server, caID types.CertAuthI if numKeyTypes > 1 { log.Warnf("%s CA contains a combination of %s and %s keys. If you are attempting to"+ " configure HSM or KMS key storage, make sure it is configured on all auth servers in"+ - " this cluster and then perform a CA rotation: https://goteleport.com/docs/management/operations/ca-rotation/", + " this cluster and then perform a CA rotation: https://goteleport.com/docs/admin-guides/management/operations/ca-rotation/", caID.Type, strings.Join(allKeyTypes[:numKeyTypes-1], ", "), allKeyTypes[numKeyTypes-1]) } diff --git a/lib/auth/rotate.go b/lib/auth/rotate.go index eea81108cabf3..bfacea8ef136d 100644 --- a/lib/auth/rotate.go +++ b/lib/auth/rotate.go @@ -675,7 +675,7 @@ func (a *Server) syncUsableKeysAlert(ctx context.Context, usableKeysResults map[ msg += "The Auth Service will continue signing certificates with raw software keys. " } msg += "These CAs must be rotated to begin using the configured key type. " + - "See https://goteleport.com/docs/management/operations/ca-rotation/" + "See https://goteleport.com/docs/admin-guides/management/operations/ca-rotation/" alert, err := types.NewClusterAlert("ca-key-types/"+a.ServerID, msg, alertOptions...) if err != nil { diff --git a/lib/client/db/dbcmd/error.go b/lib/client/db/dbcmd/error.go index 40faf228516f8..13c394c9712c2 100644 --- a/lib/client/db/dbcmd/error.go +++ b/lib/client/db/dbcmd/error.go @@ -52,7 +52,7 @@ func ConvertCommandError(cmd *exec.Cmd, err error, peakStderr string) error { if strings.Contains(lowerCaseStderr, "access to db denied") { fmtString := "%v: '%s' exited with the above error. Use 'tsh db ls' to see your available logins, " + "or ask your Teleport administrator to grant you access." + - "\nSee https://goteleport.com/docs/database-access/troubleshooting/#access-to-db-denied for more information." + "\nSee https://goteleport.com/docs/enroll-resources/database-access/troubleshooting/#access-to-db-denied for more information." return trace.AccessDenied(fmtString, err, cmd.Path) } return trace.Wrap(err) diff --git a/lib/config/configuration_test.go b/lib/config/configuration_test.go index f66fe33109904..86fe955b68ebe 100644 --- a/lib/config/configuration_test.go +++ b/lib/config/configuration_test.go @@ -2554,7 +2554,7 @@ func TestAppsCLF(t *testing.T) { outApps: nil, requireError: func(t require.TestingT, err error, i ...interface{}) { require.True(t, trace.IsBadParameter(err)) - require.ErrorContains(t, err, "application name \"-foo\" must be a valid DNS subdomain: https://goteleport.com/docs/application-access/guides/connecting-apps/#application-name") + require.ErrorContains(t, err, "application name \"-foo\" must be a valid DNS subdomain: https://goteleport.com/docs/enroll-resources/application-access/guides/connecting-apps/#application-name") }, }, { diff --git a/lib/config/database.go b/lib/config/database.go index 6780631f0a85e..201a9b4d0ddb0 100644 --- a/lib/config/database.go +++ b/lib/config/database.go @@ -43,7 +43,7 @@ var databaseConfigTemplateFuncs = template.FuncMap{ // databaseAgentConfigurationTemplate database configuration template. var databaseAgentConfigurationTemplate = template.Must(template.New("").Funcs(databaseConfigTemplateFuncs).Parse(`# # Teleport database agent configuration file. -# Configuration reference: https://goteleport.com/docs/database-access/reference/configuration/ +# Configuration reference: https://goteleport.com/docs/reference/agent-services/database-access-reference/configuration/ # version: v3 teleport: @@ -62,7 +62,7 @@ db_service: enabled: true # Matchers for database resources created with "tctl create" command or by the discovery service. - # For more information about dynamic registration: https://goteleport.com/docs/database-access/guides/dynamic-registration/ + # For more information about dynamic registration: https://goteleport.com/docs/enroll-resources/database-access/guides/dynamic-registration/ {{- if .DynamicResourcesLabels }} resources: {{- range $index, $resourceLabel := .DynamicResourcesLabels }} @@ -97,12 +97,7 @@ db_service: aws: {{- else }} # For more information about AWS auto-discovery: - # RDS/Aurora: https://goteleport.com/docs/database-access/guides/rds/ - # RDS Proxy: https://goteleport.com/docs/database-access/guides/rdsproxy/ - # Redshift: https://goteleport.com/docs/database-access/guides/postgres-redshift/ - # Redshift Serverless: https://goteleport.com/docs/database-access/guides/postgres-redshift-serverless/ - # ElastiCache/MemoryDB: https://goteleport.com/docs/database-access/guides/redis-aws/ - # OpenSearch: https://goteleport.com/docs/database-access/guides/aws-opensearch/ + # https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ # # aws: # # Database types. Valid options are: @@ -122,7 +117,7 @@ db_service: {{- end }} {{- if .RDSDiscoveryRegions }} # RDS/Aurora databases auto-discovery. - # For more information about RDS/Aurora auto-discovery: https://goteleport.com/docs/database-access/guides/rds/ + # For more information about RDS/Aurora auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["rds"] # AWS regions to register databases from. regions: @@ -137,7 +132,7 @@ db_service: {{- end }} {{- if .RDSProxyDiscoveryRegions }} # RDS Proxies auto-discovery. - # For more information about RDS Proxy auto-discovery: https://goteleport.com/docs/database-access/guides/rdsproxy/ + # For more information about RDS Proxy auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["rdsproxy"] # AWS regions to register databases from. regions: @@ -152,7 +147,7 @@ db_service: {{- end }} {{- if .RedshiftDiscoveryRegions }} # Redshift databases auto-discovery. - # For more information about Redshift auto-discovery: https://goteleport.com/docs/database-access/guides/postgres-redshift/ + # For more information about Redshift auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["redshift"] # AWS regions to register databases from. regions: @@ -167,7 +162,7 @@ db_service: {{- end }} {{- if .RedshiftServerlessDiscoveryRegions }} # Redshift Serverless databases auto-discovery. - # For more information about Redshift Serverless auto-discovery: https://goteleport.com/docs/database-access/guides/postgres-redshift-serverless/ + # For more information about Redshift Serverless auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["redshift-serverless"] # AWS regions to register databases from. regions: @@ -182,7 +177,7 @@ db_service: {{- end }} {{- if .ElastiCacheDiscoveryRegions }} # ElastiCache databases auto-discovery. - # For more information about ElastiCache auto-discovery: https://goteleport.com/docs/database-access/guides/redis-aws/ + # For more information about ElastiCache auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["elasticache"] # AWS regions to register databases from. regions: @@ -197,7 +192,7 @@ db_service: {{- end }} {{- if .MemoryDBDiscoveryRegions }} # MemoryDB databases auto-discovery. - # For more information about MemoryDB auto-discovery: https://goteleport.com/docs/database-access/guides/redis-aws/ + # For more information about MemoryDB auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["memorydb"] # AWS regions to register databases from. regions: @@ -212,7 +207,7 @@ db_service: {{- end }} {{- if .OpenSearchDiscoveryRegions }} # OpenSearch databases auto-discovery. - # For more information about OpenSearch auto-discovery: https://goteleport.com/docs/database-access/guides/aws-opensearch/ + # For more information about OpenSearch auto-discovery: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ - types: ["opensearch"] # AWS regions to register databases from. regions: @@ -231,9 +226,9 @@ db_service: azure: {{- else }} # For more information about Azure auto-discovery: - # MySQL/PostgreSQL: https://goteleport.com/docs/database-access/guides/azure-postgres-mysql/ - # Redis: https://goteleport.com/docs/database-access/guides/azure-redis/ - # SQL Server: https://goteleport.com/docs/database-access/guides/azure-sql-server-ad/ + # MySQL/PostgreSQL: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql/ + # Redis: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-redis/ + # SQL Server: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-sql-server-ad/ # # azure: # # Database types. Valid options are: @@ -257,7 +252,7 @@ db_service: {{- end }} {{- if or .AzureMySQLDiscoveryRegions }} # Azure MySQL databases auto-discovery. - # For more information about Azure MySQL auto-discovery: https://goteleport.com/docs/database-access/guides/azure-postgres-mysql/ + # For more information about Azure MySQL auto-discovery: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql/ - types: ["mysql"] # Azure subscription IDs to match. subscriptions: @@ -282,7 +277,7 @@ db_service: {{- end }} {{- if or .AzurePostgresDiscoveryRegions }} # Azure Postgres databases auto-discovery. - # For more information about Azure Postgres auto-discovery: https://goteleport.com/docs/database-access/guides/azure-postgres-mysql/ + # For more information about Azure Postgres auto-discovery: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql/ - types: ["postgres"] # Azure subscription IDs to match. subscriptions: @@ -307,7 +302,7 @@ db_service: {{- end }} {{- if or .AzureRedisDiscoveryRegions }} # Azure Cache For Redis databases auto-discovery. - # For more information about Azure Cache for Redis auto-discovery: https://goteleport.com/docs/database-access/guides/azure-redis/ + # For more information about Azure Cache for Redis auto-discovery: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-redis/ - types: ["redis"] # Azure subscription IDs to match. subscriptions: @@ -332,7 +327,7 @@ db_service: {{- end }} {{- if or .AzureSQLServerDiscoveryRegions }} # Azure SQL server and Managed instances auto-discovery. - # For more information about SQL server and Managed instances auto-discovery: https://goteleport.com/docs/database-access/guides/azure-sql-server-ad/ + # For more information about SQL server and Managed instances auto-discovery: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-sql-server-ad/ - types: ["sqlserver"] # Azure subscription IDs to match. subscriptions: @@ -453,7 +448,7 @@ db_service: # # databases: # # RDS database static configuration. - # # RDS/Aurora databases Auto-discovery reference: https://goteleport.com/docs/database-access/guides/rds/ + # # RDS/Aurora databases Auto-discovery guide: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ # - name: rds # description: AWS RDS/Aurora instance configuration example. # # Supported protocols for RDS/Aurora: "postgres" or "mysql" @@ -469,7 +464,7 @@ db_service: # # RDS Instance ID. Only present on RDS databases. # instance_id: rds-instance-1 # # Aurora database static configuration. - # # RDS/Aurora databases Auto-discovery reference: https://goteleport.com/docs/database-access/guides/rds/ + # # RDS/Aurora databases Auto-discovery guide: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ # - name: aurora # description: AWS Aurora cluster configuration example. # # Supported protocols for RDS/Aurora: "postgres" or "mysql" @@ -485,7 +480,7 @@ db_service: # # Aurora Cluster ID. Only present on Aurora databases. # cluster_id: aurora-cluster-1 # # Redshift database static configuration. - # # For more information: https://goteleport.com/docs/database-access/guides/postgres-redshift/ + # # For more information: https://goteleport.com/docs/enroll-resources/auto-discovery/databases/aws/ # - name: redshift # description: AWS Redshift cluster configuration example. # # Supported protocols for Redshift: "postgres". diff --git a/lib/config/fileconf.go b/lib/config/fileconf.go index 5d12685720606..b0e703a61c09d 100644 --- a/lib/config/fileconf.go +++ b/lib/config/fileconf.go @@ -1149,7 +1149,7 @@ func (w *Webauthn) Parse() (*types.Webauthn, error) { log.Warnf(`` + `The "webauthn.disabled" setting is marked for removal and currently has no effect. ` + `Please update your configuration to use WebAuthn. ` + - `Refer to https://goteleport.com/docs/access-controls/guides/webauthn/`) + `Refer to https://goteleport.com/docs/admin-guides/access-controls/guides/webauthn/`) } return &types.Webauthn{ // Allow any RPID to go through, we rely on diff --git a/lib/devicetrust/native/device_linux.go b/lib/devicetrust/native/device_linux.go index 63b8363c73393..07b1d3cb2cf86 100644 --- a/lib/devicetrust/native/device_linux.go +++ b/lib/devicetrust/native/device_linux.go @@ -111,7 +111,7 @@ func rewriteTPMPermissionError(err error) error { return errors.New("" + "Failed to open the TPM device. " + "Consider assigning the user to the `tss` group or creating equivalent udev rules. " + - "See https://goteleport.com/docs/access-controls/device-trust/device-management/#troubleshooting.") + "See https://goteleport.com/docs/admin-guides/access-controls/device-trust/device-management/#troubleshooting.") } // cddFuncs is used to mock various data collection functions for testing. diff --git a/lib/integrations/azureoidc/provision_sso.go b/lib/integrations/azureoidc/provision_sso.go index 07d4366040752..4475aba000a51 100644 --- a/lib/integrations/azureoidc/provision_sso.go +++ b/lib/integrations/azureoidc/provision_sso.go @@ -31,7 +31,8 @@ func setupSSO(ctx context.Context, graphClient *msgraph.Client, appObjectID stri preferredSingleSignOnMode := "saml" spPatch.PreferredSingleSignOnMode = &preferredSingleSignOnMode // Do not require explicit assignment of the app to use SSO. - // This is per our manual set-up recommendations, see https://goteleport.com/docs/access-controls/sso/azuread/ . + // This is per our manual set-up recommendations, see + // https://goteleport.com/docs/admin-guides/access-controls/sso/azuread/ . appRoleAssignmentRequired := false spPatch.AppRoleAssignmentRequired = &appRoleAssignmentRequired diff --git a/lib/kube/proxy/response_rewriter.go b/lib/kube/proxy/response_rewriter.go index 7fccfe0eb5132..6c2e96258e5ff 100644 --- a/lib/kube/proxy/response_rewriter.go +++ b/lib/kube/proxy/response_rewriter.go @@ -50,7 +50,8 @@ import ( // // Error from server (Forbidden): "GKE Autopilot denied the request because it impersonates the "system:masters" group. // Your Teleport Roles [role1,role2] have given access to the "system:masters" group for the cluster "". -// For additional information and resolution, please visit https://goteleport.com/docs/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters +// For additional information and resolution, please visit +// https://goteleport.com/docs/enroll-resources/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters func (f *Forwarder) rewriteResponseForbidden(s *clusterSession) func(r *http.Response) error { return func(r *http.Response) error { const ( @@ -100,7 +101,7 @@ func (f *Forwarder) rewriteResponseForbidden(s *clusterSession) func(r *http.Res "Your Teleport Roles %v have given access to the \"system:masters\" group "+ "for the cluster %q.\n", collectSystemMastersTeleportRoles(s), s.kubeClusterName) + "For additional information and resolution, " + - "please visit https://goteleport.com/docs/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters\n", + "please visit https://goteleport.com/docs/enroll-resources/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters\n", } // Reset the buffer to write the new response. b.Reset() diff --git a/lib/kube/proxy/response_rewriter_test.go b/lib/kube/proxy/response_rewriter_test.go index 6fbec7639e552..6460eb27e1e28 100644 --- a/lib/kube/proxy/response_rewriter_test.go +++ b/lib/kube/proxy/response_rewriter_test.go @@ -121,7 +121,7 @@ func TestErrorRewriter(t *testing.T) { "\"system:masters\" group.\nYour Teleport Roles [user:user] have " + "given access to the \"system:masters\" group for the cluster " + "\"gke-autopilot\".\nFor additional information and resolution, " + - "please visit https://goteleport.com/docs/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters\n", + "please visit https://goteleport.com/docs/enroll-resources/kubernetes-access/troubleshooting/#unable-to-connect-to-gke-autopilot-clusters\n", Reason: metav1.StatusReasonForbidden, Code: http.StatusForbidden, }, diff --git a/lib/puttyhosts/puttyhosts.go b/lib/puttyhosts/puttyhosts.go index e442e4105152f..3dedb8d42c2f1 100644 --- a/lib/puttyhosts/puttyhosts.go +++ b/lib/puttyhosts/puttyhosts.go @@ -247,7 +247,7 @@ func FormatHostCAPublicKeysForRegistry(hostCAPublicKeys map[string][]string, hos // See https://the.earth.li/~sgtatham/putty/0.79/htmldoc/Chapter4.html#config-ssh-cert-valid-expr for details. func CheckAndSplitValidityKey(input string, caName string) ([]string, error) { var output []string - docsURL := "https://goteleport.com/docs/connect-your-client/putty/#troubleshooting" + docsURL := "https://goteleport.com/docs/connect-your-client/putty-winscp/#troubleshooting" // if the input string has no content (because the Validity key has no value yet), return the empty list if len(input) == 0 { diff --git a/lib/service/servicecfg/app.go b/lib/service/servicecfg/app.go index 6ab1740e249a5..f50757d66f988 100644 --- a/lib/service/servicecfg/app.go +++ b/lib/service/servicecfg/app.go @@ -105,7 +105,7 @@ func (a *App) CheckAndSetDefaults() error { // are invalid subdomains because for trusted clusters the name is used to // construct the domain that the application will be available at. if errs := validation.IsDNS1035Label(a.Name); len(errs) > 0 { - return trace.BadParameter("application name %q must be a valid DNS subdomain: https://goteleport.com/docs/application-access/guides/connecting-apps/#application-name", a.Name) + return trace.BadParameter("application name %q must be a valid DNS subdomain: https://goteleport.com/docs/enroll-resources/application-access/guides/connecting-apps/#application-name", a.Name) } // Parse and validate URL. if _, err := url.Parse(a.URI); err != nil { diff --git a/lib/services/app.go b/lib/services/app.go index 85123ffbab35d..e40c4eee727ff 100644 --- a/lib/services/app.go +++ b/lib/services/app.go @@ -256,7 +256,7 @@ func getAppName(serviceName, namespace, clusterName, portName, nameAnnotation st if len(validation.IsDNS1035Label(name)) > 0 { return "", trace.BadParameter( - "application name %q must be a valid DNS subdomain: https://goteleport.com/docs/application-access/guides/connecting-apps/#application-name", name) + "application name %q must be a valid DNS subdomain: https://goteleport.com/docs/enroll-resources/application-access/guides/connecting-apps/#application-name", name) } return name, nil diff --git a/lib/services/role_test.go b/lib/services/role_test.go index a571d46916319..320ac3b64d251 100644 --- a/lib/services/role_test.go +++ b/lib/services/role_test.go @@ -2407,7 +2407,7 @@ func TestCheckRuleAccess(t *testing.T) { } func TestGuessIfAccessIsPossible(t *testing.T) { - // Examples from https://goteleport.com/docs/access-controls/reference/#rbac-for-sessions. + // Examples from https://goteleport.com/docs/reference/access-controls/roles/#rbac-for-sessions. ownSessions, err := types.NewRole("own-sessions", types.RoleSpecV6{ Allow: types.RoleConditions{ Rules: []types.Rule{ diff --git a/lib/srv/app/connections_handler.go b/lib/srv/app/connections_handler.go index 1fade7931a4b5..8d0701736eab1 100644 --- a/lib/srv/app/connections_handler.go +++ b/lib/srv/app/connections_handler.go @@ -696,7 +696,7 @@ func (c *ConnectionsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Return a nicer error message for device trust errors. text = `Access to this app requires a trusted device. -See https://goteleport.com/docs/access-controls/device-trust/device-management/#troubleshooting for help. +See https://goteleport.com/docs/admin-guides/access-controls/device-trust/device-management/#troubleshooting for help. ` } else { text = http.StatusText(code) diff --git a/lib/srv/db/cloud/resource_checker_credentials.go b/lib/srv/db/cloud/resource_checker_credentials.go index e7312fb8cc7f1..da6e8aa113da5 100644 --- a/lib/srv/db/cloud/resource_checker_credentials.go +++ b/lib/srv/db/cloud/resource_checker_credentials.go @@ -153,7 +153,7 @@ func (c *credentialsChecker) warn(err error, database types.Database, msg string if c.isWildcardMatcher() { logLevel = logrus.WarnLevel } - log.Logf(logLevel, "%s You can update \"db_service.resources\" section of this agent's config file to filter out unwanted resources (see https://goteleport.com/docs/database-access/reference/configuration/ for more details). If this database is intended to be handled by this agent, please verify that valid cloud credentials are configured for the agent.", msg) + log.Logf(logLevel, "%s You can update \"db_service.resources\" section of this agent's config file to filter out unwanted resources (see https://goteleport.com/docs/reference/agent-services/database-access-reference/configuration/ for more details). If this database is intended to be handled by this agent, please verify that valid cloud credentials are configured for the agent.", msg) } func (c *credentialsChecker) isWildcardMatcher() bool { diff --git a/lib/srv/db/common/errors.go b/lib/srv/db/common/errors.go index 02c9dd8e98b4f..4fb4d9d457b5c 100644 --- a/lib/srv/db/common/errors.go +++ b/lib/srv/db/common/errors.go @@ -134,7 +134,7 @@ func ConvertConnectError(err error, sessionCtx *Session) error { return trace.ConnectionProblem( err, "Connection Failure. Database service could not validate database’s certificate: certificate expired or is not yet valid. "+ - "More info at: https://goteleport.com/docs/database-access/troubleshooting#certificate-expired-or-is-not-yet-valid", + "More info at: https://goteleport.com/docs/enroll-resources/database-access/troubleshooting#certificate-expired-or-is-not-yet-valid", ) case strings.Contains(errString, "tls: unknown certificate authority"): return trace.AccessDenied("Database cannot validate client certificate generated by database service: %v.", err) @@ -306,7 +306,7 @@ func createAzureAccessDeniedError(err error, sessionCtx *Session) error { %v Make sure that Azure Active Directory auth is configured for MySQL user %q and the Teleport database -agent's service principal. See: https://goteleport.com/docs/database-access/guides/azure-postgres-mysql/ +agent's service principal. See: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql/ `, err, sessionCtx.DatabaseUser) case defaults.ProtocolPostgres: return trace.AccessDenied(`Could not connect to database: @@ -314,7 +314,7 @@ agent's service principal. See: https://goteleport.com/docs/database-access/guid %v Make sure that Azure Active Directory auth is configured for Postgres user %q and the Teleport database -agent's service principal. See: https://goteleport.com/docs/database-access/guides/azure-postgres-mysql/ +agent's service principal. See: https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql/ `, err, sessionCtx.DatabaseUser) default: return trace.Wrap(err) diff --git a/lib/tbot/config/config.go b/lib/tbot/config/config.go index bb4ca66d35449..1a3a1b807eb88 100644 --- a/lib/tbot/config/config.go +++ b/lib/tbot/config/config.go @@ -865,7 +865,7 @@ func ReadConfig(reader io.ReadSeeker, manualMigration bool) (*BotConfig, error) case V1, "": if !manualMigration { log.WarnContext( - context.TODO(), "Deprecated config version (V1) detected. Attempting to perform an on-the-fly in-memory migration to latest version. Please persist the config migration by following the guidance at https://goteleport.com/docs/machine-id/reference/v14-upgrade-guide/") + context.TODO(), "Deprecated config version (V1) detected. Attempting to perform an on-the-fly in-memory migration to latest version. Please persist the config migration by following the guidance at https://goteleport.com/docs/reference/machine-id/v14-upgrade-guide/") } config := &configV1{} if err := decoder.Decode(config); err != nil { @@ -875,7 +875,7 @@ func ReadConfig(reader io.ReadSeeker, manualMigration bool) (*BotConfig, error) if err != nil { return nil, trace.WithUserMessage( trace.Wrap(err, "migrating v1 config"), - "Failed to migrate. See https://goteleport.com/docs/machine-id/reference/v14-upgrade-guide/", + "Failed to migrate. See https://goteleport.com/docs/reference/machine-id/v14-upgrade-guide/", ) } return latestConfig, nil diff --git a/lib/tbot/service_diagnostics.go b/lib/tbot/service_diagnostics.go index 85c4da73367f5..a66e200906c29 100644 --- a/lib/tbot/service_diagnostics.go +++ b/lib/tbot/service_diagnostics.go @@ -61,7 +61,7 @@ func (s *diagnosticsService) Run(ctx context.Context) error { } mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotFound) - msg := "404 - Not Found\n\nI'm a little tbot,\nshort and stout,\nthe page you seek,\nis not about.\n\nYou can find out more information about the diagnostics service at https://goteleport.com/docs/machine-id/reference/diagnostics-service/" + msg := "404 - Not Found\n\nI'm a little tbot,\nshort and stout,\nthe page you seek,\nis not about.\n\nYou can find out more information about the diagnostics service at https://goteleport.com/docs/reference/machine-id/diagnostics-service/" _, _ = w.Write([]byte(msg)) })) mux.Handle("/livez", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/lib/utils/cli.go b/lib/utils/cli.go index 49930aff2aff5..a251d58ce41e3 100644 --- a/lib/utils/cli.go +++ b/lib/utils/cli.go @@ -604,7 +604,7 @@ type PredicateError struct { } func (p PredicateError) Error() string { - return fmt.Sprintf("%s\nCheck syntax at https://goteleport.com/docs/setup/reference/predicate-language/#resource-filtering", p.Err.Error()) + return fmt.Sprintf("%s\nCheck syntax at https://goteleport.com/docs/reference/predicate-language/#resource-filtering", p.Err.Error()) } // FormatAlert formats and colors the alert message if possible. diff --git a/lib/utils/errors.go b/lib/utils/errors.go index a2ba2dc73a8dd..c178dc3cc71e0 100644 --- a/lib/utils/errors.go +++ b/lib/utils/errors.go @@ -159,5 +159,5 @@ Use "dig +short HOST" to help debug this issue.`, true const ( // SelfSignedCertsMsg is a helper message to point users towards helpful documentation. SelfSignedCertsMsg = "Your proxy certificate is not trusted or expired. " + - "Please update the certificate or follow this guide for self-signed certs: https://goteleport.com/docs/management/admin/self-signed-certs/" + "Please update the certificate or follow this guide for self-signed certs: https://goteleport.com/docs/admin-guides/management/admin/self-signed-certs/" ) diff --git a/lib/web/apiserver_test.go b/lib/web/apiserver_test.go index dc7aedbe97d25..ffb664759bc8f 100644 --- a/lib/web/apiserver_test.go +++ b/lib/web/apiserver_test.go @@ -2804,7 +2804,8 @@ func TestInstallerRepoChannel(t *testing.T) { wc := s.client(t) t.Run("documented variables are injected", func(t *testing.T) { - // Variables documented here: https://goteleport.com/docs/server-access/guides/ec2-discovery/#step-67-optional-customize-the-default-installer-script + // Variables documented here: + // https://goteleport.com/docs/enroll-resources/auto-discovery/servers/ec2-discovery/#step-67-optional-customize-the-default-installer-script err := s.server.Auth().SetInstaller(s.ctx, types.MustNewInstallerV1("custom", `#!/usr/bin/env bash echo {{ .PublicProxyAddr }} echo Teleport-{{ .MajorVersion }} @@ -2885,7 +2886,7 @@ echo AutomaticUpgrades: {{ .AutomaticUpgrades }} wc := s.client(t) t.Run("documented variables are injected", func(t *testing.T) { - // Variables documented here: https://goteleport.com/docs/server-access/guides/ec2-discovery/#step-67-optional-customize-the-default-installer-script + // Variables documented here: https://goteleport.com/docs/enroll-resources/auto-discovery/servers/ec2-discovery/#step-67-optional-customize-the-default-installer-script err := s.server.Auth().SetInstaller(s.ctx, types.MustNewInstallerV1("custom", `#!/usr/bin/env bash echo {{ .PublicProxyAddr }} echo Teleport-{{ .MajorVersion }} @@ -2942,7 +2943,7 @@ echo AutomaticUpgrades: {{ .AutomaticUpgrades }} wc := s.client(t) t.Run("documented variables are injected", func(t *testing.T) { - // Variables documented here: https://goteleport.com/docs/server-access/guides/ec2-discovery/#step-67-optional-customize-the-default-installer-script + // Variables documented here: https://goteleport.com/docs/enroll-resources/auto-discovery/servers/ec2-discovery/#step-67-optional-customize-the-default-installer-script err := s.server.Auth().SetInstaller(s.ctx, types.MustNewInstallerV1("custom", `#!/usr/bin/env bash echo {{ .PublicProxyAddr }} echo Teleport-{{ .MajorVersion }} diff --git a/lib/web/app/middleware.go b/lib/web/app/middleware.go index 6735ae1d198a7..8e9e4463589a2 100644 --- a/lib/web/app/middleware.go +++ b/lib/web/app/middleware.go @@ -84,7 +84,7 @@ func (h *Handler) redirectToLauncher(w http.ResponseWriter, r *http.Request, p l h.log.Error("" + "Application Service requires public_addr to be set in the Teleport Proxy Service configuration. " + "Please contact your Teleport cluster administrator or refer to " + - "https://goteleport.com/docs/application-access/guides/connecting-apps/#start-authproxy-service.") + "https://goteleport.com/docs/enroll-resources/application-access/guides/connecting-apps/.") return trace.BadParameter("public address of the proxy is not set") } addr, err := utils.ParseAddr(r.Host) diff --git a/lib/web/join_tokens.go b/lib/web/join_tokens.go index 31338c34837e3..dcbb720904fbd 100644 --- a/lib/web/join_tokens.go +++ b/lib/web/join_tokens.go @@ -459,7 +459,7 @@ func getJoinScript(ctx context.Context, settings scriptSettings, m nodeAPIGetter // we need to return an error. if settings.appInstallMode { if errs := validation.IsDNS1035Label(settings.appName); len(errs) > 0 { - return "", trace.BadParameter("appName %q must be a valid DNS subdomain: https://goteleport.com/docs/application-access/guides/connecting-apps/#application-name", settings.appName) + return "", trace.BadParameter("appName %q must be a valid DNS subdomain: https://goteleport.com/docs/enroll-resources/application-access/guides/connecting-apps/#application-name", settings.appName) } if !appURIPattern.MatchString(settings.appURI) { return "", trace.BadParameter("appURI %q contains invalid characters", settings.appURI) diff --git a/lib/web/scripts/database/sqlserver/configure-ad.ps1 b/lib/web/scripts/database/sqlserver/configure-ad.ps1 index 451061cc302e3..9708aa6699acc 100644 --- a/lib/web/scripts/database/sqlserver/configure-ad.ps1 +++ b/lib/web/scripts/database/sqlserver/configure-ad.ps1 @@ -115,7 +115,7 @@ $OUTPUT=@' Use the following teleport.yaml to start a Database Access Service. For a detailed configuration reference, see -https://goteleport.com/docs/database-access/reference/configuration/ +https://goteleport.com/docs/reference/agent-services/database-access-reference/configuration/ {0} diff --git a/lib/web/scripts/node-join/install.sh b/lib/web/scripts/node-join/install.sh index 3151fb5c89885..ee209fa396dfd 100755 --- a/lib/web/scripts/node-join/install.sh +++ b/lib/web/scripts/node-join/install.sh @@ -589,7 +589,7 @@ print_welcome_message() { fi log_only "" log_only "You can see this node connected in the Teleport web UI or 'tsh ls' with the name '${NODENAME}'" - log_only "Find more details on how to use Teleport here: https://goteleport.com/docs/user-manual/" + log_only "Find more details on how to use Teleport here: https://goteleport.com/docs/" else log_important "The Teleport service was installed, but it does not appear to have started successfully." if is_using_systemd; then diff --git a/web/packages/teleport/src/Apps/AddApp/Manually.tsx b/web/packages/teleport/src/Apps/AddApp/Manually.tsx index da48610baf801..e49075869b6d9 100644 --- a/web/packages/teleport/src/Apps/AddApp/Manually.tsx +++ b/web/packages/teleport/src/Apps/AddApp/Manually.tsx @@ -133,7 +133,9 @@ const StepsWithoutToken = ({ tshLoginCmd, host }: StepsWithoutTokenProps) => ( {`* Note: For a self-hosted Teleport version, you may need to update DNS and obtain a TLS certificate for this application. Learn more about application access `} here diff --git a/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx b/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx index 42a1663449db5..bdab62aecbbbc 100644 --- a/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx +++ b/web/packages/teleport/src/AuthConnectors/AuthConnectors.tsx @@ -101,7 +101,7 @@ export function AuthConnectors(props: State) { view our documentation diff --git a/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx b/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx index 797200ee31694..76e10ff1220c5 100644 --- a/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx +++ b/web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx @@ -65,70 +65,70 @@ const integrations: BotIntegration[] = [ }, { title: 'CircleCI', - link: 'https://goteleport.com/docs/machine-id/deployment/circleci/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/circleci/', icon: , kind: IntegrationEnrollKind.MachineIDCircleCI, guided: false, }, { title: 'GitLab CI/CD', - link: 'https://goteleport.com/docs/machine-id/deployment/gitlab/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/gitlab/', icon: , kind: IntegrationEnrollKind.MachineIDGitLab, guided: false, }, { title: 'Jenkins', - link: 'https://goteleport.com/docs/machine-id/deployment/jenkins/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/jenkins/', icon: , kind: IntegrationEnrollKind.MachineIDJenkins, guided: false, }, { title: 'Ansible', - link: 'https://goteleport.com/docs/machine-id/access-guides/ansible/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/access-guides/ansible/', icon: , kind: IntegrationEnrollKind.MachineIDAnsible, guided: false, }, { title: 'Spacelift', - link: 'https://goteleport.com/docs/machine-id/deployment/spacelift/', + link: 'https://goteleport.com/docs/admin-guides/infrastructure-as-code/terraform-provider/spacelift/', icon: , kind: IntegrationEnrollKind.MachineIDSpacelift, guided: false, }, { title: 'AWS', - link: 'https://goteleport.com/docs/machine-id/deployment/aws/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/aws/', icon: , kind: IntegrationEnrollKind.MachineIDAWS, guided: false, }, { title: 'GCP', - link: 'https://goteleport.com/docs/machine-id/deployment/gcp/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/gcp/', icon: , kind: IntegrationEnrollKind.MachineIDGCP, guided: false, }, { title: 'Azure', - link: 'https://goteleport.com/docs/machine-id/deployment/azure/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/azure/', icon: , kind: IntegrationEnrollKind.MachineIDAzure, guided: false, }, { title: 'Kubernetes', - link: 'https://goteleport.com/docs/machine-id/deployment/kubernetes/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/kubernetes/', icon: , kind: IntegrationEnrollKind.MachineIDKubernetes, guided: false, }, { title: 'Generic', - link: 'https://goteleport.com/docs/machine-id/getting-started/', + link: 'https://goteleport.com/docs/enroll-resources/machine-id/getting-started/', icon: , kind: IntegrationEnrollKind.MachineID, guided: false, diff --git a/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx b/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx index 20394973f0459..734b4ee72f7cb 100644 --- a/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx +++ b/web/packages/teleport/src/Databases/ConnectDialog/ConnectDialog.tsx @@ -124,7 +124,7 @@ export default function ConnectDialog({ {`* Note: To connect with a GUI database client, see our `} diff --git a/web/packages/teleport/src/Databases/ConnectDialog/__snapshots__/ConnectDialog.test.tsx.snap b/web/packages/teleport/src/Databases/ConnectDialog/__snapshots__/ConnectDialog.test.tsx.snap index 5bb4b44c17efa..4cef9d7dbe45a 100644 --- a/web/packages/teleport/src/Databases/ConnectDialog/__snapshots__/ConnectDialog.test.tsx.snap +++ b/web/packages/teleport/src/Databases/ConnectDialog/__snapshots__/ConnectDialog.test.tsx.snap @@ -326,7 +326,7 @@ exports[`render dialog with instructions to connect to database 1`] = ` * Note: To connect with a GUI database client, see our @@ -714,7 +714,7 @@ exports[`render dialog with instructions to connect to database with requestId 1 * Note: To connect with a GUI database client, see our diff --git a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx index d3dba75b8e1f9..b7b5ab98b00ac 100644 --- a/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx +++ b/web/packages/teleport/src/Discover/Kubernetes/HelmChart/HelmChart.tsx @@ -196,7 +196,7 @@ const Heading = () => {
For all the available values of the helm chart see the{' '} the documentation diff --git a/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap b/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap index 92787f73f0462..bd59a54985744 100644 --- a/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap +++ b/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap @@ -2118,7 +2118,7 @@ exports[`render with all access 1`] = `
the cluster management (RBAC) {' '} @@ -165,7 +165,7 @@ export function Roles(props: State) { {(resources.status === 'creating' || resources.status === 'editing') && ( { return { getStarted: withUTM(`https://goteleport.com/docs/get-started/`), tshGuide: withUTM(`https://goteleport.com/docs/connect-your-client/tsh/`), - adminGuide: withUTM(`https://goteleport.com/docs/management/admin/`), + adminGuide: withUTM( + `https://goteleport.com/docs/admin-guides/management/admin/` + ), faq: withUTM(`https://goteleport.com/docs/faq`), troubleshooting: withUTM( - `https://goteleport.com/docs/management/admin/troubleshooting/` + `https://goteleport.com/docs/admin-guides/management/admin/troubleshooting/` ), // there isn't a version-specific changelog page @@ -199,8 +201,8 @@ const DownloadLink = ({ if (isEnterprise) { return ( ); } diff --git a/web/packages/teleport/src/Support/__snapshots__/Support.story.test.tsx.snap b/web/packages/teleport/src/Support/__snapshots__/Support.story.test.tsx.snap index 9c0f1d7471309..32cb6b8fd1de1 100644 --- a/web/packages/teleport/src/Support/__snapshots__/Support.story.test.tsx.snap +++ b/web/packages/teleport/src/Support/__snapshots__/Support.story.test.tsx.snap @@ -261,7 +261,7 @@ exports[`support Cloud 1`] = ` @@ -312,7 +312,7 @@ exports[`support Cloud 1`] = `
@@ -703,7 +703,7 @@ exports[`support Enterprise 1`] = ` @@ -711,11 +711,11 @@ exports[`support Enterprise 1`] = ` - Download Page + Self-Hosting Teleport @@ -1221,7 +1221,7 @@ exports[`support Enterprise with CTA 1`] = ` @@ -1229,11 +1229,11 @@ exports[`support Enterprise with CTA 1`] = ` - Download Page + Self-Hosting Teleport @@ -1656,7 +1656,7 @@ exports[`support OSS 1`] = ` @@ -1708,7 +1708,7 @@ exports[`support OSS 1`] = ` @@ -2174,7 +2174,7 @@ exports[`support OSSWithCTA 1`] = ` @@ -2226,7 +2226,7 @@ exports[`support OSSWithCTA 1`] = ` diff --git a/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx b/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx index eb22ccd6aa2b0..0ea7370748095 100644 --- a/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx +++ b/web/packages/teleport/src/TrustedClusters/TrustedClusters.tsx @@ -138,7 +138,7 @@ const Info = props => ( Please{' '} view our documentation diff --git a/web/packages/teleport/src/TrustedClusters/templates/trusted_cluster_enterprise.yaml b/web/packages/teleport/src/TrustedClusters/templates/trusted_cluster_enterprise.yaml index 71bd422999111..d66586ec86167 100644 --- a/web/packages/teleport/src/TrustedClusters/templates/trusted_cluster_enterprise.yaml +++ b/web/packages/teleport/src/TrustedClusters/templates/trusted_cluster_enterprise.yaml @@ -13,7 +13,7 @@ spec: # this is the only field that can be changed later. enabled: true # the token expected by the "root" cluster: - # https://goteleport.com/docs/management/admin/trustedclusters/#step-36-establish-trust-between-clusters + # https://goteleport.com/docs/admin-guides/management/admin/trustedclusters/#step-36-establish-trust-between-clusters token: secret-token-from-root-cluster # the address in 'host:port' form of the reverse tunnel listening port on the # "root" proxy server: diff --git a/web/packages/teleport/src/components/AgentErrorMessage/AgentErrorMessage.tsx b/web/packages/teleport/src/components/AgentErrorMessage/AgentErrorMessage.tsx index 66fadddf24cd6..bc5e03332e6bc 100644 --- a/web/packages/teleport/src/components/AgentErrorMessage/AgentErrorMessage.tsx +++ b/web/packages/teleport/src/components/AgentErrorMessage/AgentErrorMessage.tsx @@ -21,7 +21,7 @@ import { Link } from 'design'; import { Danger } from 'design/Alert'; const PREDICATE_DOC = - 'https://goteleport.com/docs/setup/reference/predicate-language/#resource-filtering'; + 'https://goteleport.com/docs/reference/predicate-language/#resource-filtering'; export default function AgentErrorMessage({ message = '' }) { const showDocLink = message.includes('predicate expression'); diff --git a/web/packages/teleport/src/components/Empty/Empty.test.tsx b/web/packages/teleport/src/components/Empty/Empty.test.tsx index a727e1dddf9cf..20c9972ee112d 100644 --- a/web/packages/teleport/src/components/Empty/Empty.test.tsx +++ b/web/packages/teleport/src/components/Empty/Empty.test.tsx @@ -55,7 +55,8 @@ const props: Props = { title: 'Add your first Linux server to Teleport', byline: 'Teleport Server Access consolidates SSH access across all environments.', - docsURL: 'https://goteleport.com/docs/server-access/getting-started/', + docsURL: + 'https://goteleport.com/docs/enroll-resources/server-access/getting-started/', resourceType: SearchResource.SERVER, readOnly: { title: 'No Servers Found', diff --git a/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx b/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx index 304b2b79e6021..aa1498dac7c35 100644 --- a/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx +++ b/web/packages/teleport/src/components/LabelSelector/LabelSelector.tsx @@ -109,14 +109,14 @@ function LabelSelector({ onChange }: LabelSelectorProps) { “env: prod”. For more information, check out our documentation on{' '} RBAC {' '} and{' '} @@ -128,7 +128,7 @@ function LabelSelector({ onChange }: LabelSelectorProps) { View Documentation diff --git a/web/packages/teleport/src/ironrdp/src/lib.rs b/web/packages/teleport/src/ironrdp/src/lib.rs index 233732d7ccb56..437d9ab684a4e 100644 --- a/web/packages/teleport/src/ironrdp/src/lib.rs +++ b/web/packages/teleport/src/ironrdp/src/lib.rs @@ -312,7 +312,7 @@ impl FastPathProcessor { Bitmap => Err(JsValue::from_str(concat!( "Teleport requires the RemoteFX codec for Windows desktop sessions, ", "but it is not currently enabled. For detailed instructions, see:\n", - "https://goteleport.com/docs/ver/15.x/desktop-access/active-directory-manual/#enable-remotefx" + "https://goteleport.com/docs/enroll-resources/desktop-access/active-directory/#enable-remotefx" ))), _ => Ok(()), } diff --git a/web/packages/teleterm/src/mainProcess/mainProcess.ts b/web/packages/teleterm/src/mainProcess/mainProcess.ts index e0e8d08f3fdd1..b1ffb8b07503a 100644 --- a/web/packages/teleterm/src/mainProcess/mainProcess.ts +++ b/web/packages/teleterm/src/mainProcess/mainProcess.ts @@ -635,7 +635,8 @@ export default class MainProcess { const TSHD_LOGGER_NAME = 'tshd'; const SHARED_PROCESS_LOGGER_NAME = 'shared'; -const DOCS_URL = 'https://goteleport.com/docs/use-teleport/teleport-connect/'; +const DOCS_URL = + 'https://goteleport.com/docs/connect-your-client/teleport-connect/'; function openDocsUrl() { shell.openExternal(DOCS_URL); diff --git a/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx b/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx index 3e4ebb85a2b88..c3cf16d952a2e 100644 --- a/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx +++ b/web/packages/teleterm/src/ui/DocumentGateway/OnlineDocumentGateway.tsx @@ -131,7 +131,7 @@ export function OnlineDocumentGateway(props: OnlineDocumentGatewayProps) { The connection is made through an authenticated proxy so no extra credentials are necessary. See{' '} the documentation