diff --git a/staging.chordshealth.org/etlMapping.yaml b/staging.chordshealth.org/etlMapping.yaml index c7c9c85258..8770e0be6a 100644 --- a/staging.chordshealth.org/etlMapping.yaml +++ b/staging.chordshealth.org/etlMapping.yaml @@ -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 @@ -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 @@ -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 @@ -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] \ No newline at end of file diff --git a/staging.chordshealth.org/manifest.json b/staging.chordshealth.org/manifest.json index 91b5b8cf5b..547a3ad0ad 100644 --- a/staging.chordshealth.org/manifest.json +++ b/staging.chordshealth.org/manifest.json @@ -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" @@ -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": [ @@ -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": [ { @@ -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": [ { @@ -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": {