Skip to content

Remove more ScopedBlocks #30623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptgott merged 1 commit into from
Aug 17, 2023
Merged

Remove more ScopedBlocks #30623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions docs/pages/access-controls/access-request-plugins/ssh-approval-mattermost.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,23 @@ Requests in the Proxy or Auth Service.

## Step 2/8. Install the Teleport Mattermost plugin

<ScopedBlock scope={["enterprise", "oss"]}>
<Tabs>
<TabItem scope={["enterprise", "oss"]} label="Self-Hosted">

We recommend installing Teleport plugins on the same host as the Teleport Proxy
Service. This is an ideal location as plugins have a low memory footprint, and
will require both public internet access and Teleport Auth Service access.

</ScopedBlock>
</TabItem>

<ScopedBlock scope="cloud">
<TabItem scope="cloud" label="Teleport Enterprise Cloud">

Install the Teleport Mattermost plugin on a host that can access both your
Teleport Proxy Service and your Mattermost deployment.

</ScopedBlock>
</TabItem>

</Tabs>

(!docs/pages/includes/plugins/install-access-request.mdx name="mattermost"!)

Expand Down
4 changes: 0 additions & 4 deletions docs/pages/access-controls/access-requests/resource-requests.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@ under the hood.
The Access Request API makes it easy to dynamically approve or deny these
requests.

<ScopedBlock scope={["oss"]}>

Just-in-time Access Requests are a feature of Teleport Enterprise.
Open-source Teleport users can get a preview of how Access Requests work by
requesting a role via the Teleport CLI. Full Access Request functionality,
including Resource Access Requests and an intuitive and searchable UI are
available in Teleport Enterprise.

</ScopedBlock>

## Prerequisites

(!docs/pages/includes/commercial-prereqs-tabs.mdx!)
Expand Down
15 changes: 9 additions & 6 deletions docs/pages/access-controls/guides/hardware-key-support.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ role or to that cluster must use their hardware key for all Teleport requests.
Affected users will be prompted to connect and touch their YubiKey to sign in.
The first time users sign in with their hardware key they might be required to immediately sign in again.

<ScopedBlock scope={["oss"]}>
<Tabs>
<TabItem scope={["oss"]} label="Teleport Community Edition">

```code
$ tsh login --user=dev --proxy=proxy.example.com:3080
Expand All @@ -143,9 +144,9 @@ $ tsh login --user=dev --proxy=proxy.example.com:3080

```

</ScopedBlock>
</TabItem>

<ScopedBlock scope={["enterprise"]}>
<TabItem scope={["enterprise"]} label="Teleport Enterprise">

```code
$ tsh login --user=dev --proxy=proxy.example.com:3080
Expand All @@ -160,9 +161,9 @@ $ tsh login --user=dev --proxy=proxy.example.com:3080
# ...
```

</ScopedBlock>
</TabItem>

<ScopedBlock scope={["cloud"]}>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">

```code
$ tsh login --user=dev --proxy=proxy.example.com:3080
Expand All @@ -177,7 +178,9 @@ $ tsh login --user=dev --proxy=proxy.example.com:3080
# ...
```

</ScopedBlock>
</TabItem>

</Tabs>

Affected users with existing sessions that aren't backed by a hardware key are prompted to sign in again
on their next request. For example:
Expand Down
11 changes: 7 additions & 4 deletions docs/pages/access-controls/guides/per-session-mfa.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ Per-session MFA can be enforced cluster-wide or only for some specific roles.

### Cluster-wide

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">

To enforce MFA checks for all roles, edit your cluster authentication
configuration:
Expand Down Expand Up @@ -118,8 +119,8 @@ $ tctl create -f cap.yaml
</TabItem>
</Tabs>

</ScopedBlock>
<ScopedBlock scope="cloud">
</TabItem>
<TabItem scope="cloud" label="Teleport Enterprise Cloud">

Obtain your existing `cluster_auth_preference` resource:

