Skip to content

Commit

Permalink
Merge pull request #148 from KPMP/develop
Browse files Browse the repository at this point in the history
DLU Release v2.8
  • Loading branch information
zwright authored Jun 10, 2020
2 parents 7f48fee + a81b106 commit 38a3537
Show file tree
Hide file tree
Showing 23 changed files with 376 additions and 13 deletions.
22 changes: 22 additions & 0 deletions ara/metadataBrowser/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## Metadata Browser

### Background
The Metadata Browser is a set of pre-defined searches that allow our data curation team to view/compare metadata within and across packages. In order to ensure we don't lose these searches/this dashboard, we have exported the definitions from Kibana.

### Files
| File name | Description |
| ------------ | ------------ |
| ReplicatesDashboard.json | Contains the definition of the dashboard, including which panels to include |
| ReplicatesBAMFilesView.json | One of the panels/searches included in the dashboard |
| ReplicatesExpressionMatrixFilesView.json | One of the panels/searches included in the dashboard |
| ReplicatesFASTQFilesView.json | One of the panels/searches included in the dashboard |
| metadata-packages-index-pattern.json | A defined index pattern to help in defining the panels |
| metadata-replicates-index-pattern.json | A defined index pattern to help in defining the panels |

### To recreate
I believe these can be reimported either before or after metadata documents have been added to the indexes for viewing inside the Metadata Browser.

You will likely need to start with reimporting the index patterns first, then the \*View files and finally the \*Dashboard file. **This has not been tested**

To import, log into Kibana and navigate to the Management pane (the gear icon at the bottom left). Under the Kibana section, click on Saved Objects. At the top right, you will see "Import". Click this and select the item from above that you need to re-import.

