diff --git a/CHANGELOG.md b/CHANGELOG.md index 705870b..b2b2503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) >- **Fixed** for any bug fixes. >- **Security** in case of vulnerabilities. -## [0.2a6] - 2024-07-11 +## [0.2a7] - 2024-11-22 + +> :warning: **BREAKING** : After [PR RS-PYTHON/rs-server#688](https://github.com/RS-PYTHON/rs-server/pull/688) configuration files should only be edited from the templates rs-server repository ([search link](https://github.com/search?q=repo%3ARS-PYTHON%2Frs-server+path%3Aservices%2F*%2Fconfig%2F*template*.yaml&type=code)). + +### Added + +- rs-server-adgs + - name to the queryable + - adgs2 mockup station in the conf +- RSPY-131 : rs-server-pagination + +### Changed + +- Set value of `context` to on in pgstac_settings (needed for pagination) +- rs-server-cadip : Sort is now by `PublicationDate` +- RSPY-450 : Update pgstac to 0.8.6 +- bump docker image's tag + +### Fixed + +- Identation and removed useless quotes in multiple config files +- RSPY-518 : Staging not integrated with Tempo +- Missing CORS header for stac browser +- RSPY-531 : Add Catalog obs environment variable to be configurable + +## [0.2a6] - 2024-11-07 ### Added diff --git a/charts/mockup-processor-dpr/README.md b/charts/mockup-processor-dpr/README.md index 0956f0a..8a8534a 100644 --- a/charts/mockup-processor-dpr/README.md +++ b/charts/mockup-processor-dpr/README.md @@ -19,7 +19,7 @@ MOCKUP PROCESSOR DPR | image.name | string | `"rs-testmeans_dpr-processor-mock"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"sha256:9604012b04cb7f5af403b5a91f0d316f44902f01f3d4fb81857b5d5d5288be30"` | Image version, can be a tag or a digest | +| image.version | string | `"sha256:23d916e20f53ee7300776c8cb25091b7891a72b6bf80a5a0f324cc241d2a8c56"` | Image version, can be a tag or a digest | | namespace | string | `"processing"` | Namespace for the deployment | | obs.endpoint | string | `"http://minio.minio.svc.cluster.local:9000"` | URL of the object storage service endpoint | | obs.region | string | `"sbg"` | Region of the object storage service | diff --git a/charts/mockup-processor-dpr/values.yaml b/charts/mockup-processor-dpr/values.yaml index e5cf2c4..ce4811b 100644 --- a/charts/mockup-processor-dpr/values.yaml +++ b/charts/mockup-processor-dpr/values.yaml @@ -46,7 +46,7 @@ image: # -- Image name name: rs-testmeans_dpr-processor-mock # -- Image version, can be a tag or a digest - version: sha256:9604012b04cb7f5af403b5a91f0d316f44902f01f3d4fb81857b5d5d5288be30 + version: sha256:23d916e20f53ee7300776c8cb25091b7891a72b6bf80a5a0f324cc241d2a8c56 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred diff --git a/charts/mockup-station-adgs/README.md b/charts/mockup-station-adgs/README.md index b5ffad5..370e5eb 100644 --- a/charts/mockup-station-adgs/README.md +++ b/charts/mockup-station-adgs/README.md @@ -24,7 +24,7 @@ MOCKUP STATION ADGS | image.name | string | `"rs-testmeans_adgs-station-mock"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"sha256:25e34afb12145c4748fa315e901359a2a271a4cb54027b1a6e585224612d0106"` | Image version, can be a tag or a digest | +| image.version | string | `"sha256:2726e4da2a548aefc648235a9a52c0936633098d2fedd689d1ab39658d24cafc"` | Image version, can be a tag or a digest | | namespace | string | `"processing"` | Namespace for the deployment | | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe | | probe.liveness.path | string | `"/health"` | Path for the liveness probe | diff --git a/charts/mockup-station-adgs/values.yaml b/charts/mockup-station-adgs/values.yaml index 27447eb..d8693ad 100644 --- a/charts/mockup-station-adgs/values.yaml +++ b/charts/mockup-station-adgs/values.yaml @@ -66,7 +66,7 @@ image: # -- Image name name: rs-testmeans_adgs-station-mock # -- Image version, can be a tag or a digest - version: sha256:25e34afb12145c4748fa315e901359a2a271a4cb54027b1a6e585224612d0106 + version: sha256:2726e4da2a548aefc648235a9a52c0936633098d2fedd689d1ab39658d24cafc # -- Image pull policy PullPolicy: Always #imagePullSecrets: regcred diff --git a/charts/mockup-station-cadip/README.md b/charts/mockup-station-cadip/README.md index 53e784f..eec29eb 100644 --- a/charts/mockup-station-cadip/README.md +++ b/charts/mockup-station-cadip/README.md @@ -28,7 +28,7 @@ MOCKUP STATION CADIP | image.name | string | `"rs-testmeans_cadip-station-mock"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"sha256:c5969ba8420f39c90125a527bd9eb79723b6129fbf7859c54fcfea98271b848e"` | Image version, can be a tag or a digest | +| image.version | string | `"sha256:4831636c5adfee6cfc809bdeb25e361e084ddeb49e3aaaacca54a1b7be2137a9"` | Image version, can be a tag or a digest | | namespace | string | `"processing"` | Namespace for the deployment | | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe | | probe.liveness.path | string | `"/health"` | Path for the liveness probe | diff --git a/charts/mockup-station-cadip/templates/configmap.yaml b/charts/mockup-station-cadip/templates/configmap.yaml index 009f96e..19841e9 100644 --- a/charts/mockup-station-cadip/templates/configmap.yaml +++ b/charts/mockup-station-cadip/templates/configmap.yaml @@ -241,7 +241,7 @@ data: { "Id": "e4d17d2f-29eb-4c18-bc1f-bf2769a3a16d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00000.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -253,7 +253,7 @@ data: { "Id": "cd24aa8b-2719-4a1e-b4a7-f7c9df6de300", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00001.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -265,7 +265,7 @@ data: { "Id": "937ef9bb-c2fc-4bc9-a0a9-27e21fcb655a", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00002.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -277,7 +277,7 @@ data: { "Id": "d7d1d9a7-9de5-4b7d-9a61-83ec177e17ab", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00003.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -289,7 +289,7 @@ data: { "Id": "13b648e1-779e-4391-b3b6-ec3934f572f8", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00004.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -301,7 +301,7 @@ data: { "Id": "6cde0b7e-2c21-4bb3-bce0-6168bb94aa62", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00005.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -313,7 +313,7 @@ data: { "Id": "60f2dffe-33b8-4150-a8f8-bfe01edf5888", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00006.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -325,7 +325,7 @@ data: { "Id": "d0b67ee3-92b5-45e3-aab3-bbaa5ff0b3d0", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00007.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -337,7 +337,7 @@ data: { "Id": "0c6602db-9df4-48b5-b6e8-1d79b8a2da5a", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00008.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -349,7 +349,7 @@ data: { "Id": "d52278c7-75e5-4cb5-b8e4-0a75b83e9a2d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_00009.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -361,7 +361,7 @@ data: { "Id": "0272a394-cd2d-4f5a-824d-c05203d13476", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000010.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -373,7 +373,7 @@ data: { "Id": "5504c41e-8e0e-4f0c-87a5-0fb65b5ec1d7", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000011.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -385,7 +385,7 @@ data: { "Id": "4c031c34-5d25-4901-a406-1c0f4c74d43f", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000012.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -397,7 +397,7 @@ data: { "Id": "1d899306-832e-4761-9643-b49dfbfe7099", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000013.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -409,7 +409,7 @@ data: { "Id": "43a301f7-2a05-4c3f-8788-20319b1d89b0", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000014.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -421,7 +421,7 @@ data: { "Id": "af3dc991-bbd2-4641-bb57-dbe30d416fd3", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000015.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -433,7 +433,7 @@ data: { "Id": "6ec39fe1-308d-4c59-9a4b-285df2e45c18", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000016.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -445,7 +445,7 @@ data: { "Id": "a5317e19-6cc1-4e27-863e-36cfdaa6e6e1", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000017.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -457,7 +457,7 @@ data: { "Id": "7aa4e6de-5d38-41ac-b9e3-7235dcf163bb", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000018.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -469,7 +469,7 @@ data: { "Id": "e3f9a7f5-6750-4f5c-905b-839c8dbaa865", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000019.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -481,7 +481,7 @@ data: { "Id": "d8e4891b-d594-4181-ae68-4f69540ac25d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000020.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -493,7 +493,7 @@ data: { "Id": "c5d0a84b-f77f-493a-b1f5-0251693fcf44", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000021.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -505,7 +505,7 @@ data: { "Id": "e300f0a7-2874-470e-82c2-ef2532f6cf78", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000022.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -517,7 +517,7 @@ data: { "Id": "6c90059d-f7d4-4ef7-a0d1-1d609c3b9b33", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000023.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -529,7 +529,7 @@ data: { "Id": "2e8eb66d-56a7-44d8-8a06-c4381bcb13cc", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000024.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -541,7 +541,7 @@ data: { "Id": "e98ec900-c1d5-4c10-b77a-9d7a74b94586", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000025.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -553,7 +553,7 @@ data: { "Id": "bc54d2d5-7c95-4b64-a9ff-e7622f87fe4a", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000026.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -565,7 +565,7 @@ data: { "Id": "5ef3f370-42e9-4e30-8335-d2ac5f65f9b5", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000027.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -577,7 +577,7 @@ data: { "Id": "0a0b8909-2ac0-4092-af21-2e4b1694d13c", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000028.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -589,7 +589,7 @@ data: { "Id": "08cb4f16-9f29-4ab7-a9d0-0d4339d8af4b", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000029.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -601,7 +601,7 @@ data: { "Id": "37f86de2-0789-4425-a275-2c0382e4d6ab", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000030.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -613,7 +613,7 @@ data: { "Id": "6aa73531-69db-4cd5-bfc3-ec94f40ff82b", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000031.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -625,7 +625,7 @@ data: { "Id": "d3b9c07c-5036-4d90-863a-67ab7a16dcec", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000032.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -637,7 +637,7 @@ data: { "Id": "d062d97b-ee0c-4a32-a78f-3d203e02b8ae", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000033.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -649,7 +649,7 @@ data: { "Id": "d5a3ed41-d093-4e20-a095-880cfe2ef10d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000034.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -661,7 +661,7 @@ data: { "Id": "33d5b493-bc84-46a4-bc1e-21b8a93de8cc", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000035.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -673,7 +673,7 @@ data: { "Id": "f44f45b2-60db-498f-a94d-2a5f6a19fd34", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000036.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -685,7 +685,7 @@ data: { "Id": "e58e094d-0e0d-4a37-88b4-e7c62dc5b3d0", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000037.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -697,7 +697,7 @@ data: { "Id": "b15febb5-8fe3-4db7-8a4e-6bc6697f3e86", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000038.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -709,7 +709,7 @@ data: { "Id": "c316a95d-238d-4b89-89b2-bd5fd7bc1a93", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000039.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -721,7 +721,7 @@ data: { "Id": "bc32dce9-7bf0-40e0-b59e-f34df35ef874", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000040.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -733,7 +733,7 @@ data: { "Id": "0d1fbbec-575e-4996-8478-8f5de8bf6f42", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000041.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -745,7 +745,7 @@ data: { "Id": "b032e7cf-8b95-4d8d-9b90-b8d1bbfadcd5", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000042.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -757,7 +757,7 @@ data: { "Id": "a0ee78fc-d77a-4e2b-a44e-9b97eb41f1a0", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000043.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -769,7 +769,7 @@ data: { "Id": "4dbab04f-cb6d-49da-b457-033aa4479af3", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000044.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -781,7 +781,7 @@ data: { "Id": "bc9c4378-2271-4a87-9639-4bfa4325e018", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000045.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -793,7 +793,7 @@ data: { "Id": "2d7db682-69c6-4aaf-90dc-1d678165bc46", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000046.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -805,7 +805,7 @@ data: { "Id": "75943fb9-73ef-4bb5-8780-66eaf3727a8f", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000047.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -817,7 +817,7 @@ data: { "Id": "d6a1b147-8b5f-484a-aeff-b3ac0c9aa15c", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000048.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -829,7 +829,7 @@ data: { "Id": "6724ee31-fd22-4956-aaff-6fa20c0dd169", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000049.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -841,7 +841,7 @@ data: { "Id": "b57e90b5-68ae-44b2-9a3e-b8fe5d43843d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000050.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -853,7 +853,7 @@ data: { "Id": "d2911403-5f65-44d0-a54c-dbc3c33ad15d", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000051.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -865,7 +865,7 @@ data: { "Id": "a85f01c5-bcd3-4c0d-b75f-94f30b45c5d7", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000052.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -877,7 +877,7 @@ data: { "Id": "f88f66f5-18d1-47b4-a7c4-654e83d58b8f", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000053.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -889,7 +889,7 @@ data: { "Id": "82a20124-1d7b-4a2a-a6b4-701e956a0d50", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000054.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -901,7 +901,7 @@ data: { "Id": "f55e9d71-1c0b-4905-af8f-5ad5d44a4d7a", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000055.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -913,7 +913,7 @@ data: { "Id": "4d294f68-ea94-4199-9d40-280d3a77c55f", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000056.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -925,7 +925,7 @@ data: { "Id": "aae0e78d-2ba9-476d-9a42-9d00b1fbb56f", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000057.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -937,7 +937,7 @@ data: { "Id": "0d41b8f6-39e1-4b9a-b2b4-3ecab34581a7", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000058.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -949,7 +949,7 @@ data: { "Id": "d9bfc3c3-5b8b-418e-bf7c-c7b8181101c4", "Name": "DCS_01_S1A_20200105072204051312_ch1_DSDB_000059.raw", - "SessionID": "S1A_20200105072204051312", + "SessionId": "S1A_20200105072204051312", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -964,7 +964,7 @@ data: { "Id": "d9bfc3c3-5b8b-418e-bf7c-c7b8181101c6", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00000.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -976,7 +976,7 @@ data: { "Id": "a34bfc1c6-5b8b-418e-bf7c-c7b8181101c6", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00001.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -988,7 +988,7 @@ data: { "Id": "d9bfc3c3-5b8b-418e-bf7c-c7b8181101c5", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00002.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1000,7 +1000,7 @@ data: { "Id": "313f89f1-80d3-42eb-af21-6d4223f38106", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00003.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1012,7 +1012,7 @@ data: { "Id": "50929b2a-222a-4b36-b2d3-1525eb2cfb89", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00004.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1024,7 +1024,7 @@ data: { "Id": "60d9bc9a-28bc-4fbb-8ab8-c9e32ec62e92", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00005.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1036,7 +1036,7 @@ data: { "Id": "7566de96-f383-46da-b10e-7cc9e495ddc6", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00006.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1048,7 +1048,7 @@ data: { "Id": "b6818cb0-c6c3-4f37-a8db-1eb26b0dc4fb", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00007.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1060,7 +1060,7 @@ data: { "Id": "ce62b274-e1cc-4a42-a91b-2457802b04e2", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00008.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1072,7 +1072,7 @@ data: { "Id": "81d56de0-1e0c-4b40-9c7d-d9bf2ecfeaed", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_00009.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1084,7 +1084,7 @@ data: { "Id": "9848babe-8965-4c1d-8550-5c18cb5f799d", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000010.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1096,7 +1096,7 @@ data: { "Id": "a06e5a18-8c02-499f-91e8-271d97201762", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000011.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1108,7 +1108,7 @@ data: { "Id": "d21f43f2-c085-4a1e-a099-eb5b36738cbf", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000012.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1120,7 +1120,7 @@ data: { "Id": "f6f934d8-6df7-41a0-af7c-dc8a5dfec739", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000013.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1132,7 +1132,7 @@ data: { "Id": "6c697bb1-5a79-49db-85e8-e08f91e2e0e3", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000014.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1144,7 +1144,7 @@ data: { "Id": "bd01d4c4-870b-4881-b138-1202fbd0de6d", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000015.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1156,7 +1156,7 @@ data: { "Id": "c475d9ac-18d4-4e85-83af-2e8f16789b5b", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000016.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1168,7 +1168,7 @@ data: { "Id": "eaa624e3-c145-44b9-a10d-7d82555c2f52", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000017.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1180,7 +1180,7 @@ data: { "Id": "1615eaa2-3e5b-4517-903a-3cf1a11b7be3", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000018.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1192,7 +1192,7 @@ data: { "Id": "37efee68-0d17-4347-89c6-98de1c1a1c1a", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000019.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1204,7 +1204,7 @@ data: { "Id": "3dbef000-89de-4f20-9263-3f31b4c6b300", "Name": "DCS_02_S1A_20210410031928012345_ch2_DSDB_000020.raw", - "SessionID": "S1A_20210410031928012345", + "SessionId": "S1A_20210410031928012345", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1219,7 +1219,7 @@ data: { "Id": "2daef020-89de-4f20-9263-3f31b4c6b521", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00000.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1232,7 +1232,7 @@ data: { "Id": "b18f4207-0f41-4146-8467-2957ec5e1da5", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00001.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1244,7 +1244,7 @@ data: { "Id": "308fc586-bca8-46d3-9207-f32ef6b9e10c", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00002.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1256,7 +1256,7 @@ data: { "Id": "5ad8df1a-fd9b-4da0-a018-df9d326e6eb7", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00003.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1268,7 +1268,7 @@ data: { "Id": "6f7a4086-c53a-4d07-9e63-d77d4c3d2d43", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00004.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1280,7 +1280,7 @@ data: { "Id": "943cb6b9-5fc2-4b8a-bb59-224079eb9fd0", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00005.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1292,7 +1292,7 @@ data: { "Id": "c4d393c2-f5a7-4952-a87e-8be7df747c5d", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00006.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1304,7 +1304,7 @@ data: { "Id": "e1b7022e-1c27-4b0b-bae4-12a6edcd9d3c", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00007.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1316,7 +1316,7 @@ data: { "Id": "9cbbba76-840d-43ac-94f7-1dc3f0cf2c1d", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00008.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1328,7 +1328,7 @@ data: { "Id": "4fd74db0-7b8f-4aa0-9499-c138b13c5eac", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_00009.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1340,7 +1340,7 @@ data: { "Id": "a68fc860-e44f-40c1-a2d1-598070baaf16", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000010.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1352,7 +1352,7 @@ data: { "Id": "b6744463-fb44-4a41-bd25-df8d34b9dc68", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000011.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1364,7 +1364,7 @@ data: { "Id": "892e0da4-d8b9-44a1-8bfb-eb9c75e0eb39", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000012.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1376,7 +1376,7 @@ data: { "Id": "86a559a2-611e-4669-b07d-46dc537b30e7", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000013.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1388,7 +1388,7 @@ data: { "Id": "0c187493-665d-4580-a439-73fc4a92df1e", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000014.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1400,7 +1400,7 @@ data: { "Id": "e5b6c33f-cf9b-4f64-b23a-013ce1a4733a", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000015.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1412,7 +1412,7 @@ data: { "Id": "3bbf7e24-12e4-4708-801e-8a1c51f12c67", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000016.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1424,7 +1424,7 @@ data: { "Id": "ecb91aa1-659f-448d-9778-caba3987d49d", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000017.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1436,7 +1436,7 @@ data: { "Id": "18659f28-ccad-4f2f-95c2-803b29d9a91f", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000018.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1448,7 +1448,7 @@ data: { "Id": "7bbd1277-e05b-4cf7-a0aa-2e8fc55d6c35", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000019.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1460,7 +1460,7 @@ data: { "Id": "a3e63cc5-43d2-42d3-a587-2d327f7bda4d", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000020.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1472,7 +1472,7 @@ data: { "Id": "e7f0be9a-282d-4a47-a862-ebc70e6e2cf7", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000021.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1484,7 +1484,7 @@ data: { "Id": "d0919c0f-9150-4c9f-97fd-d8f1ec9c042b", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000022.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1496,7 +1496,7 @@ data: { "Id": "e98a5bfb-efcb-4033-871a-20c2a780d514", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000023.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1508,7 +1508,7 @@ data: { "Id": "12671ed0-1e6d-486d-ba57-bb30f6ab1cf2", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000024.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1520,7 +1520,7 @@ data: { "Id": "c5e1d87d-079f-4b6f-9ec7-9e65139f4c08", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000025.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1532,7 +1532,7 @@ data: { "Id": "951b4be8-7775-4148-8a3d-e459d0cfa29e", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000026.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1544,7 +1544,7 @@ data: { "Id": "fd1aeb40-e6ec-4ba5-90a4-872e20bba488", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000027.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1556,7 +1556,7 @@ data: { "Id": "df7bf2c1-d569-4869-a83d-50a5cb401d67", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000028.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1568,7 +1568,7 @@ data: { "Id": "9d054f1e-694d-4d7b-b3d3-971157f84b0b", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000029.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1580,7 +1580,7 @@ data: { "Id": "a3c0b04d-7b2a-4d95-85db-c23c6f855cb1", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000030.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1592,7 +1592,7 @@ data: { "Id": "f5d00cc0-c58b-4323-a50c-fb3815c0850f", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000031.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1604,7 +1604,7 @@ data: { "Id": "cf5791d3-0e78-4c22-ba6e-78de9e6a68d2", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000032.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1616,7 +1616,7 @@ data: { "Id": "a6f47751-38d3-4fc9-9bc5-7508a028303b", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000033.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1628,7 +1628,7 @@ data: { "Id": "b1a9c1bb-9258-4ae7-bc0b-389fe7645b65", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000034.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1640,7 +1640,7 @@ data: { "Id": "f900b62a-b832-4858-9b5b-9644a13b049b", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000035.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1652,7 +1652,7 @@ data: { "Id": "a138f4cd-fb86-4684-8052-7c51c71e04a7", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000036.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1664,7 +1664,7 @@ data: { "Id": "74b418f1-5416-493f-8f41-7e58aa290fe3", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000037.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1676,7 +1676,7 @@ data: { "Id": "8e5c22fd-5cd3-40a3-8a16-646c66d12db9", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000038.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1688,7 +1688,7 @@ data: { "Id": "871df90b-4f14-4d63-a172-df44b6ae418c", "Name": "DCS_02_S1A_20220715090550123456_ch1_DSDB_000039.raw", - "SessionID": "S1A_20220715090550123456", + "SessionId": "S1A_20220715090550123456", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -1702,7 +1702,7 @@ data: { "Id": "71d798f1-27ab-451b-b676-06e54bf5374c", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00000.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1714,7 +1714,7 @@ data: { "Id": "f6386d7d-2da3-4ab4-bd5a-d0ac83d485f4", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00001.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1726,7 +1726,7 @@ data: { "Id": "98283a43-5b3b-4b05-b801-26e0b41e2a2e", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00002.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1738,7 +1738,7 @@ data: { "Id": "5e11fbdc-2e17-4f9e-88bc-90e6e8bc2b7c", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00003.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1750,7 +1750,7 @@ data: { "Id": "2982a5bf-eb0f-434e-834d-5fcf870f2401", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00004.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1762,7 +1762,7 @@ data: { "Id": "54b369b1-0b71-4e52-bdc9-0bc1fe62237f", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00005.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1774,7 +1774,7 @@ data: { "Id": "5e623d10-c8dc-41e6-9f5d-20a9c4de465a", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00006.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1786,7 +1786,7 @@ data: { "Id": "fe50b9e3-7eaf-4d0b-9e80-504cd51e80b7", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00007.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1798,7 +1798,7 @@ data: { "Id": "ae9a97b7-1743-48b7-b49c-8620e62c89f4", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00008.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1810,7 +1810,7 @@ data: { "Id": "16876b25-37ff-41db-9ad9-e24a1c3b930d", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_00009.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1822,7 +1822,7 @@ data: { "Id": "4cb3f7d2-3b7b-4ff6-ae95-b6c0b20c44ed", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000010.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1834,7 +1834,7 @@ data: { "Id": "1ac6a6b1-c2ec-4d4d-9c7f-c2faa389e9f2", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000011.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1846,7 +1846,7 @@ data: { "Id": "94d1b88b-6898-4b5f-b6fb-7786e582fa50", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000012.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1858,7 +1858,7 @@ data: { "Id": "ff58c2cf-bf62-4c32-9e3c-c8ac7a73fbad", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000013.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1870,7 +1870,7 @@ data: { "Id": "1f66513b-79e7-4541-85da-735e74198d1e", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000014.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1882,7 +1882,7 @@ data: { "Id": "f23d8d51-6c61-40a1-b225-8682ae7ff0f4", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000015.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1894,7 +1894,7 @@ data: { "Id": "df7e0878-1ff0-4e8c-bc19-9d18602aa3ae", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000016.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1906,7 +1906,7 @@ data: { "Id": "bc39237c-4434-44bb-97f8-7ee69d2f1fa6", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000017.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1918,7 +1918,7 @@ data: { "Id": "01f0bbd9-89b8-46cd-9e6b-1db295091a1a", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000018.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1930,7 +1930,7 @@ data: { "Id": "0dc292e2-17b3-41b7-b1ed-bb89356e8d35", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000019.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1942,7 +1942,7 @@ data: { "Id": "f2a7d045-f8a5-4f9f-a29c-3e2d38d9d7e9", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000020.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1954,7 +1954,7 @@ data: { "Id": "cd750f2c-bd20-4bb4-9bcb-f2d16aefbd5d", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000021.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1966,7 +1966,7 @@ data: { "Id": "8fdcd3f3-55a1-4d40-95e0-b0118f07e524", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000022.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1978,7 +1978,7 @@ data: { "Id": "582b31b3-239e-4648-9ab9-3f5d14af03c5", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000023.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -1990,7 +1990,7 @@ data: { "Id": "85500e9d-05b3-4a5b-8248-812272382cb1", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000024.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2002,7 +2002,7 @@ data: { "Id": "6aaad282-b70b-4b02-8d8a-5759ab831ff7", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000025.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2014,7 +2014,7 @@ data: { "Id": "3b7b1e29-99e4-4f5c-b4cd-0fdcfbb857a6", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000026.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2026,7 +2026,7 @@ data: { "Id": "224a4e28-65a2-4d22-940b-678d5d7e4b42", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000027.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2038,7 +2038,7 @@ data: { "Id": "aa77f792-4884-4763-ae19-7d9533fdd680", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000028.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2050,7 +2050,7 @@ data: { "Id": "04263d1c-46bc-4d27-81c0-27a92717f0e4", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000029.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2062,7 +2062,7 @@ data: { "Id": "f1c054eb-90fb-4797-b3a5-70bcfe1e9f3c", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000030.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2074,7 +2074,7 @@ data: { "Id": "3d2f6eb3-e6d4-4054-a200-d0c73ba3d556", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000031.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2086,7 +2086,7 @@ data: { "Id": "fc6d6abf-32dc-4426-a482-26cadd18ec4d", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000032.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2098,7 +2098,7 @@ data: { "Id": "d526964f-c25a-4f81-a320-4dfe18f71f9c", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000033.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2110,7 +2110,7 @@ data: { "Id": "4d3200b0-c9a4-4e70-82b3-1df200d1426c", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000034.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2122,7 +2122,7 @@ data: { "Id": "e64227b1-c6fb-4b2c-a79a-49996f892d5e", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000035.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2134,7 +2134,7 @@ data: { "Id": "43df028a-31a5-4f03-a7bb-7407ac65b31f", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000036.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2146,7 +2146,7 @@ data: { "Id": "a885ff4e-b073-4d4c-9d0a-41cdd8c23840", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000037.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2158,7 +2158,7 @@ data: { "Id": "f01b8a0f-eed2-43ff-8c4b-78a3704e69a5", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000038.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2170,7 +2170,7 @@ data: { "Id": "e56df07b-89b7-439b-a14a-761a54f3d944", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000039.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2182,7 +2182,7 @@ data: { "Id": "b34b32b7-1538-40b1-a2fc-91d9a62cc5bc", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000040.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2194,7 +2194,7 @@ data: { "Id": "02e373a9-f208-47e2-af60-60a6a7e9e174", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000041.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2206,7 +2206,7 @@ data: { "Id": "2f5a784d-46b3-4681-9cf0-3f22f4ffad0d", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000042.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2218,7 +2218,7 @@ data: { "Id": "37040a4b-6012-45a2-bcd1-0a24d03d11bc", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000043.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2230,7 +2230,7 @@ data: { "Id": "1e7f8a4f-46ad-4781-b79a-2d480a0d2fe0", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000044.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2242,7 +2242,7 @@ data: { "Id": "0e95e08e-531a-4a89-8b42-e81fb5b4a05a", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000045.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2254,7 +2254,7 @@ data: { "Id": "c7d0a7e7-03d3-4658-8901-d9f75bc32d70", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000046.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2266,7 +2266,7 @@ data: { "Id": "7d2a7892-9fa1-4c7f-bb3f-e4cf5b7d0b47", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000047.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2278,7 +2278,7 @@ data: { "Id": "26b1be6a-61ef-4535-aeec-4bf3b5f96fb8", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000048.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2290,7 +2290,7 @@ data: { "Id": "4f5a34d9-2dc2-45b8-bfb0-2e84e6490ee6", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000049.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2302,7 +2302,7 @@ data: { "Id": "146fe1a4-6bcb-4a9e-b147-9e99ed14df8f", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000050.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2314,7 +2314,7 @@ data: { "Id": "50e156b2-8d42-4db3-98e9-52a45a4e3fd7", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000051.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2326,7 +2326,7 @@ data: { "Id": "1cb18416-bf5c-4a47-bdbb-32b6d61b24b3", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000052.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2338,7 +2338,7 @@ data: { "Id": "0c4bf1e9-7b6b-4574-a5b5-374df51c5ae3", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000053.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2350,7 +2350,7 @@ data: { "Id": "121b5e18-202d-4a08-8aee-16620910a7ab", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000054.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2362,7 +2362,7 @@ data: { "Id": "a52f2f88-16e4-4858-b7a3-125c08d86df9", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000055.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2374,7 +2374,7 @@ data: { "Id": "e3d8bb82-248a-4f24-ae32-8c23fe45c44b", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000056.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2386,7 +2386,7 @@ data: { "Id": "9b3050df-19e3-4f96-a43e-1e6c4c8a54e3", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000057.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2398,7 +2398,7 @@ data: { "Id": "bdf495ff-cfdc-44de-bd5d-9b2341a69c31", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000058.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2410,7 +2410,7 @@ data: { "Id": "7f35b3c5-ae1d-445b-b152-0cb6488f73e9", "Name": "DCS_02_S1A_20231120061537234567_ch2_DSDB_000059.raw", - "SessionID": "S1A_20231120061537234567", + "SessionId": "S1A_20231120061537234567", "Channel": 2, "BlockNumber": 1, "FinalBlock": false, @@ -2422,7 +2422,7 @@ data: { "Id": "axd19d2f-29eb-4c18-bc1f-bf2769a3a16d", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00001.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2434,7 +2434,7 @@ data: { "Id": "a9c84e5d-3fbc-4a7d-8b2e-6d135c9e8af1", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00002.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2446,7 +2446,7 @@ data: { "Id": "f2e9d6c4-7a1b-4e3f-8d5c-2b6a98fc73e4", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00003.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2458,7 +2458,7 @@ data: { "Id": "b1a32d4f-6c87-8e5b-1f9a-3e4d7f2c6b5a", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00004.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2470,7 +2470,7 @@ data: { "Id": "d3b5f1e7-9a2c-8b6d-4e6c-7f28a51d39c4", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00005.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2482,7 +2482,7 @@ data: { "Id": "c8f9a7b3-1d2e-6f4a-9e5d-7c68b2513fda", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00006.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2494,7 +2494,7 @@ data: { "Id": "1e4b3a2d-5c6f-9d8e-4f7c-1a9b2d3e4f5", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00007.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2506,7 +2506,7 @@ data: { "Id": "6d3a2b1c-4e8f-5b6d-2a9c-7f81e9d3a2b", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00008.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2518,7 +2518,7 @@ data: { "Id": "9c2f8e3d-6b7a-1d5c-9f4e-3b1a7c8d2f9", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00009.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2530,7 +2530,7 @@ data: { "Id": "7f2e3c4d-6b8a-9f1e-5d7c-3a2b4f6e8d", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00010.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2542,7 +2542,7 @@ data: { "Id": "a6d4b8e2-7c1f-5a3b-6d9c-2f8e1a7d4b", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00011.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2554,7 +2554,7 @@ data: { "Id": "3f2b1d7e-4c8a-6f9b-5d2c-3e4a5f2b1d", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00012.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2566,7 +2566,7 @@ data: { "Id": "2d1f5b8c-6e7a-9d4b-3c8e-1f2d6a9b4c", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00013.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2578,7 +2578,7 @@ data: { "Id": "4e3c1a7b-9d6f-2e5c-3a4b-7d8f9a2c1ed", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00014.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2590,7 +2590,7 @@ data: { "Id": "b5e9c7d2-4a6f-1b3e-7d5f-9a2c8e4b6d", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00015.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2602,7 +2602,7 @@ data: { "Id": "e3f6b2d9-1c5a-8d7b-4e3f-6a9c1d2e4f", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00016.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2614,7 +2614,7 @@ data: { "Id": "c2b8a1d-4f6e-9c5b-3a2d-8f7e1c2b3a", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00017.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2626,7 +2626,7 @@ data: { "Id": "8a7f1e5c-4d3b-6a8f-2e7c-1d9b8a7f1e", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00018.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2638,7 +2638,7 @@ data: { "Id": "d2b4c6e8-1f9a-7d3b-5c2d-8f4e6a2b4c", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00019.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, @@ -2650,7 +2650,7 @@ data: { "Id": "f7e4d1b8-3c5a-2d4b-6f7e-9a1c3d5b8f", "Name": "DCS_01_S2B_20231117170332034987_ch2_DSDB_00020.raw", - "SessionID": "S2B_20231117033237234567", + "SessionId": "S2B_20231117033237234567", "Channel": 1, "BlockNumber": 1, "FinalBlock": false, diff --git a/charts/mockup-station-cadip/values.yaml b/charts/mockup-station-cadip/values.yaml index 62a3de2..8ce2ef5 100644 --- a/charts/mockup-station-cadip/values.yaml +++ b/charts/mockup-station-cadip/values.yaml @@ -74,7 +74,7 @@ image: # -- Image name name: rs-testmeans_cadip-station-mock # -- Image version, can be a tag or a digest - version: sha256:c5969ba8420f39c90125a527bd9eb79723b6129fbf7859c54fcfea98271b848e + version: sha256:4831636c5adfee6cfc809bdeb25e361e084ddeb49e3aaaacca54a1b7be2137a9 # -- Image pull policy PullPolicy: Always #imagePullSecrets: regcred diff --git a/charts/mockup-station-lta/README.md b/charts/mockup-station-lta/README.md index 3d03f69..fb6a168 100644 --- a/charts/mockup-station-lta/README.md +++ b/charts/mockup-station-lta/README.md @@ -24,7 +24,7 @@ MOCKUP STATION LTA | image.name | string | `"rs-testmeans_lta-station-mock"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"sha256:1a9fbc48f08304b0e403ea733297b647396dd520130567738b8f417cb9492223"` | Image version, can be a tag or a digest | +| image.version | string | `"sha256:bb525c9ac981358fb483ac0db9543496b8c1add84664faa88885d3d80e97d978"` | Image version, can be a tag or a digest | | namespace | string | `"processing"` | Namespace for the deployment | | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe | | probe.liveness.path | string | `"/health"` | Path for the liveness probe | diff --git a/charts/mockup-station-lta/values.yaml b/charts/mockup-station-lta/values.yaml index d08c906..d6a986c 100644 --- a/charts/mockup-station-lta/values.yaml +++ b/charts/mockup-station-lta/values.yaml @@ -66,7 +66,7 @@ image: # -- Image name name: rs-testmeans_lta-station-mock # -- Image version, can be a tag or a digest - version: sha256:1a9fbc48f08304b0e403ea733297b647396dd520130567738b8f417cb9492223 + version: sha256:bb525c9ac981358fb483ac0db9543496b8c1add84664faa88885d3d80e97d978 # -- Image pull policy PullPolicy: Always #imagePullSecrets: regcred diff --git a/charts/rs-server-adgs/README.md b/charts/rs-server-adgs/README.md index b22cccb..21c8a13 100644 --- a/charts/rs-server-adgs/README.md +++ b/charts/rs-server-adgs/README.md @@ -35,7 +35,7 @@ RS SERVER ADGS | image.name | string | `"rs-server-adgs"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest | +| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest | | ingress.enabled | bool | `true` | Enabled/Disable ingress | | ingress.host | string | `"subdomain.example.com"` | Ingress host name | | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name | diff --git a/charts/rs-server-adgs/templates/configmap.yaml b/charts/rs-server-adgs/templates/configmap.yaml index ee7fd0d..a1323b0 100644 --- a/charts/rs-server-adgs/templates/configmap.yaml +++ b/charts/rs-server-adgs/templates/configmap.yaml @@ -44,7 +44,7 @@ data: username: PLACEHOLDER password: PLACEHOLDER headers: - Content-Type: PLACEHOLDER + Content-Type: application/x-www-form-urlencoded products: CAMS_GRF_AUX: productType: cams-ads-grf-aux @@ -52,7 +52,7 @@ data: type: ODataV4Search api_endpoint: {{ $v.endpoint.url }} need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -86,7 +86,7 @@ data: - $.PublicationDate ChecksumValue: - null - - $.Checksum[0].Value + - '{$.Checksum[0].Value#to_lower}' attr_ptype: - null - $.attr_ptype @@ -111,7 +111,7 @@ data: free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - contains(Name, '{Name}') @@ -130,12 +130,12 @@ data: sort_param_mapping: id: Name auxip:id: Id - created: PublicationDate - end_datetime: End file:size: ContentLength type: ContentType eviction_datetime: EvictionDate - published: PublicationDate + start_datetime: ContentDate/Start + end_datetime: ContentDate/End + created: PublicationDate sort_order_mapping: ascending: asc descending: desc @@ -170,7 +170,7 @@ data: type: ODataV4Search api_endpoint: {{ $v.endpoint.url }} need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -204,7 +204,7 @@ data: - $.PublicationDate ChecksumValue: - null - - $.Checksum[0].Value + - '{$.Checksum[0].Value#to_lower}' attr_ptype: - null - $.attr_ptype @@ -229,7 +229,7 @@ data: free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - contains(Name, '{Name}') @@ -246,14 +246,14 @@ data: sort: sort_by_tpl: '&$orderby={sort_param} {sort_order}' sort_param_mapping: - id: Name - auxip:id: Id - created: PublicationDate - end_datetime: End file:size: ContentLength type: ContentType eviction_datetime: EvictionDate - published: PublicationDate + start_datetime: ContentDate/Start + end_datetime: ContentDate/End + id: Name + auxip:id: Id + created: PublicationDate sort_order_mapping: ascending: asc descending: desc diff --git a/charts/rs-server-adgs/values.yaml b/charts/rs-server-adgs/values.yaml index b542bc6..01b67f9 100644 --- a/charts/rs-server-adgs/values.yaml +++ b/charts/rs-server-adgs/values.yaml @@ -167,7 +167,7 @@ image: # -- Image name name: rs-server-adgs # -- Image version, can be a tag or a digest - version: 0.2a6.post1.dev0 + version: 0.2a7 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred diff --git a/charts/rs-server-cadip/README.md b/charts/rs-server-cadip/README.md index a6b935d..102345a 100644 --- a/charts/rs-server-cadip/README.md +++ b/charts/rs-server-cadip/README.md @@ -17,12 +17,11 @@ RS SERVER CADIP | affinity | object | `{}` | Pod affinity | | app.cadipSearchConfigFile | string | `"cadip_search_config.yaml"` | Cadip search configuration file for the application | | app.confDir | string | `"/app/conf"` | Config directory for the application | -| app.eodagConfigFile | string | `"cadip_ws_config.yaml"` | Set properly the EODAG_ADGS_CONFIG env var. | +| app.eodagConfigFile | string | `"cadip_ws_config.yaml"` | Set properly the EODAG_CADIP_CONFIG env var. | | app.eodagConfigFileTokenModule | string | `"cadip_ws_config_token_module.yaml"` | | | app.port | int | `8000` | Port for the application | -| app.station.cadip | object | `{"endpoint":{"url":{"file":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files","root":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","session":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions"}}}` | CADIP station name | -| app.station.cadip.endpoint.url | object | `{"file":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files","root":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","session":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions"}` | CADIP station URL | -| app.stationConfigFile | string | `"stations_cfg.json"` | Station configuration file for the application | +| app.station.cadip | object | `{"endpoint":{"url":{"odata":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","token":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token"}}}` | CADIP station name | +| app.station.cadip.endpoint.url | object | `{"odata":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","token":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token"}` | CADIP station URL | | app.uacURL | string | `"http://apikeymanager.processing.svc.cluster.local:8000/auth/check_key"` | URL of the API Key Manager service | | app.useTokenModule | bool | `true` | allow EODAG to handle it (set it to false for EODAG). | | app.workDir | string | `"/app"` | Working directory for the application | @@ -35,7 +34,7 @@ RS SERVER CADIP | image.name | string | `"rs-server-cadip"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest | +| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest | | ingress.enabled | bool | `true` | Enabled/Disable ingress | | ingress.host | string | `"subdomain.example.com"` | Ingress host name | | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name | diff --git a/charts/rs-server-cadip/templates/configmap.yaml b/charts/rs-server-cadip/templates/configmap.yaml index d0f53a0..de8f4ca 100644 --- a/charts/rs-server-cadip/templates/configmap.yaml +++ b/charts/rs-server-cadip/templates/configmap.yaml @@ -32,7 +32,7 @@ data: {{ $k }}: auth: type: TokenAuth - auth_uri: {{ $v.endpoint.url.root }}/oauth2/token + auth_uri: {{ $v.endpoint.url.token }} token_type: json token_key: access_token request_method: POST @@ -46,16 +46,16 @@ data: username: PLACEHOLDER password: PLACEHOLDER headers: - Content-Type: PLACEHOLDER + Content-Type: application/x-www-form-urlencoded products: S1_SAR_RAW: productType: RAW collection: Sentinel1 search: type: ODataV4Search - api_endpoint: {{ $v.endpoint.url.file }} + api_endpoint: {{ $v.endpoint.url.odata }}/Files need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -65,10 +65,10 @@ data: - $.Name SessionIds: - null - - $.SessionID - SessionID: + - $.SessionId + SessionId: - null - - $.SessionID + - $.SessionId Channel: - null - $.Channel @@ -98,18 +98,18 @@ data: - $.PublicationDate href: - null - - {{ $v.endpoint.url.file }}({id})/$value + - {{ $v.endpoint.url.odata }}/Files({id})/$value geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)) - downloadLink: {{ $v.endpoint.url.file }}({id})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Files({id})/$value title: $.Name free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - - SessionID in {SessionIds} - - SessionID eq {SessionID} + - SessionId in ({SessionIds}) + - SessionId eq {SessionId} - PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime} - PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime} pagination: @@ -126,14 +126,14 @@ data: max_sort_params: 1 download: type: HTTPDownload - base_uri: {{ $v.endpoint.url.file }} + base_uri: {{ $v.endpoint.url.odata }}/Files metadata_mapping: uid: $.Id - downloadLink: {{ $v.endpoint.url.file }}({uid})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Files({uid})/$value {{ $k }}_session: auth: type: TokenAuth - auth_uri: {{ $v.endpoint.url.root }}/oauth2/token + auth_uri: {{ $v.endpoint.url.token }} token_type: json token_key: access_token request_method: POST @@ -147,16 +147,16 @@ data: username: PLACEHOLDER password: PLACEHOLDER headers: - Content-Type: PLACEHOLDER + Content-Type: application/x-www-form-urlencoded products: S1_SAR_RAW: productType: RAW collection: Sentinel1 search: type: ODataV4Search - api_endpoint: {{ $v.endpoint.url.session }} + api_endpoint: {{ $v.endpoint.url.odata }}/Sessions need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -235,21 +235,22 @@ data: - $.PublicationDate href: - null - - {{ $v.endpoint.url.file }}({id})/$value + - {{ $v.endpoint.url.odata }}/Sessions({id})/$value geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)) title: $.Name free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - - SessionId in {SessionIds} + - SessionId in ({SessionIds}) - SessionId eq {SessionId} - Satellite eq {platform} - - Satellite in {platforms} + - Satellite in ({platforms}) - PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime} - PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime} + - Retransfer eq {Retransfer} pagination: max_items_per_page: 1000 next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}' @@ -277,16 +278,19 @@ data: cadip:planned_data_stop: PlannedDataStop cadip:downlink_status_ok: DownlinkStatusOK cadip:delivery_push_ok: DeliveryPushOK + startTimeFromAscendingNode: DownlinkStart + completionTimeFromAscendingNode: DownlinkStop + publicationDate: PublicationDate sort_order_mapping: ascending: asc descending: desc max_sort_params: 1 download: type: HTTPDownload - base_uri: {{ $v.endpoint.url.session }} + base_uri: {{ $v.endpoint.url.odata }}/Sessions metadata_mapping: uid: $.Id - downloadLink: {{ $v.endpoint.url.session }}({uid})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Sessions({uid})/$value {{ end }} --- apiVersion: v1 @@ -310,9 +314,9 @@ data: collection: Sentinel1 search: type: ODataV4Search - api_endpoint: {{ $v.endpoint.url.file }} + api_endpoint: {{ $v.endpoint.url.odata }}/Files need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -322,10 +326,10 @@ data: - $.Name SessionIds: - null - - $.SessionID - SessionID: + - $.SessionId + SessionId: - null - - $.SessionID + - $.SessionId Channel: - null - $.Channel @@ -355,18 +359,18 @@ data: - $.PublicationDate href: - null - - {{ $v.endpoint.url.file }}({id})/$value + - {{ $v.endpoint.url.odata }}/Files({id})/$value geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)) - downloadLink: {{ $v.endpoint.url.file }}({id})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Files({id})/$value title: $.Name free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - - SessionID in {SessionIds} - - SessionID eq {SessionID} + - SessionId in ({SessionIds}) + - SessionId eq {SessionId} - PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime} - PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime} pagination: @@ -383,10 +387,10 @@ data: max_sort_params: 1 download: type: HTTPDownload - base_uri: {{ $v.endpoint.url.file }} + base_uri: {{ $v.endpoint.url.odata }}/Files metadata_mapping: uid: $.Id - downloadLink: {{ $v.endpoint.url.file }}({uid})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Files({uid})/$value {{ $k }}_session: auth: type: HTTPHeaderAuth @@ -400,9 +404,9 @@ data: collection: Sentinel1 search: type: ODataV4Search - api_endpoint: {{ $v.endpoint.url.session }} + api_endpoint: {{ $v.endpoint.url.odata }}/Sessions need_auth: true - results_entry: responses | $ + results_entry: $.value | $ metadata_mapping: id: - null @@ -481,21 +485,22 @@ data: - $.PublicationDate href: - null - - {{ $v.endpoint.url.file }}({id})/$value + - {{ $v.endpoint.url.odata }}/Files({id})/$value geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)) title: $.Name free_text_search_operations: $filter: union: ' OR ' - wrapper: '"{}"' + wrapper: '{}' operations: and: - - SessionId in {SessionIds} + - SessionId in ({SessionIds}) - SessionId eq {SessionId} - Satellite eq {platform} - - Satellite in {platforms} + - Satellite in ({platforms}) - PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime} - PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime} + - Retransfer eq {Retransfer} pagination: max_items_per_page: 1000 next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}' @@ -523,16 +528,18 @@ data: cadip:planned_data_stop: PlannedDataStop cadip:downlink_status_ok: DownlinkStatusOK cadip:delivery_push_ok: DeliveryPushOK + startTimeFromAscendingNode: DownlinkStart + completionTimeFromAscendingNode: DownlinkStop sort_order_mapping: ascending: asc descending: desc max_sort_params: 1 download: type: HTTPDownload - base_uri: {{ $v.endpoint.url.session }} + base_uri: {{ $v.endpoint.url.odata }}/Files metadata_mapping: uid: $.Id - downloadLink: {{ $v.endpoint.url.session }}({uid})/$value + downloadLink: {{ $v.endpoint.url.odata }}/Files({uid})/$value {{ end }} --- apiVersion: v1 diff --git a/charts/rs-server-cadip/values.yaml b/charts/rs-server-cadip/values.yaml index fec3292..3bd9de5 100644 --- a/charts/rs-server-cadip/values.yaml +++ b/charts/rs-server-cadip/values.yaml @@ -29,13 +29,11 @@ app: workDir: /app # -- Config directory for the application confDir: /app/conf - # -- Station configuration file for the application - stationConfigFile: stations_cfg.json # -- Cadip search configuration file for the application cadipSearchConfigFile: cadip_search_config.yaml - # -- EODAG configuration file for the application. If useTokenModule is true the adgs_ws_config_token_module.yaml - # -- shall be used. When useTokenModule is false, the adgs_ws_config.yaml shall be used. - # -- Set properly the EODAG_ADGS_CONFIG env var. + # -- EODAG configuration file for the application. If useTokenModule is true the cadip_ws_config_token_module.yaml + # -- shall be used. When useTokenModule is false, the cadip_ws_config.yaml shall be used. + # -- Set properly the EODAG_CADIP_CONFIG env var. eodagConfigFile: cadip_ws_config.yaml eodagConfigFileTokenModule: cadip_ws_config_token_module.yaml # -- The method for loading the token for external stations: use the custom module or @@ -47,23 +45,20 @@ app: endpoint: # -- CADIP station URL url: - root: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080 - file: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files - session: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions + token: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token + odata: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080 # @ignored sgs: endpoint: url: - root: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080 - file: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Files - session: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Sessions + token: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/oauth2/token + odata: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080 # @ignored mti: endpoint: url: - root: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080 - file: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Files - session: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Sessions + token: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/oauth2/token + odata: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080 # -- URL of the API Key Manager service uacURL: http://apikeymanager.processing.svc.cluster.local:8000/auth/check_key @@ -183,7 +178,7 @@ image: # -- Image name name: rs-server-cadip # -- Image version, can be a tag or a digest - version: 0.2a6.post1.dev0 + version: 0.2a7 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred diff --git a/charts/rs-server-catalog/README.md b/charts/rs-server-catalog/README.md index 5a1a815..1ced620 100644 --- a/charts/rs-server-catalog/README.md +++ b/charts/rs-server-catalog/README.md @@ -31,7 +31,7 @@ RS SERVER CATALOG | image.name | string | `"rs-server-catalog"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest | +| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest | | ingress.enabled | bool | `true` | Enabled/Disable ingress | | ingress.host | string | `"subdomain.example.com"` | Ingress host name | | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name | diff --git a/charts/rs-server-catalog/values.yaml b/charts/rs-server-catalog/values.yaml index 006c53c..89ae712 100644 --- a/charts/rs-server-catalog/values.yaml +++ b/charts/rs-server-catalog/values.yaml @@ -89,7 +89,7 @@ image: # -- Image name name: rs-server-catalog # -- Image version, can be a tag or a digest - version: 0.2a6.post1.dev0 + version: 0.2a7 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred diff --git a/charts/rs-server-frontend/README.md b/charts/rs-server-frontend/README.md index e492551..1ca1cb2 100644 --- a/charts/rs-server-frontend/README.md +++ b/charts/rs-server-frontend/README.md @@ -22,7 +22,7 @@ RS SERVER FRONTEND | image.name | string | `"rs-server-frontend"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest | +| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest | | ingress.enabled | bool | `true` | Enabled/Disable ingress | | ingress.host | string | `"subdomain.example.com"` | Ingress host name | | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name | diff --git a/charts/rs-server-frontend/values.yaml b/charts/rs-server-frontend/values.yaml index fb3ec17..bf3b945 100644 --- a/charts/rs-server-frontend/values.yaml +++ b/charts/rs-server-frontend/values.yaml @@ -64,7 +64,7 @@ image: # -- Image name name: rs-server-frontend # -- Image version, can be a tag or a digest - version: 0.2a6.post1.dev0 + version: 0.2a7 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred diff --git a/charts/rs-server-staging/README.md b/charts/rs-server-staging/README.md index 521f794..5cc5e06 100644 --- a/charts/rs-server-staging/README.md +++ b/charts/rs-server-staging/README.md @@ -15,6 +15,7 @@ RS SERVER STAGING | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | Pod affinity | +| app.catalogBucket | string | `"rs-cluster-catalog"` | Object Storage bucket for the catalog | | app.confDir | string | `"/app/conf"` | Config directory for the application | | app.docsUrl | string | `"/docs"` | URL suffix for the application. The same value should also be included into ingress.path | | app.endpointCatalog | string | `"http://rs-server-catalog-svc.processing.svc.cluster.local:8080"` | Catalog pod address | @@ -34,7 +35,7 @@ RS SERVER STAGING | image.name | string | `"rs-server-staging"` | Image name | | image.registry | string | `"ghcr.io"` | Image registry | | image.repository | string | `"rs-python"` | Image repository | -| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest | +| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest | | ingress.enabled | bool | `true` | Enabled/Disable ingress | | ingress.host | string | `"subdomain.example.com"` | Ingress host name | | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name | diff --git a/charts/rs-server-staging/templates/deployment.yaml b/charts/rs-server-staging/templates/deployment.yaml index 95ad3ea..763a4af 100644 --- a/charts/rs-server-staging/templates/deployment.yaml +++ b/charts/rs-server-staging/templates/deployment.yaml @@ -73,6 +73,8 @@ spec: value: {{ .Values.dask.gateway_auth_type }} - name: RSPY_HOST_CATALOG value: {{ .Values.app.endpointCatalog }} + - name: RSPY_CATALOG_BUCKET + value: {{ .Values.app.catalogBucket }} - name: POSTGRES_PORT value: {{ .Values.postgres.port | quote }} - name: POSTGRES_DB @@ -159,4 +161,4 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - revisionHistoryLimit: 10 \ No newline at end of file + revisionHistoryLimit: 10 diff --git a/charts/rs-server-staging/values.yaml b/charts/rs-server-staging/values.yaml index 006adb5..6354d68 100644 --- a/charts/rs-server-staging/values.yaml +++ b/charts/rs-server-staging/values.yaml @@ -35,6 +35,8 @@ app: uacHomeUrl: https://apikeymanager.subdomain.example.com/docs # -- Catalog pod address endpointCatalog: http://rs-server-catalog-svc.processing.svc.cluster.local:8080 + # -- Object Storage bucket for the catalog + catalogBucket: rs-cluster-catalog # -- List of configured stations (expect a secret with the same name) station: adgs: @@ -170,7 +172,7 @@ image: # -- Image name name: rs-server-staging # -- Image version, can be a tag or a digest - version: 0.2a6.post1.dev0 + version: 0.2a7 # -- Image pull policy PullPolicy: IfNotPresent #imagePullSecrets: regcred @@ -204,4 +206,4 @@ resources: tempo: # -- Grafana tempo endpoint. - endpoint: http://grafana-tempo-distributor.logging.svc.cluster.local:4317 \ No newline at end of file + endpoint: http://grafana-tempo-distributor.logging.svc.cluster.local:4317