Label desktops based on the content of LDAP attributes #13028
Merged
Conversation
This file contains 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
zmb3
force-pushed
the
zmb3/desktop-labeling
branch
2 times, most recently
from
12d8de4 to
70a2615
Compare
|
Here's an example with the following config:
|
zmb3
force-pushed
the
zmb3/desktop-labeling
branch
from
70a2615 to
0b2f29a
Compare
github-actions
bot
requested review from
LKozlowski,
ptgott,
r0mant,
timothyb89 and
xinding33
ptgott
approved these changes
Jun 2, 2022
zmb3
force-pushed
the
zmb3/desktop-labeling
branch
from
0b2f29a to
dc00f35
Compare
This allows users to configure an optional set of LDAP attributes which will be included in all LDAP queries. Teleport uses these attributes when labeling desktops. Updates #12326
zmb3
force-pushed
the
zmb3/desktop-labeling
branch
from
dc00f35 to
13a997b
Compare
|
@atburke requested your review since this is very similar to the EC2 labels work you did. |
LKozlowski
approved these changes
Jun 7, 2022
espadolini
approved these changes
Jun 7, 2022
| @@ -164,6 +164,9 @@ type WindowsServiceConfig struct { | |||
| // Windows Desktops. If multiple filters are specified, they are ANDed | |||
| // together into a single search. | |||
| DiscoveryLDAPFilters []string | |||
| // DiscoveryLDAPAttributeLabels are optional LDAP attributes to convert | |||
| // into Teleport labels. | |||
| DiscoveryLDAPAttributeLabels []string | |||
There was a problem hiding this comment.
Maybe DiscoveryLDAPLabelAttributes to match the field name in the discovery configuration?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This allows users to configure an optional set of LDAP attributes
which will be included in all LDAP queries. Teleport uses these
attributes when labeling desktops.
We use the
ldap/label prefix to align with how the EC2 labels use anaws/prefix.Updates #12326