41 changes: 41 additions & 0 deletions ara/metadataBrowser/ReplicatesBAMFilesView.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[
{
"_id": "b5e70150-8af4-11ea-a424-cf8ebf97d70d",
"_type": "search",
"_source": {
"title": "Replicates, BAM Files",
"description": "",
"hits": 0,
"columns": [
"package_id",
"replicate_replicateId",
"package_packageType",
"replicate_bam_bamFileName",
"replicate_bam_referenceGenome",
"replicate_bam_rnaAlignmentPlatform",
"replicate_bam_rnaAlignmentPlatformVersion",
"replicate_bam_unassignedReads",
"replicate_bam_uniquelyMappedRawReads",
"replicate_bam_uniquelyMappedReads"
],
"sort": [
"package_createdAt",
"desc"
],
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
}
},
"_migrationVersion": {
"search": "7.0.0"
},
"_references": [
{
"name": "kibanaSavedObjectMeta.searchSourceJSON.index",
"type": "index-pattern",
"id": "94b01d70-8af2-11ea-a424-cf8ebf97d70d"
}
]
}
]
44 changes: 44 additions & 0 deletions ara/metadataBrowser/ReplicatesDashboard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
{
"_id": "73ce6c30-8af5-11ea-a424-cf8ebf97d70d",
"_type": "dashboard",
"_source": {
"title": "Replicates Dashboard",
"hits": 0,
"description": "Shows replicate data in 3 tables, one for each file type: BAM, Expression Matrix, and FASTQ. Review the video \"KIbana For Metadata 101\" for examples of searching, changing columns, and saving alternate versions of the dashboard.",
"panelsJSON": "[{\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":18,\"i\":\"1\"},\"version\":\"7.0.1\",\"panelIndex\":\"1\",\"embeddableConfig\":{},\"panelRefName\":\"panel_0\"},{\"gridData\":{\"x\":0,\"y\":18,\"w\":48,\"h\":21,\"i\":\"2\"},\"version\":\"7.0.1\",\"panelIndex\":\"2\",\"embeddableConfig\":{},\"panelRefName\":\"panel_1\"},{\"gridData\":{\"x\":0,\"y\":39,\"w\":48,\"h\":22,\"i\":\"3\"},\"version\":\"7.0.1\",\"panelIndex\":\"3\",\"embeddableConfig\":{},\"panelRefName\":\"panel_2\"}]",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": true,
"timeTo": "now",
"timeFrom": "now-15y",
"refreshInterval": {
"pause": true,
"value": 0
},
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[]}"
}
},
"_migrationVersion": {
"dashboard": "7.0.0"
},
"_references": [
{
"name": "panel_0",
"type": "search",
"id": "b5e70150-8af4-11ea-a424-cf8ebf97d70d"
},
{
"name": "panel_1",
"type": "search",
"id": "f83a6010-8af4-11ea-a424-cf8ebf97d70d"
},
{
"name": "panel_2",
"type": "search",
"id": "1e6445d0-8af5-11ea-a424-cf8ebf97d70d"
}
]
}
]
48 changes: 48 additions & 0 deletions ara/metadataBrowser/ReplicatesExpressionMatrixFilesView.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[
{
"_id": "f83a6010-8af4-11ea-a424-cf8ebf97d70d",
"_type": "search",
"_source": {
"title": "Replicates, Expression Matrix Files",
"description": "",
"hits": 0,
"columns": [
"package_id",
"replicate_replicateId",
"package_packageType",
"package_protocol",
"replicate_expressionMatrix_barcodesFileName",
"replicate_expressionMatrix_genesDetected",
"replicate_expressionMatrix_genesFileName",
"replicate_expressionMatrix_matrixFileName",
"replicate_expressionMatrix_medianGenesDetected",
"replicate_expressionMatrix_medianNumberofRawSequencingReads",
"replicate_expressionMatrix_medianUmidetected",
"replicate_expressionMatrix_numberofCellsSequencedPostQc",
"replicate_expressionMatrix_rnaDownstreamAnalysisPlatform",
"replicate_expressionMatrix_rnaDownstreamAnalysisPlatformOtherSpecify",
"replicate_expressionMatrix_rnaProcessingAnalysisComments",
"replicate_expressionMatrix_rnaDownstreamAnalysisPlatformVersion",
"replicate_expressionMatrix_sequencingSaturation"
],
"sort": [
"package_createdAt",
"desc"
],
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
}
},
"_migrationVersion": {
"search": "7.0.0"
},
"_references": [
{
"name": "kibanaSavedObjectMeta.searchSourceJSON.index",
"type": "index-pattern",
"id": "94b01d70-8af2-11ea-a424-cf8ebf97d70d"
}
]
}
]
67 changes: 67 additions & 0 deletions ara/metadataBrowser/ReplicatesFASTQFilesView.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
[
{
"_id": "1e6445d0-8af5-11ea-a424-cf8ebf97d70d",
"_type": "search",
"_source": {
"title": "Replicates, FASTQ Files",
"description": "",
"hits": 0,
"columns": [
"package_id",
"replicate_replicateId",
"package_packageType",
"package_protocol",
"replicate_fastq_areaDissectedProcessed",
"replicate_fastq_calculatedVolumeDissectedProcessed",
"replicate_fastq_cdnaLibraryYield",
"replicate_fastq_cdnaQuantityLoaded",
"replicate_fastq_cryosectioningDate",
"replicate_fastq_fastqFileName",
"replicate_fastq_fastqFileNamePairedEnd",
"replicate_fastq_libraryFragmentationMethod",
"replicate_fastq_libraryPrepChemistryKit",
"replicate_fastq_libraryPreparationDate",
"replicate_fastq_libraryStartingConcentration",
"replicate_fastq_libraryStartingConcentrationUnit",
"replicate_fastq_numberofCellsNucleiLoaded",
"replicate_fastq_numberofPcrCyclesCdna",
"replicate_fastq_q30Score",
"replicate_fastq_rnaAmplificationChemistryKit",
"replicate_fastq_rnaProcessingComments",
"replicate_fastq_sequencerModel",
"replicate_fastq_sequencerSoftwareVersion",
"replicate_fastq_sequencingCenter",
"replicate_fastq_sequencingComments",
"replicate_fastq_sequencingDate",
"replicate_fastq_sequencingNumberofCycles",
"replicate_fastq_sequencingOperator",
"replicate_fastq_sequencingPlatform",
"replicate_fastq_singleCellNucleusProcessingInstrument",
"replicate_fastq_singlePairedEnd",
"replicate_fastq_strand1ReadLength",
"replicate_fastq_strand2ReadLength",
"replicate_fastq_tissueProcessingComments",
"replicate_fastq_tissueSegmentionDissociationDate",
"replicate_fastq_totalRawReads"
],
"sort": [
"package_createdAt",
"desc"
],
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
}
},
"_migrationVersion": {
"search": "7.0.0"
},
"_references": [
{
"name": "kibanaSavedObjectMeta.searchSourceJSON.index",
"type": "index-pattern",
"id": "94b01d70-8af2-11ea-a424-cf8ebf97d70d"
}
]
}
]
15 changes: 15 additions & 0 deletions ara/metadataBrowser/metadata-packages-index-pattern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"_id": "890730d0-8af2-11ea-a424-cf8ebf97d70d",
"_type": "index-pattern",
"_source": {
"title": "metadata-packages*",
"timeFieldName": "package_createdAt",
"fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"package_createdAt\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_dataGenerators\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_dataGenerators.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_datasetInformationVersion\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_description.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_id\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_largeFilesChecked\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_packageType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_packageType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_protocol.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_regenerateZip\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_subjectId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_subjectId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_submitterDisplayName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_submitterDisplayName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_submitterEmail\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_submitterEmail.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_tisInternalExperimentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_tisInternalExperimentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_tisName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"package_tisName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"package_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
},
"_migrationVersion": {
"index-pattern": "6.5.0"
},
"_references": []
}
]
15 changes: 15 additions & 0 deletions ara/metadataBrowser/metadata-replicates-index-pattern.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions atlas/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ ENV_DATA_DIR=/data/knowledgeEnvironment
ENV_SSL_CERT_DIR=~/certs
ENV_APACHE_CONTAINER=kingstonduo/apache:apache-shib

