Skip to content

Commit

Permalink
Merge pull request #1070 from nasa/develop
Browse files Browse the repository at this point in the history
Merge develop to master for v11.0.0
  • Loading branch information
jennyhliu authored Apr 21, 2022
2 parents c8499dd + a11f80a commit 319e830
Show file tree
Hide file tree
Showing 57 changed files with 3,421 additions and 1,820 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.0
14.19.1
42 changes: 40 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,55 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v11.0.0] - 2022-04-19

## Breaking Changes

This version of the dashboard requires Cumulus API v11.1.0

### Added

- **CUMULUS-2704**
- Added option to create ORCA Reconciliation Report to dashboard

- **CUMULUS-2748**
- Added ORCA Reconciliation Report display to dashboard

### Changed

- **CUMULUS-2903**
- Bumped Node version from 12.18.0 to 14.19.1 to match Core

## [v10.0.0] - 2022-02-25

## Breaking Changes

This version of the dashboard requires Cumulus API v10.1.0
This version of the dashboard requires Cumulus API v10.1.1

- **CUMULUS-2728**
- Removes kibana links and Metrics integration. To get this functionality,
use the Metric's ELK stack and custom Kibana displays.
`KIBANAROOT` is still used to send the operator to the kibana instance where bulk operation queries and custom visualizations can be found.

The following variables have been removed and no longer serve any purpose in the application.

+ `ESROOT`
+ `ES_CLOUDWATCH_TARGET_PATTERN`
+ `ES_DISTRIBUTION_TARGET_PATTERN`
+ `ES_PASSWORD`
+ `ES_USER`
+ `SHOW_DISTRIBUTION_API_METRICS`
+ `SHOW_TEA_METRICS`

### Changed

- **CUMULUS-NONE**
- Updates Cumulus development dependencies to v10.1.1 and upgrades localstack to 0.11.5 to work with latest Cumulus.
- **CUMULUS-2843**
- Create provider and create rule modals now dislpay the provider [rule]
schema title directly as read from the Cumulus API.


## [v9.0.0] - 2022-02-01

## Breaking Changes
Expand Down Expand Up @@ -1238,7 +1275,8 @@ Fix for serving the dashboard through the Cumulus API.
### Added

