From e7d98bfd4851fc8b1b9a9fb5c7f3eb178fb87ec4 Mon Sep 17 00:00:00 2001 From: Krzysztof Findeisen Date: Mon, 16 Dec 2024 12:11:15 -0800 Subject: [PATCH 1/3] Fix corrupted config in Prompt Processing LATISS. Long lines containing {} get reformatted (incorrectly) by Argo. --- .../values-usdfprod-prompt-processing.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/prompt-proto-service-latiss/values-usdfprod-prompt-processing.yaml b/applications/prompt-proto-service-latiss/values-usdfprod-prompt-processing.yaml index 2fc9f5ae6a..fe34b10d15 100644 --- a/applications/prompt-proto-service-latiss/values-usdfprod-prompt-processing.yaml +++ b/applications/prompt-proto-service-latiss/values-usdfprod-prompt-processing.yaml @@ -33,8 +33,10 @@ prompt-proto-service: - {survey: cwfs, pipelines: []} - {survey: cwfs-focus-sweep, pipelines: []} - {survey: spec-survey, pipelines: []} - - {survey: BLOCK-271, pipelines: []} # photon transfer curve calibrations - - {survey: BLOCK-295, pipelines: []} # the daily calibration sequence as of May 27, 2024 + # photon transfer curve calibrations + - {survey: BLOCK-271, pipelines: []} + # the daily calibration sequence as of May 27, 2024 + - {survey: BLOCK-295, pipelines: []} - {survey: "", pipelines: []} preprocessing: |- - survey: BLOCK-306 From 8691618f8c1a93e863bab04e7602429e656a3a4d Mon Sep 17 00:00:00 2001 From: Krzysztof Findeisen Date: Mon, 16 Dec 2024 12:14:47 -0800 Subject: [PATCH 2/3] Fix cargo-culted comment in Prompt Processing. The comment was copied over despite expliticly applying only to LATISS. --- .../values-usdfprod-prompt-processing.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml b/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml index 3984ae4271..40a10fd995 100644 --- a/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml +++ b/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml @@ -67,9 +67,7 @@ prompt-proto-service: imageNotifications: kafkaClusterAddress: prompt-processing-2-kafka-bootstrap.kafka:9092 topic: rubin-summit-notification - # Scheduler adds an extra 60-80-second delay for first visit in a sequence, - # and files can take up to 20 seconds to arrive. Scheduler delay associated - # with CWFS engineering data, should not apply to other cameras. + # Copied over from LATISS, works well empirically imageTimeout: 110 apdb: From 9c19b3ee8ff578fad90525ff0e812d4c17ee47ec Mon Sep 17 00:00:00 2001 From: Krzysztof Findeisen Date: Mon, 16 Dec 2024 12:36:04 -0800 Subject: [PATCH 3/3] Modernize alert broker configs for Prompt Processing. The config was fixed to `usdf-alert-stream-dev-broker-0` for debugging purposes, but `usdf-alert-stream-dev` is the correct address. --- applications/prompt-proto-service-hsc-gpu/README.md | 2 +- applications/prompt-proto-service-hsc-gpu/values.yaml | 2 +- applications/prompt-proto-service-hsc/README.md | 2 +- applications/prompt-proto-service-hsc/values.yaml | 2 +- applications/prompt-proto-service-latiss/README.md | 2 +- applications/prompt-proto-service-latiss/values.yaml | 2 +- applications/prompt-proto-service-lsstcam/README.md | 2 +- applications/prompt-proto-service-lsstcam/values.yaml | 2 +- applications/prompt-proto-service-lsstcomcam/README.md | 2 +- applications/prompt-proto-service-lsstcomcam/values.yaml | 2 +- applications/prompt-proto-service-lsstcomcamsim/README.md | 2 +- applications/prompt-proto-service-lsstcomcamsim/values.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/prompt-proto-service-hsc-gpu/README.md b/applications/prompt-proto-service-hsc-gpu/README.md index fa61117bef..b08e3d09d4 100644 --- a/applications/prompt-proto-service-hsc-gpu/README.md +++ b/applications/prompt-proto-service-hsc-gpu/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | None, must be set | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-hsc-gpu/values.yaml b/applications/prompt-proto-service-hsc-gpu/values.yaml index f0e1acb726..4cd8f03084 100644 --- a/applications/prompt-proto-service-hsc-gpu/values.yaml +++ b/applications/prompt-proto-service-hsc-gpu/values.yaml @@ -105,7 +105,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent # @default -- None, must be set topic: "" diff --git a/applications/prompt-proto-service-hsc/README.md b/applications/prompt-proto-service-hsc/README.md index 821a24fe5e..4fe6a8c44d 100644 --- a/applications/prompt-proto-service-hsc/README.md +++ b/applications/prompt-proto-service-hsc/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | None, must be set | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-hsc/values.yaml b/applications/prompt-proto-service-hsc/values.yaml index a0d01e20e8..ae763e1931 100644 --- a/applications/prompt-proto-service-hsc/values.yaml +++ b/applications/prompt-proto-service-hsc/values.yaml @@ -106,7 +106,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent # @default -- None, must be set topic: "" diff --git a/applications/prompt-proto-service-latiss/README.md b/applications/prompt-proto-service-latiss/README.md index fd24b13b83..d4307471bd 100644 --- a/applications/prompt-proto-service-latiss/README.md +++ b/applications/prompt-proto-service-latiss/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | None, must be set | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-latiss/values.yaml b/applications/prompt-proto-service-latiss/values.yaml index 4bd6cce27a..4e415dba32 100644 --- a/applications/prompt-proto-service-latiss/values.yaml +++ b/applications/prompt-proto-service-latiss/values.yaml @@ -105,7 +105,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent # @default -- None, must be set topic: "" diff --git a/applications/prompt-proto-service-lsstcam/README.md b/applications/prompt-proto-service-lsstcam/README.md index f85273be39..a09f670a98 100644 --- a/applications/prompt-proto-service-lsstcam/README.md +++ b/applications/prompt-proto-service-lsstcam/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | None, must be set | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-lsstcam/values.yaml b/applications/prompt-proto-service-lsstcam/values.yaml index a2ed734da9..ca183dd1eb 100644 --- a/applications/prompt-proto-service-lsstcam/values.yaml +++ b/applications/prompt-proto-service-lsstcam/values.yaml @@ -106,7 +106,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent # @default -- None, must be set topic: "" diff --git a/applications/prompt-proto-service-lsstcomcam/README.md b/applications/prompt-proto-service-lsstcomcam/README.md index 85efd1b606..cbac374f0b 100644 --- a/applications/prompt-proto-service-lsstcomcam/README.md +++ b/applications/prompt-proto-service-lsstcomcam/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | `""` | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-lsstcomcam/values.yaml b/applications/prompt-proto-service-lsstcomcam/values.yaml index 524822eab7..92c02372b3 100644 --- a/applications/prompt-proto-service-lsstcomcam/values.yaml +++ b/applications/prompt-proto-service-lsstcomcam/values.yaml @@ -105,7 +105,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent topic: "" diff --git a/applications/prompt-proto-service-lsstcomcamsim/README.md b/applications/prompt-proto-service-lsstcomcamsim/README.md index fdc5bacd2f..846f559d3c 100644 --- a/applications/prompt-proto-service-lsstcomcamsim/README.md +++ b/applications/prompt-proto-service-lsstcomcamsim/README.md @@ -14,7 +14,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th |-----|------|---------|-------------| | prompt-proto-service.additionalVolumeMounts | list | `[]` | Kubernetes YAML configs for extra container volume(s). Any volumes required by other config options are automatically handled by the Helm chart. | | prompt-proto-service.affinity | object | `{}` | Affinity rules for the prompt processing pods | -| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev-broker-0.lsst.cloud:9094"` | Server address for the alert stream | +| prompt-proto-service.alerts.server | string | `"usdf-alert-stream-dev.lsst.cloud:9094"` | Server address for the alert stream | | prompt-proto-service.alerts.topic | string | None, must be set | Topic name where alerts will be sent | | prompt-proto-service.alerts.username | string | `"kafka-admin"` | Username for sending alerts to the alert stream | | prompt-proto-service.apdb.config | string | None, must be set | URL to a serialized APDB configuration, or the "label:" prefix followed by the indexed name of such a config. | diff --git a/applications/prompt-proto-service-lsstcomcamsim/values.yaml b/applications/prompt-proto-service-lsstcomcamsim/values.yaml index 2b52c13921..687af36e33 100644 --- a/applications/prompt-proto-service-lsstcomcamsim/values.yaml +++ b/applications/prompt-proto-service-lsstcomcamsim/values.yaml @@ -107,7 +107,7 @@ prompt-proto-service: # -- Username for sending alerts to the alert stream username: "kafka-admin" # -- Server address for the alert stream - server: "usdf-alert-stream-dev-broker-0.lsst.cloud:9094" + server: "usdf-alert-stream-dev.lsst.cloud:9094" # -- Topic name where alerts will be sent # @default -- None, must be set topic: ""