Add non-AD desktops to `Enroll New Resource` by probakowski · Pull Request #35231 · gravitational/teleport

probakowski · 2023-11-30T20:54:56Z

This change add new tile to Enroll New Resource for non-AD Windows Desktops.
It's unguided one, just providing link to the guide.

This PR depends on https://github.com/gravitational/cloud/pull/6927

Changelog: Add non-AD desktops to Enroll New Resource

github-actions · 2023-11-30T20:55:48Z

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

github-actions · 2023-11-30T20:56:13Z

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

ravicious

LGTM but the event field needs to be adjusted AFAIK.

ravicious · 2023-12-01T13:48:13Z

  ApplicationHttp = 'DISCOVER_RESOURCE_APPLICATION_HTTP',
  ApplicationTcp = 'DISCOVER_RESOURCE_APPLICATION_TCP',
  WindowsDesktop = 'DISCOVER_RESOURCE_WINDOWS_DESKTOP',
+  WindowsDesktopNonAD = 'DISCOVER_RESOURCE_DOC_WINDOWS_DESKTOP_NON_AD',


I think this needs to correspond to DiscoverResource in usageevents.proto which itself needs to be deployed to Cloud first.

teleport/api/proto/teleport/usageevents/v1/usageevents.proto

Lines 96 to 108 in 464edfa

// DiscoverResource represents a resource type.

