More review feedback

lsst-sqre · Oct 2, 2024 · f4a7b3d · f4a7b3d
1 parent 3caa628
commit f4a7b3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/applications/sasquatch/README.md b/applications/sasquatch/README.md
@@ -100,7 +100,7 @@ Rubin Observatory's telemetry service
 | app-metrics.nodeSelector | object | `{}` | Node labels for pod assignment |
 | app-metrics.podAnnotations | object | `{}` | Annotations for telegraf-kafka-consumers pods |
 | app-metrics.podLabels | object | `{}` | Labels for telegraf-kafka-consumer pods |
-| app-metrics.replicaCount | int | `1` | Number of Telegraf  replicas. Increase this value to increase the consumer throughput. |
+| app-metrics.replicaCount | int | `3` | Number of Telegraf  replicas. Multiple replicas increase availability. |
 | app-metrics.resources | object | See `values.yaml` | Kubernetes resources requests and limits |
 | app-metrics.tolerations | list | `[]` | Tolerations for pod assignment |
 | influxdb-enterprise.bootstrap.auth.secretName | string | `"sasquatch"` | Enable authentication of the data nodes using this secret, by creating a username and password for an admin account. The secret must contain keys `username` and `password`. |

diff --git a/applications/sasquatch/charts/app-metrics/README.md b/applications/sasquatch/charts/app-metrics/README.md
@@ -23,6 +23,6 @@ Kafka topics, users, and a telegraf connector for metrics events.
 | nodeSelector | object | `{}` | Node labels for pod assignment |
 | podAnnotations | object | `{}` | Annotations for telegraf-kafka-consumers pods |
 | podLabels | object | `{}` | Labels for telegraf-kafka-consumer pods |
-| replicaCount | int | `1` | Number of Telegraf  replicas. Increase this value to increase the consumer throughput. |
+| replicaCount | int | `3` | Number of Telegraf  replicas. Multiple replicas increase availability. |
 | resources | object | See `values.yaml` | Kubernetes resources requests and limits |
 | tolerations | list | `[]` | Tolerations for pod assignment |
diff --git a/applications/sasquatch/charts/app-metrics/templates/telegraf-configmap.yaml b/applications/sasquatch/charts/app-metrics/templates/telegraf-configmap.yaml
@@ -36,6 +36,9 @@ data:
       password = "${INFLUXDB_PASSWORD}"
 
     {{- range $index, $app := .Values.apps }}
+    {{- $globalInfluxTags := $.Values.globalInfluxTags | default list }}
+    {{- $appInfluxTags := (index $.Values.globalAppConfig $app "influxTags") | default list }}
+    {{- $influxTags := concat $globalInfluxTags $appInfluxTags }}
     [[inputs.kafka_consumer]]
       brokers = [
         "sasquatch-kafka-brokers.sasquatch:9092"
@@ -49,7 +52,7 @@ data:
       avro_timestamp = "timestamp_ns"
       avro_timestamp_format = "unix_ns"
       avro_union_mode = "nullable"
-      avro_tags = {{ include "helpers.toTomlArray" (index $.Values.globalAppConfig $app "influxTags")  }}
+      avro_tags = {{ include "helpers.toTomlArray" $influxTags }}
       topics = [
         "lsst.square.app-metrics.events.{{ $app }}",
       ]

diff --git a/applications/sasquatch/charts/app-metrics/values.yaml b/applications/sasquatch/charts/app-metrics/values.yaml
@@ -78,9 +78,8 @@ influxdb:
   # -- URL of the InfluxDB v1 instance to write to
   url: "http://sasquatch-influxdb.sasquatch:8086"
 
-# -- Number of Telegraf  replicas. Increase this value to increase the consumer
-# throughput.
-replicaCount: 1
+# -- Number of Telegraf  replicas. Multiple replicas increase availability.
+replicaCount: 3
 
 
 # -- Kubernetes resources requests and limits