# Minio / S3
ENV_MINIO_ACCESS_KEY=
ENV_MINIO_SECRET_KEY=
ENV_BUCKET_NAME=kpmp-knowledge-environment
ENV_MINIO_URL=minio-s3:9000
ENV_FLASK_HOME=
8 changes: 8 additions & 0 deletions atlas/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Atlas Docker

## Environment Configuration

The .env file needs an AWS IAM user and access key/secret that has permissions to the bucket also named in the .env file:
- ENV_MINIO_ACCESS_KEY
- ENV_MINIO_SECRET_KEY
- ENV_BUCKET_NAME
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Listen 443

RewriteEngine on
RewriteRule "^/endpoint/(.*?)$" "http://arranger-server.local:5050/endpoint/$1" [P]
RewriteRule "^/api/(.*)$" "http://atlas-file-service:5000/$1" [P]

<Directory "/var/www/html">
RewriteEngine on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Listen 443

RewriteEngine on
RewriteRule "^/endpoint/(.*?)$" "http://arranger-server.local:5050/endpoint/$1" [P]
RewriteRule "^/api/(.*)$" "http://atlas-file-service:5000/$1" [P]

</VirtualHost>

38 changes: 38 additions & 0 deletions atlas/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,44 @@ services:
aliases:
- arranger-ui

atlas-file-service:
image: kingstonduo/atlas-file-service
ports:
- "5000:5000"
volumes:
- ${ENV_FLASK_HOME}:/code
depends_on:
- redis
environment:
- FLASK_ENV=development
- MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
- MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
- MINIO_URL=${ENV_MINIO_URL}
- BUCKET_NAME=${ENV_BUCKET_NAME}
networks:
local:
aliases:
- atlas-file-service
redis:
image: redis
networks:
local:
aliases:
- redis

minio-s3:
image: minio/minio
ports:
- "9000:9000"
environment:
- MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
- MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
command: gateway s3
networks:
local:
aliases:
- minio-s3

volumes:
es:
driver: local
Expand Down
38 changes: 38 additions & 0 deletions atlas/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,44 @@ services:
local:
aliases:
- arranger-server

atlas-file-service:
image: kingstonduo/atlas-file-service
ports:
- "5000:5000"
volumes:
- ${ENV_FLASK_HOME}:/code
depends_on:
- redis
environment:
- FLASK_ENV=production
- MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
- MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
- MINIO_URL=${ENV_MINIO_URL}
- BUCKET_NAME=${ENV_BUCKET_NAME}
networks:
local:
aliases:
- atlas-file-service
redis:
image: redis
networks:
local:
aliases:
- redis

minio-s3:
image: minio/minio
expose:
- "9000"
environment:
- MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
- MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
command: gateway s3
networks:
local:
aliases:
- minio-s3

volumes:
es:
Expand Down
1 change: 1 addition & 0 deletions dataLakeProxyServer/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ ENV_SSL_CERT_DIR=~/certs
ENV_SHIB_CONF_DIR=~/certs
ENV_UPLOADER_BASE_DIR=/path/to/upload/react/app
ENV_CURATION_BASE_DIR=/path/to/curation/react/app
ENV_APACHE_IMAGE=kingstonduo:apache-dl-proxy:2.0
4 changes: 3 additions & 1 deletion dataLakeProxyServer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ services:

apache:
container_name: apache-proxy
image: kingstonduo/apache:apache-dl-proxy
image: ${ENV_APACHE_IMAGE}
ports:
- "80:80"
- "443:443"
environment:
- "TZ:America/Detroit"
volumes:
- ${ENV_UPLOADER_BASE_DIR}/build:/var/www/html/upload
- ${ENV_CURATION_BASE_DIR}/build:/var/www/html/datamanager
Expand Down
Loading

0 comments on commit 38a3537

Please sign in to comment.