diff --git a/docs/pages/admin-guides/teleport-policy/integrations/aws-sync.mdx b/docs/pages/admin-guides/teleport-policy/integrations/aws-sync.mdx
index 2aae7cd963fb5..5341c70af34b3 100644
--- a/docs/pages/admin-guides/teleport-policy/integrations/aws-sync.mdx
+++ b/docs/pages/admin-guides/teleport-policy/integrations/aws-sync.mdx
@@ -88,7 +88,6 @@ that are set up with the `discovery_group` matching
discovery_service:
enabled: true
discovery_group:
-
```
Notice that if you already operate a Discovery Service within your cluster,
diff --git a/docs/pages/enroll-resources/auto-discovery/databases/aws.mdx b/docs/pages/enroll-resources/auto-discovery/databases/aws.mdx
index 6f90598a48838..0d1c98a6973c6 100644
--- a/docs/pages/enroll-resources/auto-discovery/databases/aws.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/databases/aws.mdx
@@ -71,14 +71,6 @@ ssh_service:
enabled: false
discovery_service:
enabled: true
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: ""
```
diff --git a/docs/pages/enroll-resources/auto-discovery/databases/databases.mdx b/docs/pages/enroll-resources/auto-discovery/databases/databases.mdx
index fe893fa1a9787..2f153b4676086 100644
--- a/docs/pages/enroll-resources/auto-discovery/databases/databases.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/databases/databases.mdx
@@ -75,14 +75,6 @@ Here's an example database discovery configuration for the Discovery Service:
```yaml
discovery_service:
enabled: true
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "disc-group"
# poll_interval is the cadence at which the discovery server will run each of its
# discovery cycles. The default is 5m.
diff --git a/docs/pages/enroll-resources/auto-discovery/kubernetes/aws.mdx b/docs/pages/enroll-resources/auto-discovery/kubernetes/aws.mdx
index 8641fe2124a8c..1d16e399667ee 100644
--- a/docs/pages/enroll-resources/auto-discovery/kubernetes/aws.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/kubernetes/aws.mdx
@@ -306,14 +306,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "aws-prod"
aws:
- types: ["eks"]
diff --git a/docs/pages/enroll-resources/auto-discovery/kubernetes/azure.mdx b/docs/pages/enroll-resources/auto-discovery/kubernetes/azure.mdx
index 806aabfcc52ed..97028738259c0 100644
--- a/docs/pages/enroll-resources/auto-discovery/kubernetes/azure.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/kubernetes/azure.mdx
@@ -243,14 +243,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "aks-prod"
azure:
- types: ["aks"]
diff --git a/docs/pages/enroll-resources/auto-discovery/kubernetes/google-cloud.mdx b/docs/pages/enroll-resources/auto-discovery/kubernetes/google-cloud.mdx
index a7fc0bf478c23..43a9eaa3d8161 100644
--- a/docs/pages/enroll-resources/auto-discovery/kubernetes/google-cloud.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/kubernetes/google-cloud.mdx
@@ -338,14 +338,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "gke-myproject"
gcp:
- types: ["gke"]
@@ -404,14 +396,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "gke-myproject"
gcp:
- types: ["gke"]
@@ -450,14 +434,6 @@ clusters in project `myproj-prod` running in `us-east2`, but *not* clusters in
```yaml
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "gke-myproject"
gcp:
- types: ["gke"]
diff --git a/docs/pages/enroll-resources/auto-discovery/kubernetes/kubernetes.mdx b/docs/pages/enroll-resources/auto-discovery/kubernetes/kubernetes.mdx
index 8c5d0b26c8f76..f1d43d48870c2 100644
--- a/docs/pages/enroll-resources/auto-discovery/kubernetes/kubernetes.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/kubernetes/kubernetes.mdx
@@ -62,14 +62,6 @@ and their default values.
# This section configures the Discovery Service
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "prod"
aws:
# AWS resource types. Valid options are:
diff --git a/docs/pages/enroll-resources/auto-discovery/servers/azure-discovery.mdx b/docs/pages/enroll-resources/auto-discovery/servers/azure-discovery.mdx
index e54c65c5e9810..e87d3ecc104a5 100644
--- a/docs/pages/enroll-resources/auto-discovery/servers/azure-discovery.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/servers/azure-discovery.mdx
@@ -235,6 +235,8 @@ the Discovery Service.
In order to enable Azure instance discovery the `discovery_service.azure` section
of `teleport.yaml` must include at least one entry:
+(!docs/pages/includes/discovery/discovery-group.mdx!)
+
```yaml
version: v3
teleport:
@@ -250,14 +252,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "azure-prod"
azure:
- types: ["vm"]
diff --git a/docs/pages/enroll-resources/auto-discovery/servers/ec2-discovery.mdx b/docs/pages/enroll-resources/auto-discovery/servers/ec2-discovery.mdx
index 30600111d197c..e3fa7e2f86d3c 100644
--- a/docs/pages/enroll-resources/auto-discovery/servers/ec2-discovery.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/servers/ec2-discovery.mdx
@@ -118,6 +118,8 @@ run the Discovery Service.
In order to enable EC2 instance discovery the `discovery_service.aws` section
of `teleport.yaml` must include at least one entry:
+(!docs/pages/includes/discovery/discovery-group.mdx!)
+
```yaml
version: v3
teleport:
@@ -133,14 +135,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "aws-prod"
aws:
- types: ["ec2"]
diff --git a/docs/pages/enroll-resources/auto-discovery/servers/gcp-discovery.mdx b/docs/pages/enroll-resources/auto-discovery/servers/gcp-discovery.mdx
index 73004a9f18881..bdd8d639c0ac7 100644
--- a/docs/pages/enroll-resources/auto-discovery/servers/gcp-discovery.mdx
+++ b/docs/pages/enroll-resources/auto-discovery/servers/gcp-discovery.mdx
@@ -231,6 +231,8 @@ the Discovery Service.
In order to enable GCP instance discovery the `discovery_service.gcp` section
of `teleport.yaml` must include at least one entry:
+(!docs/pages/includes/discovery/discovery-group.mdx!)
+
```yaml
version: v3
teleport:
@@ -246,14 +248,6 @@ ssh_service:
enabled: off
discovery_service:
enabled: "yes"
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "gcp-prod"
gcp:
- types: ["gce"]
diff --git a/docs/pages/includes/database-access/aws-troubleshooting-max-policy-size.mdx b/docs/pages/includes/database-access/aws-troubleshooting-max-policy-size.mdx
index 11b3f1e7f005c..89b650b1a2bf2 100644
--- a/docs/pages/includes/database-access/aws-troubleshooting-max-policy-size.mdx
+++ b/docs/pages/includes/database-access/aws-troubleshooting-max-policy-size.mdx
@@ -23,16 +23,11 @@ You can reduce the policy size by separating them into multiple IAM roles. Use
You can specify `assume_role_arn` in the AWS matchers of Discovery Service's
configuration:
+
+ (!docs/pages/includes/discovery/discovery-group.mdx!)
+
```yaml
discovery_service:
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: "prod"
enabled: "yes"
aws:
diff --git a/docs/pages/reference/agent-services/kubernetes-application-discovery.mdx b/docs/pages/reference/agent-services/kubernetes-application-discovery.mdx
index 63fbb8efdc439..426249a320ac0 100644
--- a/docs/pages/reference/agent-services/kubernetes-application-discovery.mdx
+++ b/docs/pages/reference/agent-services/kubernetes-application-discovery.mdx
@@ -32,18 +32,12 @@ Discovery Service, then restart the agents running these services.
Configuration for the Discovery Service is controlled by the `kubernetes` field,
example:
+(!docs/pages/includes/discovery/discovery-group.mdx!)
+
```yaml
# This section configures the Discovery Service
discovery_service:
enabled: yes
- # discovery_group is used to group discovered resources into different
- # sets. This is required when you have multiple Teleport Discovery services
- # running. It prevents discovered services from colliding in Teleport when
- # managing discovered resources.
- # If two Discovery Services match the same resources, they must be in the
- # same discovery group.
- # If two Discovery Services match different resources, they must be in
- # different discovery groups.
discovery_group: main-cluster
kubernetes:
- types: ["app"]