Adapt benchmarks configuration to be in line with updated charts.

charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp

@@ -10,7 +10,7 @@ sources:
 dependencies:
   - name: camunda-platform
     repository: "oci://ghcr.io/camunda/helm"
-    version: "0.0.0-12.0.0-alpha1"
+    version: "0.0.0-8.7.0-alpha1"
     condition: "camunda.enabled"
   - name: prometheus-elasticsearch-exporter
     repository: "https://prometheus-community.github.io/helm-charts"

charts/zeebe-benchmark/Chart.yaml

@@ -10,14 +10,14 @@ sources:
 dependencies:
   - name: camunda-platform
     repository: "oci://ghcr.io/camunda/helm"
-    version: "0.0.0-12.0.0-alpha1"
+    version: "0.0.0-8.7.0-alpha2"
     condition: "camunda-platform.enabled"
   - name: prometheus-elasticsearch-exporter
     repository: "https://prometheus-community.github.io/helm-charts"
     version: 6.4.0
     condition: "prometheus-elasticsearch-exporter.enabled"
 maintainers:
-  - name: Zelldon
+  - name: ChrisKujawa
     email: [email protected]
 annotations:
   artifacthub.io/links: |

charts/zeebe-benchmark/templates/NOTES.txt

@@ -2,11 +2,9 @@
 
 Installed Zeebe cluster with:
 
- * {{  index .Values "camunda-platform" "zeebe" "clusterSize" }} Brokers ({{ index .Values "camunda-platform" "zeebe" "image" "repository" }}:{{ index .Values "camunda-platform" "zeebe" "image" "tag" }})
- * {{  index .Values "camunda-platform" "zeebeGateway" "replicas" }} Gateways  ({{ index .Values "camunda-platform" "zeebeGateway" "image" "repository" }}:{{ index .Values "camunda-platform" "zeebeGateway" "image" "tag" }})
-{{- if index .Values "camunda-platform" "operate" "enabled" }}
- * Operate  ({{ index .Values "camunda-platform" "operate" "image" "repository" }}:{{ index .Values "camunda-platform" "operate" "image" "tag" }})
-{{ end }}
+ * {{  index .Values "camunda-platform" "core" "clusterSize" }} Brokers ({{ index .Values "camunda-platform" "core" "image" "repository" }}:{{ index .Values "camunda-platform" "core" "image" "tag" }})
+ * Active profiles: {{- range index .Values "camunda-platform" "core" "env" }}{{- if eq .name "SPRING_PROFILES_ACTIVE" }}{{ .value }}{{- end }}{{- end }}
+
 
 The benchmark is running with:
 

charts/zeebe-benchmark/templates/publisher.yaml

@@ -23,7 +23,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: >-
                 -Dconfig.override_with_env_vars=true
-                -Dapp.brokerUrl={{ .Release.Name }}-zeebe-gateway:26500
+                -Dapp.brokerUrl={{ .Release.Name }}-core:26500
                 -Dapp.starter.rate={{ .Values.publisher.rate }}
                 -Dzeebe.client.requestTimeout=62000
                 -XX:+HeapDumpOnOutOfMemoryError

charts/zeebe-benchmark/templates/starter.yaml

@@ -26,7 +26,7 @@ spec:
                 {{- if $.Values.saas.enabled }}
                 -Dapp.tls=true
                 {{- else }}
-                -Dapp.brokerUrl={{ $.Release.Name }}-zeebe-gateway:26500
+                -Dapp.brokerUrl={{ $.Release.Name }}-core:26500
                 {{- end }}
                 -Dapp.starter.rate={{ .Values.starter.rate }}
                 -Dapp.starter.durationLimit=0

charts/zeebe-benchmark/templates/timer.yaml

@@ -23,7 +23,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: >-
                 -Dconfig.override_with_env_vars=true
-                -Dapp.brokerUrl={{ .Release.Name }}-zeebe-gateway:26500
+                -Dapp.brokerUrl={{ .Release.Name }}-core:26500
                 -Dapp.starter.rate={{ .Values.timer.rate }}
                 -Dzeebe.client.requestTimeout=62000
                 -XX:+HeapDumpOnOutOfMemoryError

charts/zeebe-benchmark/templates/workers.yaml

@@ -27,7 +27,7 @@ spec:
                 {{- if $.Values.saas.enabled }}
                 -Dapp.tls=true
                 {{- else }}
