From d7d4a2fd25b5c1b61e3c9ad01e7e7102bcb583a6 Mon Sep 17 00:00:00 2001 From: Daniel Panzella Date: Tue, 15 Oct 2024 16:06:27 -0700 Subject: [PATCH 1/3] fix: Weave traces AWS ELB Health Check (#241) --- charts/operator-wandb/Chart.yaml | 2 +- .../operator-wandb/charts/weave-trace/templates/service.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 65368e3d..8643ed9a 100644 --- a/charts/operator-wandb/Chart.yaml +++ b/charts/operator-wandb/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: operator-wandb description: A Helm chart for deploying W&B to Kubernetes type: application -version: 0.18.8 +version: 0.18.9 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/charts/weave-trace/templates/service.yaml b/charts/operator-wandb/charts/weave-trace/templates/service.yaml index 5c9d3462..a34da8f9 100644 --- a/charts/operator-wandb/charts/weave-trace/templates/service.yaml +++ b/charts/operator-wandb/charts/weave-trace/templates/service.yaml @@ -10,6 +10,9 @@ metadata: {{- toYaml .Values.service.labels | nindent 4 }} {{- end }} annotations: + {{- if eq .Values.global.cloudProvider "aws" }} + alb.ingress.kubernetes.io/healthcheck-path: /traces/health + {{- end }} {{- if .Values.service.annotations -}} {{- toYaml .Values.service.annotations | nindent 4 }} {{- end }} From a114173e64d9c86427f333873579016f5fc6c14f Mon Sep 17 00:00:00 2001 From: Jessica Xiang Date: Thu, 17 Oct 2024 12:55:23 -0700 Subject: [PATCH 2/3] Increase kafka replication factor (#242) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/charts/app/templates/_deployment.tpl | 2 +- .../charts/flat-run-fields-updater/templates/deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 8643ed9a..566b4139 100644 --- a/charts/operator-wandb/Chart.yaml +++ b/charts/operator-wandb/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: operator-wandb description: A Helm chart for deploying W&B to Kubernetes type: application -version: 0.18.9 +version: 0.18.10 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/charts/app/templates/_deployment.tpl b/charts/operator-wandb/charts/app/templates/_deployment.tpl index ebcac51c..bd91a74f 100644 --- a/charts/operator-wandb/charts/app/templates/_deployment.tpl +++ b/charts/operator-wandb/charts/app/templates/_deployment.tpl @@ -252,7 +252,7 @@ spec: "name": "wandb", "prefix": "wandb-overflow" }, - "addr": "kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@$(KAFKA_BROKER_HOST):$(KAFKA_BROKER_PORT)/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?producer_batch_bytes=1048576&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)" + "addr": "kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@$(KAFKA_BROKER_HOST):$(KAFKA_BROKER_PORT)/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?producer_batch_bytes=1048576&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3" } {{- include "app.extraEnv" (dict "global" $.Values.global "local" .Values) | nindent 12 }} {{- include "wandb.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} diff --git a/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml b/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml index ea709cfd..c1382d2e 100644 --- a/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml +++ b/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml @@ -137,7 +137,7 @@ spec: "prefix": "wandb-overflow" }, "subscriptions": { - "flatRunFieldsUpdater": "kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@wandb-kafka:9092/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?consumer_group_id=default-group&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)" + "flatRunFieldsUpdater": "kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@wandb-kafka:9092/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?consumer_group_id=default-group&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3" } } - name: REDIS_PASSWORD From 16dd6badf1a0ebb0577d506f71546abaa7bf8fe8 Mon Sep 17 00:00:00 2001 From: Jessica Xiang Date: Fri, 18 Oct 2024 11:04:36 -0700 Subject: [PATCH 3/3] chore(dev): enable kafka jmx metrics (#243) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 566b4139..bd7e679a 100644 --- a/charts/operator-wandb/Chart.yaml +++ b/charts/operator-wandb/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: operator-wandb description: A Helm chart for deploying W&B to Kubernetes type: application -version: 0.18.10 +version: 0.18.11 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml index 3d66d937..eb59387d 100644 --- a/charts/operator-wandb/values.yaml +++ b/charts/operator-wandb/values.yaml @@ -321,3 +321,6 @@ kafka: kraft: # This field is a UUID. It is *strongly* recommended to supply a new UUID yourself for production installs. clusterId: "ffFF1H3AQKGdBnsqAbJKew" + metrics: + jmx: + enabled: true