Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

Allow users to update Upgrade Window Start#980

Merged
mcbattirola merged 61 commits into
masterfrom
mcbattirola/add-cloud-upgrade-windows
Jul 27, 2022
Merged

Allow users to update Upgrade Window Start#980
mcbattirola merged 61 commits into
masterfrom
mcbattirola/add-cloud-upgrade-windows

Conversation

@mcbattirola
Copy link
Copy Markdown
Contributor

@mcbattirola mcbattirola commented Jul 14, 2022

This PR adds a prop children to the "Help & Support" page that allows enterprise to extend it. webapps.e will have its own page that will add a new section to Support with some cloud specific information. Some components of Support have been made more generic and exported so we can use them on enterprise.

This PR also updates the events table to properly show the new audit event type.

Enterprise PR using this feature: https://github.com/gravitational/webapps.e/pull/357

Testing

To run the whole thing, you can:

  1. Run salescenter locally (follow this)
  2. Checkout master mcbattirola/add-cloud-upgrade-windows on both teleport and teleport.e, and webapps.e on branch mcbattirola/add-cloud-upgrade-windows
  3. comment this line on lib/modules/modules.go so we can run cloud without second factor
  4. build and run teleport.e with this license (under auth_service in the config file). I recommend you copy cloud/dev/teleport/config.yaml and add:
auth_service:
  enabled: "yes"
  listen_addr: 0.0.0.0:3025
  tokens:
  - proxy,node:[token]
  authentication:
  license_file: /home/matheus/tc/db/fixtures/license.pem

You have to run it like this:

TELEPORT_CLOUD_HOSTPORT="api.localhost:3080" DEBUG=1 /path/to/teleport/e/build/teleport start -c my-config-file.yaml -d --insecure
  1. Run this branch of the teleport UI with yarn start-teleport-e --target=https://localhost:4080/web
    Then you should be able to make a request from the local teleport to the salescenter

Screenshots

Screenshot from 2022-07-14 12-23-57

Screenshot from 2022-07-19 14-00-08

Closes https://github.com/gravitational/cloud/issues/1808

@mcbattirola
Copy link
Copy Markdown
Contributor Author

Thank you @kimlisa !

I moved the upgrade window stuff to enterprise (PR here), now this PR only adds the event and adds a children prop to Support. I've updated the PR text to reflect this

Comment thread packages/teleport/src/Support/Support.tsx Outdated
Comment thread packages/teleport/src/Support/Support.tsx Outdated
Comment thread packages/teleport/src/Support/Support.tsx Outdated
Comment thread packages/teleport/src/Support/Support.tsx Outdated
@mcbattirola mcbattirola requested a review from ryanclark July 25, 2022 12:29
@mcbattirola
Copy link
Copy Markdown
Contributor Author

@ryanclark Thanks for the review, are you ok with merging this?

Copy link
Copy Markdown
Member

@ryanclark ryanclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mcbattirola mcbattirola enabled auto-merge (squash) July 27, 2022 12:08
@mcbattirola mcbattirola merged commit 4580cf2 into master Jul 27, 2022
@mcbattirola mcbattirola deleted the mcbattirola/add-cloud-upgrade-windows branch July 27, 2022 12:36
michellescripts pushed a commit that referenced this pull request Aug 22, 2022
- add a prop children to the "Help & Support"
- add clock icon
michellescripts added a commit that referenced this pull request Aug 23, 2022
hatched pushed a commit to gravitational/teleport that referenced this pull request Feb 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants