Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #468

Merged
merged 47 commits into from
Sep 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
cd44987
Ensure filename/no filename text in connect by file dialog is aligned…
richard-cox Jul 28, 2020
f627688
Add typed entity access and `custom-src` removal to change log (#4496)
richard-cox Aug 7, 2020
d7102e7
Fixes #4335: Create Stratos static web site with better documentation…
Aug 7, 2020
50617f7
Fix and update customization docs (#4478)
richard-cox Aug 7, 2020
b713c78
Update base README, point to website (#4488)
richard-cox Aug 7, 2020
e12f60f
Update developer docs (#4489)
richard-cox Aug 7, 2020
4209358
Fix docs (#4497)
richard-cox Aug 7, 2020
dc2d6d6
Ensure images dependent on techPreview flag are included in imagelist…
richard-cox Aug 18, 2020
4df1516
Improve clean-symlinks script (#4509)
nwmac Aug 18, 2020
3a8cd74
Change nginx ciphers and make configurable via helm chart values (#4507)
nwmac Aug 18, 2020
200726c
Update version to 4.0.1, add change log (#4514)
richard-cox Aug 18, 2020
0285873
Fix deploy from gitlab using a group's repo (#4479)
richard-cox Aug 20, 2020
ad64761
Add additional time ranges to base metrics range selector (#4480)
richard-cox Aug 20, 2020
d27a12d
Add some time saving comments to cf permissions checker (#4508)
richard-cox Aug 20, 2020
8da357a
Move tab-nav and xsrf module source files to the src folder (#4518)
nwmac Aug 21, 2020
286d508
Fix GitHub branch limit (#4510)
richard-cox Aug 21, 2020
9a70ea6
Remove use of nodejs util module (#4521)
nwmac Aug 21, 2020
77d5a20
Remove dependencies between store and core that have crept in (#4517)
nwmac Aug 21, 2020
027f9c3
Fix store testing package (#4520)
nwmac Aug 21, 2020
5214f9f
Fix the position of the header guide array (#4524)
richard-cox Aug 24, 2020
009c203
Metrics: Ensure trailing slashes are ignored when comparing URLs (#4527)
nwmac Aug 24, 2020
da6285c
Remove imports of the form 'frontend/....' (#4519)
nwmac Aug 24, 2020
307fc20
Move endpopints-health-check.ts (#4530)
nwmac Aug 24, 2020
0aefbb1
Add UMD Ids to external modules in store package (#4522)
nwmac Aug 24, 2020
55f2244
Improvements & more checks to autoscaler scheduled date tests (#4535)
richard-cox Aug 25, 2020
a0b338a
Remove api driven views (#4537)
nwmac Aug 25, 2020
0ea6632
Remove logger service and action history (#4538)
nwmac Aug 25, 2020
5eb7f0e
Add support for API keys (#4515)
ikapelyukhin Aug 25, 2020
68d5df7
Update moment imports to remove warning when building library (#4534)
nwmac Aug 25, 2020
d845669
Fix Helm upgrade bug (#4544)
nwmac Aug 26, 2020
f6f2d9f
Store api_keys.last_used in UTC (#4541)
ikapelyukhin Sep 1, 2020
b560761
Add UI for Stratos API Keys (#4523)
richard-cox Sep 2, 2020
545669a
Add basic e2e tests for API Keys (#4536)
richard-cox Sep 2, 2020
3726821
Bump docusaurus version and add support for versioning (#4506)
richard-cox Sep 3, 2020
b63e39a
API Keys: Make feature configurable for different user types (#4540)
ikapelyukhin Sep 4, 2020
c767913
Add docs for UAA SSO user permissions management (#4554)
richard-cox Sep 4, 2020
cfbfab8
Add basic developers guide for working with helm (#4511)
richard-cox Sep 4, 2020
6af9d88
Enable/disable API keys UI given API keys config setting (#4559)
richard-cox Sep 7, 2020
a987ee7
Enable linting for all packages (#4561)
richard-cox Sep 8, 2020
051338a
Bump angular json schema form (#4564)
nwmac Sep 10, 2020
ef00d18
Docs: Update internal versions & Automate future updates (#4558)
richard-cox Sep 10, 2020
ab83546
Merge remote-tracking branch 'upstream/master' into merge-upstream
richard-cox Sep 10, 2020
b8b019a
Merge fixes, remove fdescribe already in master
richard-cox Sep 10, 2020
058fb38
Fix linting
richard-cox Sep 10, 2020
864be50
Fix unit tests
richard-cox Sep 10, 2020
714774c
Merge remote-tracking branch 'origin/master' into merge-upstream
richard-cox Sep 11, 2020
307f05e
Merge remote-tracking branch 'origin/master' into merge-upstream
richard-cox Sep 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update base README, point to website (cloudfoundry#4488)
* Fixes cloudfoundry#4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (cloudfoundry#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (cloudfoundry#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (cloudfoundry#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (cloudfoundry#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (cloudfoundry#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (cloudfoundry#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (cloudfoundry#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (cloudfoundry#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (cloudfoundry#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](codecov/codecov-node@v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (cloudfoundry#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
8 people authored Aug 7, 2020
commit b713c787c5e5d946b04af39593216bb7ccfbe72f
61 changes: 11 additions & 50 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,25 @@

Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.

If you are looking for a version of Stratos, you can find ..
- V1 in the [v1-master](https://github.com/cloudfoundry/stratos/tree/v1-master) branch.
- V2 in the [v2-master](https://github.com/cloudfoundry/stratos/tree/v2-master) branch.
![Stratos Application view](website/static/images/screenshots/app-summary.png)

![Stratos Application view](docs/images/screenshots/app-summary.png)
Please visit our new [documentation site](https://stratos.app/). There you can discover

## Quick Start
1. Our [introduction](https://stratos.app/docs/), including quick start, contributing and troubleshooting guides.
1. How to [deploy](https://stratos.app/docs/deploy/overview) Stratos in a number of environments.
1. [Cloud Foundry](https://stratos.app/docs/deploy/cloud-foundry/cloud-foundry), as an application.
1. [Kubernetes](https://stratos.app/docs/deploy/kubernetes), using a Helm chart.
1. [Docker](https://stratos.app/docs/deploy/all-in-one), as a single container deploying all components.
1. Configuring advanced features such a [Single Sign On](https://stratos.app/docs/advanced/sso) and Cloud Foundry '[invite to org](https://stratos.app/docs/advanced/invite-user-guide)'.
1. Guides for [developers](https://stratos.app/docs/developer/introduction).
1. How to [extend](https://stratos.app/docs/extensions/introduction) Stratos [functionality](https://stratos.app/docs/extensions/frontend) and apply a custom [theme](https://stratos.app/docs/extensions/theming).

To get started quickly, we recommend following the steps to deploy the Stratos Console as a Cloud Foundry Application - see [here](deploy/cloud-foundry).

If you have [docker](https://www.docker.com/community-edition) installed, you can quickly deploy Stratos using the all-in-one container:
```
$ docker run -p 4443:443 splatform/stratos:latest
```

Once that has finished, you can then access Stratos by visiting https://localhost:4443.

## Deploying Stratos

Stratos can be deployed in the following environments:

1. Cloud Foundry, as an application. See [guide](deploy/cloud-foundry)
2. Kubernetes, using a Helm chart. See [guide](deploy/kubernetes)
3. Docker, single container deploying all components. See [guide](deploy/all-in-one)

## Troubleshooting

Please see our [Troubleshooting](docs/troubleshooting) page.

## Further Reading

Take a look at the [Feature Set](docs/features.md) for details on the feature set that Stratos provides.

Get an [Overview](docs/overview.md) of Stratos, its components and the different ways in which it can be deployed.

Take a look at the [Development Roadmap](docs/roadmap.md) to see where we are heading.

Browse through features and issues in the project's [issues](https://github.com/cloudfoundry/stratos/issues) page.

What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/cloudfoundry/stratos)

## Contributing

We very much welcome developers who would like to get involved and contribute to the development of the Stratos project. Please refer to the [Contributing guide](CONTRIBUTING.md) for more information.

For information to help getting started with development, please read the [Developer's Guide](docs/developers-guide.md).

## Support and feedback

We have a channel (#stratos) on the Cloud Foundy Slack where you can ask questions, get support or give us feedback. We'd love to hear from you if you are using Stratos.

You can join the Cloud Foundry Slack here - https://slack.cloudfoundry.org/ - and then join the #stratos channel.

## Acknowledgements

Tested with Browserstack

<a href="https://www.browserstack.com"><img width="240px" src="docs/images/Browserstack-logo.svg" alt="Browserstack"></a>
<a href="https://www.browserstack.com"><img width="240px" src="website/static/images/Browserstack-logo.svg" alt="Browserstack"></a>

## License

Expand Down
2 changes: 1 addition & 1 deletion website/docs/extensions/v4-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ To aid in migrating we've provided these instructions.
## Further Guidance
Our ACME demo (`src/frontend/packages/example-extensions` and `src/frontend/packages/example-theme`) and SUSE repo ([theme](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-theme) and [extensions](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-extensions)) have both been updated and are fully compatible with the 4.0 changes. Both are a good source for examples.

If there any questions or issues please reach out to us either on out Github [repo](https://github.com/cloudfoundry/stratos) or Slack room [#stratos](https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos).
If there any questions or issues please reach out to us either on our Github [repo](https://github.com/cloudfoundry/stratos) or Slack room [#stratos](https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos).
4 changes: 2 additions & 2 deletions website/docs/introduction.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
id: introduction
title: STRATOS
title: Introduction
sidebar_label: Introduction
---

Stratos is an Open Source Web-based UI for Cloud Foundry and Kubernetes.

> Note: The Kubernetes additions to Stratos are currently maintained by SUSE and we are in the process of upstreaming these to the cloudfoundry GitHub repository and making them a standard part of the Stratos build and install.
> Note: The Kubernetes additions to Stratos are currently maintained by SUSE and we are investigating the process of upstreaming these to the cloudfoundry GitHub repository. These would then become a standard part of Stratos build and install.

For Cloud Foundry, it allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.

Expand Down