enum DiscoverResource {

DISCOVER_RESOURCE_UNSPECIFIED = 0;

DISCOVER_RESOURCE_SERVER = 1;

DISCOVER_RESOURCE_KUBERNETES = 2;

DISCOVER_RESOURCE_DATABASE_POSTGRES_SELF_HOSTED = 3;

DISCOVER_RESOURCE_DATABASE_MYSQL_SELF_HOSTED = 4;

DISCOVER_RESOURCE_DATABASE_MONGODB_SELF_HOSTED = 5;

DISCOVER_RESOURCE_DATABASE_POSTGRES_RDS = 6;

DISCOVER_RESOURCE_DATABASE_MYSQL_RDS = 7;

DISCOVER_RESOURCE_APPLICATION_HTTP = 8;

DISCOVER_RESOURCE_APPLICATION_TCP = 9;

DISCOVER_RESOURCE_WINDOWS_DESKTOP = 10;

For now I'd just use WindowsDesktop and ask on #dev-discover if we want to track these separately, unless it was discussed already.

Good catch. We absolutely want to track separately.

Thanks for catching that, I've modified the proto and opened PR in cloud

@zmb3 @probakowski wdyt about adding a usage event for reaching the end of the discover AD flow as well (per our discussion in the call last week).

I was going to suggest the same. Might as well since we're here.

…non-ad

ibeckermayer

See suggestions

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

public-teleport-github-review-bot · 2023-12-15T13:02:59Z

@probakowski See the table below for backport results.

Branch	Result
branch/v14	Failed

* Add non-AD to Enroll new resource * add discoverresource to proto * reword desktops labels * Update UI test snapshot * Update UI test snapshot * Update web/packages/teleport/src/Discover/SelectResource/resources.tsx Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com> * Update web/packages/teleport/src/Discover/SelectResource/resources.tsx Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com> * Update UI test snapshot --------- Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

* Add non-AD desktops to `Enroll New Resource` (#35231) * Add non-AD to Enroll new resource * add discoverresource to proto * reword desktops labels * Update UI test snapshot * Update UI test snapshot * Update web/packages/teleport/src/Discover/SelectResource/resources.tsx Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com> * Update web/packages/teleport/src/Discover/SelectResource/resources.tsx Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com> * Update UI test snapshot --------- Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com> * fix test --------- Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

Add non-AD to Enroll new resource

e7606ff

probakowski requested a review from zmb3 November 30, 2023 20:54

Merge branch 'master' into probakowski/enroll-non-ad

547e547

github-actions Bot added size/sm ui labels Nov 30, 2023

github-actions Bot requested review from ibeckermayer and ravicious November 30, 2023 20:55

ravicious approved these changes Dec 1, 2023

View reviewed changes

add discoverresource to proto

ce4a338

probakowski force-pushed the probakowski/enroll-non-ad branch from 72f59da to ce4a338 Compare December 6, 2023 17:11

probakowski added 8 commits December 6, 2023 18:12

reword desktops labels

1af387a

Merge branch 'master' into probakowski/enroll-non-ad

991bf01

Merge remote-tracking branch 'origin/master' into probakowski/enroll-…

a9f4920

…non-ad

Merge branch 'master' into probakowski/enroll-non-ad

ee99c0c

Update UI test snapshot

700f90c

Update UI test snapshot

75287d3

Merge branch 'master' into probakowski/enroll-non-ad

1fbbb4a

Merge branch 'master' into probakowski/enroll-non-ad

85091ac

ibeckermayer approved these changes Dec 11, 2023

View reviewed changes

Comment thread web/packages/teleport/src/Discover/SelectResource/resources.tsx Outdated

Comment thread web/packages/teleport/src/Discover/SelectResource/resources.tsx Outdated

probakowski and others added 4 commits December 11, 2023 21:10

Update web/packages/teleport/src/Discover/SelectResource/resources.tsx

5956ea4

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

Update web/packages/teleport/src/Discover/SelectResource/resources.tsx

6e6f4b1

Co-authored-by: Isaiah Becker-Mayer <isaiah@goteleport.com>

Update UI test snapshot

c4ab61a

Merge branch 'master' into probakowski/enroll-non-ad

2a26002

zmb3 approved these changes Dec 11, 2023

View reviewed changes

probakowski added this pull request to the merge queue Dec 11, 2023

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Dec 11, 2023

probakowski added this pull request to the merge queue Dec 11, 2023

Merged via the queue into master with commit aa25bfb Dec 12, 2023

probakowski deleted the probakowski/enroll-non-ad branch December 12, 2023 00:07

ibeckermayer mentioned this pull request Dec 14, 2023

add local windows users guide link to enrollment #34010

Closed

probakowski added the backport/branch/v14 label Dec 15, 2023

probakowski mentioned this pull request Dec 15, 2023

[v14] Add non-AD desktops to Enroll New Resource #35797

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add non-AD desktops to `Enroll New Resource`#35231

Add non-AD desktops to `Enroll New Resource`#35231
probakowski merged 15 commits intomasterfrom
probakowski/enroll-non-ad

probakowski commented Nov 30, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Nov 30, 2023

Uh oh!

github-actions Bot commented Nov 30, 2023

Uh oh!

ravicious left a comment

Uh oh!

ravicious Dec 1, 2023

Uh oh!

zmb3 Dec 1, 2023

Uh oh!

probakowski Dec 6, 2023

Uh oh!

ibeckermayer Dec 7, 2023 •

edited

Loading

Uh oh!

zmb3 Dec 7, 2023

Uh oh!

ibeckermayer left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

public-teleport-github-review-bot Bot commented Dec 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	// DiscoverResource represents a resource type.
	enum DiscoverResource {
	DISCOVER_RESOURCE_UNSPECIFIED = 0;
	DISCOVER_RESOURCE_SERVER = 1;
	DISCOVER_RESOURCE_KUBERNETES = 2;
	DISCOVER_RESOURCE_DATABASE_POSTGRES_SELF_HOSTED = 3;
	DISCOVER_RESOURCE_DATABASE_MYSQL_SELF_HOSTED = 4;
	DISCOVER_RESOURCE_DATABASE_MONGODB_SELF_HOSTED = 5;
	DISCOVER_RESOURCE_DATABASE_POSTGRES_RDS = 6;
	DISCOVER_RESOURCE_DATABASE_MYSQL_RDS = 7;
	DISCOVER_RESOURCE_APPLICATION_HTTP = 8;
	DISCOVER_RESOURCE_APPLICATION_TCP = 9;
	DISCOVER_RESOURCE_WINDOWS_DESKTOP = 10;

Conversation

probakowski commented Nov 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Nov 30, 2023

Uh oh!

github-actions Bot commented Nov 30, 2023

Uh oh!

ravicious left a comment

Choose a reason for hiding this comment

Uh oh!

ravicious Dec 1, 2023

Choose a reason for hiding this comment

Uh oh!

zmb3 Dec 1, 2023

Choose a reason for hiding this comment

Uh oh!

probakowski Dec 6, 2023

Choose a reason for hiding this comment

Uh oh!

ibeckermayer Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zmb3 Dec 7, 2023

Choose a reason for hiding this comment

Uh oh!

ibeckermayer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

public-teleport-github-review-bot Bot commented Dec 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

probakowski commented Nov 30, 2023 •

edited

Loading

ibeckermayer Dec 7, 2023 •

edited

Loading