- Versioning and changelog [CUMULUS-197] by @kkelly51
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v10.0.0...HEAD
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v11.0.0...HEAD
[v11.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v10.0.0...v11.0.0
[v10.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v9.0.0...v10.0.0
[v9.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v8.0.0...v9.0.0
[v8.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v7.1.0...v8.0.0
Expand Down
22 changes: 5 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,7 @@ Setting the following environment variables can override the default values.
| HIDE\_PDR | Whether to hide (or show) the PDR menu. | *true* |
| LABELS | Choose `gitc` or `daac` localization. | *daac* |
| STAGE | Identifier displayed at top of dashboard page: e.g. PROD, UAT | *development* |

Environment options to configure metrics displays. **All** of the below are optional configurations to display metrics on the Cumulus Dashboard.

| Env Name | Description | Default |
| -----|----|---- |
| ESROOT | Should point to an Elasticsearch endpoint. Must be set for distribution metrics to be displayed. | |
| ES\_PASSWORD | Elasticsearch password, needed when protected by basic authorization. | |
| ES\_USER | Elasticsearch username, needed when protected by basic authorization. | |
| ES\_CLOUDWATCH\_TARGET\_PATTERN | The Elasticsearch target pattern to find cloudwatch events. e.g. `<daac>-cloudwatch-cumulus-<env>-*` | |
| ES\_DISTRIBUTION\_TARGET\_PATTERN | The Elasticsearch target pattern to find s3 access log distribution events. e.g. `<daac>-distribution-<env>-*` | |
| KIBANAROOT | \<optional\> Points to a Kibana endpoint. | |
| SHOW\_DISTRIBUTION\_API\_METRICS | \<optional\> Display metrics from the Cumulus Distribution API. | *false* |
| SHOW\_TEA\_METRICS | \<optional\> Display metrics from the Thin Egress Application (TEA). | *true* |


## Quick start
Expand Down Expand Up @@ -81,7 +69,7 @@ Set the environment and build the dashboard with these commands:
$ source production.env && ./bin/build_dashboard_via_docker.sh
```

This script uses Docker Compose to build and copy the a compiled dashboard into the `./dist` directory. You can now deploy this directory to AWS behind [CloudFront](https://aws.amazon.com/cloudfront/). If you are in NGAP, follow the instructions for "Request Public or Protected Access to the APIs and Dashboard" on the earthdata wiki page [Using Cumulus with Private APIs](https://wiki.earthdata.nasa.gov/display/CUMULUS/Cumulus+Deployments+in+NGAP).
This script uses Docker Compose to build and copy the compiled dashboard into the `./dist` directory. You can now deploy this directory to AWS behind [CloudFront](https://aws.amazon.com/cloudfront/). If you are in NGAP, follow the instructions for "Request Public or Protected Access to the APIs and Dashboard" on the earthdata wiki page [Using Cumulus with Private APIs](https://wiki.earthdata.nasa.gov/display/CUMULUS/Cumulus+Deployments+in+NGAP).


### Run the dashboard locally via Docker Image
Expand All @@ -108,7 +96,7 @@ In this example, the dashboard would be available at `http://localhost:3000/` in

### Build the dashboard

The dashboard uses node v12.18.0. To build/run the dashboard on your local machine, install [nvm](https://github.com/creationix/nvm) and run `nvm install v12.18.0`.
The dashboard uses node v14.19.1. To build/run the dashboard on your local machine, install [nvm](https://github.com/creationix/nvm) and run `nvm install v14.19.1`.

#### install requirements
We use npm for local package management, to install the requirements:
Expand Down Expand Up @@ -211,7 +199,7 @@ Serve the cumulus API (separate terminal)

Serve the dashboard web application (another terminal)
```bash
$ [HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ENABLE_RECOVERY=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve
$ [HIDE_PDR=false ENABLE_RECOVERY=true APIROOT=http://localhost:5001] npm run serve
```

If you're just testing dashboard code, you can generally run all of the above commands as a single docker-compose stack.
Expand Down Expand Up @@ -242,7 +230,7 @@ These are started and stopped with the commands:
$ npm run stop-localstack
```

After these containers are running, you can start a cumulus API locally in a terminal window `npm run serve-api`, the dashboard in another window. `[HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ENABLE_RECOVERY=true ESROOT=http://example.com ES_CLOUDWATCH_TARGET_PATTERN=cwpattern ES_DISTRIBUTION_TARGET_PATTERN=distpattern APIROOT=http://localhost:5001] npm run serve` and finally cypress in a third window. `npm run cypress`.
After these containers are running, you can start a cumulus API locally in a terminal window `npm run serve-api`, the dashboard in another window. `[HIDE_PDR=false ENABLE_RECOVERY=true APIROOT=http://localhost:5001] npm run serve` and finally cypress in a third window. `npm run cypress`.

Once the Docker app is running, If you would like to see sample data you can seed the database. This will load the same sample data into the application that is used during cypress testing.
```bash
Expand Down Expand Up @@ -279,7 +267,7 @@ localstack_1 | Ready.
you should be able to verify access to the local Cumulus API at http://localhost:5001/token


Then you can run the dashboard locally (without Docker) `[HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve` and open cypress tests `npm run cypress`.
Then you can run the dashboard locally (without Docker) `[HIDE_PDR=false APIROOT=http://localhost:5001] npm run serve` and open cypress tests `npm run cypress`.

The Docker compose stack also includes a command to let a developer start all development containers with a single command.

Expand Down
2 changes: 2 additions & 0 deletions app/src/css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,7 @@ a:active {
margin-right: 2em;
}

&--found,
&--success {
background-color: $light-green;
}
Expand All @@ -754,6 +755,7 @@ a:active {
background-color: $orange;
}

&--notfound,
&--failed {
background-color: $error-red;
}
Expand Down
13 changes: 13 additions & 0 deletions app/src/css/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,19 @@ $delete-btn-hover-bg-color: darken($error-red, 10%);
font-size: 1.1em;
line-height: 1.1em;
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.12);

&--check {
background-color: transparent;
box-shadow: none;
pointer-events: none;
&:before {
content: '\f00c';
font-family: 'FontAwesome';
background-color: transparent;
color: $black;
font-weight: 900;
}
}
&--download {
&:before {
content: '\f0ab';
Expand Down
82 changes: 0 additions & 82 deletions app/src/js/actions/actions-metrics/apiGatewaySearch.js

This file was deleted.

68 changes: 0 additions & 68 deletions app/src/js/actions/actions-metrics/apiLambdaSearch.js

This file was deleted.

68 changes: 0 additions & 68 deletions app/src/js/actions/actions-metrics/s3AccessSearch.js

This file was deleted.

Loading

0 comments on commit 319e830

Please sign in to comment.