Docs: add DiscoveryConfig as an alternative method for configuring server discovery#62746
Merged
marcoandredinis merged 4 commits intomasterfrom Jan 16, 2026
Merged
Conversation
marcoandredinis
added
the
no-changelog
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
cb603c7 to
9d0f657
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
Contributor
|
Amplify deployment status
|
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
9d0f657 to
b718185
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
b718185 to
2940095
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
2940095 to
796f306
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
796f306 to
cd086f6
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
cd086f6 to
2545174
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
changed the title
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
2545174 to
e0af776
Compare
marcoandredinis
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
e0af776 to
3c97de8
Compare
marcoandredinis
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
3c97de8 to
1369632
Compare
marcoandredinis
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
1369632 to
fdbdd2e
Compare
marcoandredinis
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
fdbdd2e to
cdba80a
Compare
marcoandredinis
had a problem deploying
to
docs-amplify
GitHub Actions
Failure
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
cdba80a to
15ecc4a
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
cd0200b to
e1693a5
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
Collaborator
|
@marcoandredinis Ah, ok, I didn't know the IaC reference already includes it. It works but IMO the way it's structured right now makes it difficult to understand how the entire resource looks like. Can we include something at the beginning on it to show a couple of examples of a full resource spec like some other reference pages do (e.g. Role, User, etc.)? |
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
e1693a5 to
228b5c1
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
228b5c1 to
7074b53
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
Contributor
Author
|
@ptgott Can you please take another look? I added an optional example yaml to the Teleport Resource Reference generator |
Contributor
Author
|
@r0mant Can you please take another look? |
ptgott
approved these changes
Jan 15, 2026
Contributor
ptgott
left a comment
ptgott
left a comment
There was a problem hiding this comment.
Good idea adding the examples directory!
ptgott
reviewed
Jan 15, 2026
build.assets/tooling/cmd/resource-ref-generator/reference/reference.tmpl
Show resolved
Hide resolved
r0mant
approved these changes
Jan 15, 2026
marcoandredinis
force-pushed
the
marco/docs/discovery-config-alternative
branch
from
7074b53 to
84106e7
Compare
marcoandredinis
temporarily deployed
to
docs-amplify
GitHub Actions
Inactive
marcoandredinis
added a commit
that referenced
this pull request
Jan 16, 2026
…rver discovery (#62746) * Add discovery_config alternative to EC2 discovery guide * add paragraph before tabs for dynamic / static matchers * add example to discovery config * add top level fields section to resource ref template
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Server Discovery allows users to auto enroll cloud server instances (eg, EC2, Azure VMs) into Teleport.
As an example, see
https://goteleport.com/docs/enroll-resources/auto-discovery/servers/ec2-discovery/ec2-discovery-manual/#step-45-configure-teleport-to-discover-ec2-instances
https://goteleport.com/docs/enroll-resources/auto-discovery/databases/#discovery-service-configuration
DiscoveryConfig resource was created some time ago to allow the dynamic registration of auto discovery rules.
This allow users to change them without interfering with the
teleport.yamlof a DiscoveryService.No file change and no service restart is required.
It is mostly used by the Discovery Wizard, however, we added some other entry points recently:
This PR changes server discovery guide docs to let users know that instead of using the static configuration (aka adding discovery rules in the
teleport.yamlfile), they can use the DiscoveryConfig.I only changed the Server discovery guide to ensure we focus on that one and get it right.
After this PR gets merged, I'll change all the other guides accordingly.