Expand All @@ -146,7 +147,9 @@ Create the resource:
$ tctl create -f cap.yaml
```

</ScopedBlock>
</TabItem>

</Tabs>

### Per role

Expand Down
11 changes: 7 additions & 4 deletions docs/pages/application-access/guides/dynamic-registration.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ version: v5

To create an application resource, run:

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">

```code
# Log in to your cluster with tsh so you can use tctl from your local machine.
Expand All @@ -82,16 +83,18 @@ $ tsh login --proxy=teleport.example.com --user=myuser
$ tctl create app.yaml
```

</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">

```code
# Log in to your Teleport cluster so you can use tctl remotely.
$ tsh login --proxy=mytenant.teleport.sh --user=myuser
$ tctl create app.yaml
```

</ScopedBlock>
</TabItem>

</Tabs>

After the resource has been created, it will appear among the list of available
apps (in `tsh apps ls` or UI) as long as at least one Application Service
Expand Down
7 changes: 1 addition & 6 deletions docs/pages/choose-an-edition/teleport-enterprise/hsm.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ h1: Teleport HSM Support
This guide will show you how to set up the Teleport Auth Service to use a
hardware security module (HSM) to store and handle private keys.

<ScopedBlock scope={["oss", "cloud"]}>

This guide is intended for Teleport Enterprise users.

</ScopedBlock>

## Prerequisites

- Teleport v(=teleport.version=) Enterprise (self-hosted).
Expand Down Expand Up @@ -358,3 +352,4 @@ You are all set! Check the teleport logs for `Creating new HSM key pair` to
confirm that the feature is working. You can also check that keys were created
in your HSM using your HSM's admin tool.


34 changes: 22 additions & 12 deletions docs/pages/database-access/guides/aws-cassandra-keyspaces.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ description: How to configure Teleport database access with AWS Keyspaces (Apach

(!docs/pages/includes/database-access/db-introduction.mdx dbType="AWS Keyspaces (Apache Cassandra)" dbConfigure="AWS Keyspaces database with IAM authentication" dbName="AWS Keyspaces" !)

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">
![Teleport Database Access Redis Self-Hosted](../../../img/database-access/guides/cassandra_keyspaces_selfhosted.png)
</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">
![Teleport Database Access Redis Cloud](../../../img/database-access/guides/cassandra_keyspaces_cloud.png)
</ScopedBlock>
</TabItem>

</Tabs>

## Prerequisites

Expand All @@ -41,7 +44,8 @@ Install Teleport on the host where you will run the Teleport Database Service:

(!docs/pages/includes/install-linux.mdx!)

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">

Create a configuration for the Teleport Database Service, pointing the
`--proxy` flag to the address of your Teleport Proxy Service:
Expand All @@ -57,8 +61,8 @@ $ teleport db configure create \
--labels=env=dev
```

</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">

Create a configuration for the Teleport Database Service, pointing the
`--proxy` flag to the address of your Teleport Proxy Service:
Expand All @@ -74,7 +78,9 @@ $ teleport db configure create \
--labels=env=dev
```

</ScopedBlock>
</TabItem>

</Tabs>

(!docs/pages/includes/aws-credentials.mdx service="the Teleport Database Service"!)

Expand Down Expand Up @@ -134,7 +140,8 @@ assume the IAM roles:
Once the Database Service has joined the cluster, log in to see the available
databases:

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">

```code
$ tsh login --proxy=teleport.example.com --user=alice
Expand All @@ -144,8 +151,8 @@ databases:
# keyspaces [*] env=dev
```

</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">

```code
$ tsh login --proxy=mytenant.teleport.sh --user=alice
Expand All @@ -155,7 +162,9 @@ databases:
# keyspaces [*] env=dev
```

</ScopedBlock>
</TabItem>

</Tabs>

To connect to a particular database instance using the `KeyspacesReader` AWS IAM Keyspaces role as a database user:
```code
Expand Down Expand Up @@ -183,3 +192,4 @@ $ tsh db logout
## Next steps

(!docs/pages/includes/database-access/guides-next-steps.mdx!)

23 changes: 15 additions & 8 deletions docs/pages/database-access/guides/azure-postgres-mysql.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ Teleport `12.0`.

(!docs/pages/includes/database-access/db-introduction.mdx dbType="Azure PostgreSQL or MySQL" dbConfigure="Azure PostgreSQL or MySQL database with IAM authentication" dbName="Azure PostgreSQL or MySQL" !)

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">
![Teleport Database Access Azure PostgreSQL/MySQL Self-Hosted](../../../img/database-access/guides/azure_selfhosted.png)
</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">
![Teleport Database Access Azure PostgreSQL/MySQL Cloud](../../../img/database-access/guides/azure_cloud.png)
</ScopedBlock>
</TabItem>

</Tabs>

## Prerequisites

Expand Down Expand Up @@ -371,7 +374,8 @@ You can create multiple database users identified by the same service principal.
Log in to your Teleport cluster. Your Azure database should appear in the list of
available databases:

<ScopedBlock scope={["oss", "enterprise"]}>
<Tabs>
<TabItem scope={["oss", "enterprise"]} label="Self-Hosted">

```code
$ tsh login --proxy=teleport.example.com --user=alice
Expand All @@ -381,8 +385,8 @@ $ tsh db ls
# azure-db env=dev
```

</ScopedBlock>
<ScopedBlock scope={["cloud"]}>
</TabItem>
<TabItem scope={["cloud"]} label="Teleport Enterprise Cloud">

```code
$ tsh login --proxy=mytenant.teleport.sh --user=alice
Expand All @@ -392,7 +396,9 @@ $ tsh db ls
# azure-db env=dev
```

</ScopedBlock>
</TabItem>

</Tabs>

To retrieve credentials for a database and connect to it:

Expand Down Expand Up @@ -431,3 +437,4 @@ $ tsh db logout azure-db
## Next steps

(!docs/pages/includes/database-access/guides-next-steps.mdx!)

Loading