From a18811efb9573d5b2442e2073711eaec04a33340 Mon Sep 17 00:00:00 2001 From: Jakub Nyckowski Date: Thu, 20 Jun 2024 15:52:53 -0400 Subject: [PATCH 1/2] Add Teleport Assist config option removal. --- CHANGELOG.md | 5 ++++- .../includes/config-reference/auth-service.yaml | 13 ------------- .../includes/config-reference/proxy-service.yaml | 7 ------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c85d96808f91..9273c6ba740e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,10 @@ for setup instructions. #### Teleport Assist has been removed -Teleport Assist chat has been removed from Teleport 16. +Teleport Assist chat has been removed from Teleport 16. `auth_service.assist` and `proxy_service.assist` +options have been removed from the configuration. Teleport will not start if these options are present. + +During the migration from v15 to v16, the mentioned above options should be removed from the configuration. #### DynamoDB permission requirements have changed diff --git a/docs/pages/includes/config-reference/auth-service.yaml b/docs/pages/includes/config-reference/auth-service.yaml index d18fbdf1cf7b8..5463de6b34486 100644 --- a/docs/pages/includes/config-reference/auth-service.yaml +++ b/docs/pages/includes/config-reference/auth-service.yaml @@ -412,19 +412,6 @@ auth_service: # characters in their hostnames. case_insensitive_routing: false - # Configuration for the Teleport Assist functionality - assist: - openai: - # An absolute path to the file containing the API token for OpenAI. - # This is required for Assist functionality. - api_token_path: /etc/teleport/openai_key - - # When executing commands on servers through Teleport Assist, - # this is the maximum number of servers that Assist will connect to in parallel. - # This only applies in the context of a single command execution - - # if multiple users are using Assist concurrently, more connections may be made. - command_execution_workers: 30 - # AccessMonitoring is a set of options related to the Access Monitoring feature. access_monitoring: # Turn on Access Monitoring. Default is 'no'. diff --git a/docs/pages/includes/config-reference/proxy-service.yaml b/docs/pages/includes/config-reference/proxy-service.yaml index d2dec48df8462..6439ed28df221 100644 --- a/docs/pages/includes/config-reference/proxy-service.yaml +++ b/docs/pages/includes/config-reference/proxy-service.yaml @@ -169,13 +169,6 @@ proxy_service: # one IPs will be rejected. trust_x_forwarded_for: false - # Configuration for the Teleport Assist functionality - assist: - openai: - # An absolute path to the file containing the API token for OpenAI. - # This is required for Assist functionality. - api_token_path: /etc/teleport/openai_key - # Configuration for the built-in version server for agent automatic updates. # If you leave this configuration unset, a default channel is created and # serves the Teleport version run by the Proxy Service. From f0f892fcd7dbee8623ad913bc2edf1a782e03bfa Mon Sep 17 00:00:00 2001 From: Jakub Nyckowski Date: Thu, 20 Jun 2024 16:27:44 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md Co-authored-by: Paul Gottschling --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9273c6ba740e7..575770837f3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ for setup instructions. Teleport Assist chat has been removed from Teleport 16. `auth_service.assist` and `proxy_service.assist` options have been removed from the configuration. Teleport will not start if these options are present. -During the migration from v15 to v16, the mentioned above options should be removed from the configuration. +During the migration from v15 to v16, the options mentioned above should be removed from the configuration. #### DynamoDB permission requirements have changed