-                -Dapp.brokerUrl={{ $.Release.Name }}-zeebe-gateway:26500
+                -Dapp.brokerUrl={{ $.Release.Name }}-core:26500
                 {{- end }}
                 -Dzeebe.client.requestTimeout=62000
                 {{- if $worker.capacity }}

charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml

@@ -0,0 +1,212 @@
+---
+# Source: zeebe-benchmark/charts/camunda-platform/templates/core/configmap.yaml
+kind: ConfigMap
+metadata:
+  name: benchmark-test-core-configuration
+  labels:
+    app: camunda-platform
+    app.kubernetes.io/name: camunda-platform
+    app.kubernetes.io/instance: benchmark-test
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: camunda-platform
+    app.kubernetes.io/component: core
+    app.kubernetes.io/version: "8.7.0-alpha2"
+apiVersion: v1
+data:
+  startup.sh: |
+    # The Node ID depends on the Pod name so it cannot be templated in the StatefulSet level.
+    export ZEEBE_BROKER_CLUSTER_NODEID="${ZEEBE_BROKER_CLUSTER_NODEID:-$[${K8S_NAME##*-} * 1 + 0]}"
+    echo "export ZEEBE_BROKER_CLUSTER_NODEID=${ZEEBE_BROKER_CLUSTER_NODEID}"
+
+    exec /usr/local/camunda/bin/camunda
+  application.yaml: |
+
+    spring:
+      profiles:
+        active: "operate,tasklist,broker,auth"
+
+    management:
+      server:
+        port: 9600
+
+    server:
+      forward-headers-strategy: none
+      address: 0.0.0.0
+      port: 8080
+      servlet:
+
+    zeebe:
+      host: 0.0.0.0
+      log:
+        level: "info"
+
+      broker:
+        # zeebe.broker.gateway
+        gateway:
+          enable: true
+          network:
+            host: 0.0.0.0
+            port: 26500
+
+        # zeebe.broker.network
+        network:
+          advertisedHost: "${K8S_NAME}.${K8S_SERVICE_NAME}"
+          host: 0.0.0.0
+          commandApi:
+            port: 26501
+          internalApi:
+            port: 26502
+
+        # zeebe.broker.cluster
+        cluster:
+          # The value of "nodeId" is set via the "ZEEBE_BROKER_CLUSTER_NODEID" env var.
+          # As it depends on the Pod name, which cannot be templated at the installation time.
+          # nodeId:
+          initialContactPoints:
+            - benchmark-test-zeebe-0.${K8S_SERVICE_NAME}:26502
+            - benchmark-test-zeebe-1.${K8S_SERVICE_NAME}:26502
+            - benchmark-test-zeebe-2.${K8S_SERVICE_NAME}:26502
+          clusterSize: "3"
+          replicationFactor: "3"
+          partitionsCount: "3"
+          clusterName: benchmark-test-zeebe
+
+        # zeebe.broker.data
+        data:
+          snapshotPeriod: 5m
+          freeSpace:
+            processing: 2GB
+            replication: 3GB
+
+        # zeebe.broker.threads
+        threads:
+          cpuThreadCount: "3"
+          ioThreadCount: "3"
+
+        # zeebe.broker.exporters
+        exporters:
+          elasticsearch:
+            className: "io.camunda.zeebe.exporter.ElasticsearchExporter"
+            args:
+              url: "http://benchmark-test-elasticsearch:9200"
+              index:
+                prefix: "zeebe-record"
+              retention:
+                enabled: true
+                minimumAge: "10m"
+                policyName: "core-record-retention-policy"
+          CamundaExporter:
+            className: "io.camunda.exporter.CamundaExporter"
+            args:
+              connect:
+                type: elasticsearch
+                url: "http://benchmark-test-elasticsearch:9200"
+              retention:
+                enabled: true
+                minimumAge: "10m"
+                policyName: "core-record-retention-policy"
+              createSchema: true
+
+    camunda:
+      persistent:
+        sessions:
+          enabled: true
+
+      rest:
+        query:
+          enabled: true
+
+      security:
+        authorizations:
+          enabled: false
+
+      #
+      # Camunda Database Configuration.
+      #
+      database:
+        type: elasticsearch
+        # Cluster name
+        clusterName: elasticsearch
+        # Elasticsearch full url
+        url: "http://benchmark-test-elasticsearch:9200"
+
+      #
+      # Camunda Operate Configuration.
+      #
+      operate:
+        persistentSessionsEnabled: true
+
+        # ELS instance to store Operate data
+        elasticsearch:
+          # Operate index prefix.
+          # Cluster name
+          clusterName: elasticsearch
+          # Host
+          host: benchmark-test-elasticsearch
+          # Transport port
+          port: 9200
+          # Elasticsearch full url
+          url: "http://benchmark-test-elasticsearch:9200"
+        # ELS instance to export Zeebe data to
+        zeebeElasticsearch:
+          # Cluster name
+          clusterName: elasticsearch
+          # Host
+          host: benchmark-test-elasticsearch
+          # Transport port
+          port: 9200
+          # Index prefix, configured in Zeebe Elasticsearch exporter
+          prefix: "zeebe-record"
+          # Elasticsearch full url
+          url: "http://benchmark-test-elasticsearch:9200"
+        # Zeebe instance
+        zeebe:
+          # Gateway address
+          gatewayAddress: "benchmark-test-core:26500"
+        archiver:
+          ilmEnabled: true
+          ilmMinAgeForDeleteArchivedIndices: 10m
+
+      #
+      # Camunda Tasklist Configuration.
+      #
+      tasklist:
+
+        # Set Tasklist username and password.
+        # If user with <username> does not exists it will be created.
+        # Default: demo/demo
+        #username:
+        #password:
+        # ELS instance to store Tasklist data
+        elasticsearch:
+          # Tasklist index prefix.
+          # Cluster name
+          clusterName: elasticsearch
+          # Host
+          host: benchmark-test-elasticsearch
+          # Transport port
+          port: 9200
+          # Elasticsearch full url
+          url: "http://benchmark-test-elasticsearch:9200"
+        # ELS instance to export Zeebe data to
+        zeebeElasticsearch:
+          # Cluster name
+          clusterName: elasticsearch
+          # Host
+          host: benchmark-test-elasticsearch
+          # Transport port
+          port: 9200
+          # Index prefix, configured in Zeebe Elasticsearch exporter
+          prefix: "zeebe-record"
+          # Elasticsearch full url
+          url: "http://benchmark-test-elasticsearch:9200"
+        # Zeebe instance
+        zeebe:
+          # Gateway address
+          gatewayAddress: benchmark-test-core:26500
+          restAddress: "http://benchmark-test-core:8080"
+        archiver:
+          ilmEnabled: true
+          ilmMinAgeForDeleteArchivedIndices: 10m
+
+  log4j2.xml: |

