Merge branch 'master' into feature/281-Add-Beam-Kubernetes-Benchmark-Definitions

helm/templates/grafana/dashboard-config-map.yaml

@@ -527,7 +527,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "count by(topic) (kafka_topic_partitions >= 0)",
+            "expr": "sum by(topic) (kafka_topic_partitions >= 0)",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{topic}}",

helm/templates/kafka/kafka-client.yaml

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  # name: {{ template "theodolite.fullname" . }}-kafka-client
   name: {{ template "theodolite.fullname" . }}-kafka-client
 spec:
   containers:
@@ -12,6 +11,9 @@ spec:
       - sh
       - -c
       - "exec tail -f /dev/null"
+    env:
+      - name: BOOTSTRAP_SERVER
+        value: {{ template "theodolite.fullname" . }}-kafka-kafka-bootstrap:9092
   {{- with .Values.kafkaClient.nodeSelector }}
   nodeSelector:
     {{- toYaml . | nindent 8 }}