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.

Sign up for GitHub

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

Updating Chords to release 2023.12 in preparation for ES7 changes. #6850

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Updating Chords to release 2023.12 in preparation for ES7 changes. #6850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab0a347
Updating Chords to release 2023.12 in preparation for ES7 changes.
EliseCastle23 Dec 8, 2023
adaae1d
correcting etl mapping
EliseCastle23 Dec 14, 2023
8d533be
Merge branch 'master' into feat/GPE-1163-chords
EliseCastle23 Dec 14, 2023
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
8 changes: 4 additions & 4 deletions staging.chordshealth.org/etlMapping.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mappings:
- name: geospatial_data_resource
- name: chords_geospatial_data_resource
doc_type: geospatial_data_resource
type: aggregator
root: geospatial_data_resource
Expand Down Expand Up @@ -28,7 +28,7 @@ mappings:
- name: exposure_media
parent_props:
- path: resources[resource_id, resource_name:long_name, resource_short_name:name, resource_type, resource_description:description, resource_citation:citation, payment_required, domain, keywords, license_type, license_text, verification_datetime, resource_use_agreement, resource_contact, resource_url].projects[project_code:code, project_investigator_affiliation:investigator_affiliation, project_investigator_name:investigator_name, project_date:date_collected, project_name:name, project_short_name:name, support_source, support_id, project_url].programs[program_name:name, program_short_name:name]
- name: geospatial_tool_resource
- name: chords_geospatial_tool_resource
doc_type: geospatial_tool_resource
type: aggregator
root: geospatial_tool_resource
Expand All @@ -53,7 +53,7 @@ mappings:
- name: model_methods
parent_props:
- path: resources[resource_id, resource_name:long_name, resource_short_name:name, resource_type, resource_description:description, resource_citation:citation, payment_required, domain, keywords, license_type, license_text, verification_datetime, resource_use_agreement, resource_contact, resource_url].projects[project_code:code, project_investigator_affiliation:investigator_affiliation, project_investigator_name:investigator_name, project_date:date_collected, project_name:name, project_short_name:name, support_source, support_id, project_url].programs[program_name:name, program_short_name:name]
- name: population_data_resource
- name: chords_population_data_resource
doc_type: population_data_resource
type: aggregator
root: population_data_resource
Expand Down Expand Up @@ -86,4 +86,4 @@ mappings:
- name: population_studied_other

parent_props:
- path: resources[resource_id, resource_name:long_name, resource_short_name:name, resource_type, resource_description:description, resource_citation:citation, payment_required, domain, keywords, license_type, license_text, verification_datetime, resource_use_agreement, resource_contact, resource_url].projects[project_code:code, project_investigator_affiliation:investigator_affiliation, project_investigator_name:investigator_name, project_date:date_collected, project_name:name, project_short_name:name, support_source, support_id, project_url].programs[program_name:name, program_short_name:name]
- path: resources[resource_id, resource_name:long_name, resource_short_name:name, resource_type, resource_description:description, resource_citation:citation, payment_required, domain, keywords, license_type, license_text, verification_datetime, resource_use_agreement, resource_contact, resource_url].projects[project_code:code, project_investigator_affiliation:investigator_affiliation, project_investigator_name:investigator_name, project_date:date_collected, project_name:name, project_short_name:name, support_source, support_id, project_url].programs[program_name:name, program_short_name:name]
44 changes: 22 additions & 22 deletions staging.chordshealth.org/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.10",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12",
"aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.10",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.10",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.10",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.10",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.10",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.10",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.12",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.12",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.12",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.12",
"frontend-framework": "quay.io/cdis/frontend-framework:feat_n3c",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.10",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.12",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.10",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.10",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.10",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.10",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.12",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.12",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.12",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.12",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.10",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.10",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.10"
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.12",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -41,7 +41,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.10"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.12"
}
},
"sower": [
Expand All @@ -50,7 +50,7 @@
"action": "export",
"container": {
"name": "job-task",
"image": "quay.io/cdis/pelican-export:2023.10",
"image": "quay.io/cdis/pelican-export:2023.12",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -126,7 +126,7 @@
"action": "export-files",
"container": {
"name": "job-task",
"image": "quay.io/cdis/pelican-export:2023.10",
"image": "quay.io/cdis/pelican-export:2023.12",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -282,19 +282,19 @@
"guppy": {
"indices": [
{
"index": "geospatial_data_resource",
"index": "chords_geospatial_data_resource",
"type": "geospatial_data_resource"
},
{
"index": "population_data_resource",
"index": "chords_population_data_resource",
"type": "population_data_resource"
},
{
"index": "geospatial_tool_resource",
"index": "chords_geospatial_tool_resource",
"type": "geospatial_tool_resource"
}
],
"config_index": "chords-array-config",
"config_index": "chords_array-config",
"auth_filter_field": "auth_resource_path"
},
"scaling": {
Expand Down
Loading