charts/zeebe-benchmark/test/golden/c8-zeebe-service-monitor.golden.yaml → charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml

@@ -1,9 +1,9 @@
 ---
-# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/zeebe-service-monitor.yaml
+# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/core-service-monitor.yaml
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: benchmark-test-camunda-platform-zeebe
+  name: benchmark-test-camunda-platform-core
   labels:
     app: camunda-platform
     app.kubernetes.io/name: camunda-platform
@@ -15,9 +15,9 @@ spec:
   selector:
     matchLabels:
       app: camunda-platform
-      app.kubernetes.io/component: zeebe-broker
+      app.kubernetes.io/component: core
   endpoints:
     - honorLabels: true
       path: /actuator/prometheus
-      port: http
+      port: server
       interval: 30s

charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml → charts/zeebe-benchmark/test/golden/c8-core-service.golden.yaml

@@ -1,24 +1,24 @@
 ---
-# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe/service.yaml
+# Source: zeebe-benchmark/charts/camunda-platform/templates/core/service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: "benchmark-test-zeebe"
+  name: benchmark-test-core
   labels:
     app: camunda-platform
     app.kubernetes.io/name: camunda-platform
     app.kubernetes.io/instance: benchmark-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
-    app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "SNAPSHOT"
+    app.kubernetes.io/component: core
+    app.kubernetes.io/version: "8.7.0-alpha2"
   annotations:
 spec:
   clusterIP: None
   publishNotReadyAddresses: true
   type: ClusterIP
   ports:
-    - port: 9600
+    - port: 8080
       protocol: TCP
       name: http
     - port: 26502
@@ -27,10 +27,16 @@ spec:
     - port: 26501
       protocol: TCP
       name: command
+    - port: 9600
+      protocol: TCP
+      name: server
+    - port: 26500
+      protocol: TCP
+      name: gateway
   selector:
     app: camunda-platform
     app.kubernetes.io/name: camunda-platform
     app.kubernetes.io/instance: benchmark-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
-    app.kubernetes.io/component: zeebe-broker
+    app.kubernetes.io/component: core