Update Strimzi installation to 0.26 (opendatahub-io#501)

Signed-off-by: Anish Asthana <[email protected]>

kafka/cluster/base/subscription.yaml

@@ -6,6 +6,6 @@ metadata:
   namespace: openshift-operators
 spec:
   name: strimzi-kafka-operator
-  channel: "strimzi-0.22.x"
+  channel: "strimzi-0.26.x"
   source: community-operators
   sourceNamespace: openshift-marketplace

kafka/kafka/base/kafka-cluster.yaml

@@ -5,7 +5,7 @@ metadata:
   name: odh-message-bus
 spec:
   kafka:
-    version: 2.7.0
+    version: 3.0.0
     replicas: 3
     listeners:
       - name: plain
@@ -24,16 +24,16 @@ spec:
       offsets.topic.replication.factor: 3
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 3
-      log.message.format.version: '2.7'
-      inter.broker.protocol.version: '2.7'
+      log.message.format.version: '3.0'
+      inter.broker.protocol.version: '3.0'
     storage:
       type: ephemeral
     metricsConfig:
       type: jmxPrometheusExporter
       valueFrom:
         configMapKeyRef:
-          name: kafka-metrics-config
-          key: kafka-prometheus-metrics
+          name: kafka-metrics
+          key: kafka-metrics-config.yml
   zookeeper:
     replicas: 3
     storage:
@@ -42,8 +42,8 @@ spec:
       type: jmxPrometheusExporter
       valueFrom:
         configMapKeyRef:
-          name: kafka-metrics-config
-          key: zookeeper-prometheus-metrics
+          name: kafka-metrics
+          key: zookeeper-metrics-config.yml
   entityOperator:
     topicOperator: {}
     userOperator: {}

kafka/kafka/base/kafka-metrics-config.yaml

@@ -2,27 +2,56 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: kafka-metrics-config
+  name: kafka-metrics
+  labels:
+    app: strimzi
 data:
-  kafka-prometheus-metrics: |
-    # Inspired by config from Kafka 2.0.0 example rules:
-    # https://github.com/prometheus/jmx_exporter/blob/master/example_configs/kafka-2_0_0.yml
+  kafka-metrics-config.yml: |
+    # See https://github.com/prometheus/jmx_exporter for more info about JMX Prometheus Exporter metrics
     lowercaseOutputName: true
     rules:
     # Special cases and very specific rules
-    - pattern : kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
+    - pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), topic=(.+), partition=(.*)><>Value
       name: kafka_server_$1_$2
       type: GAUGE
       labels:
-        clientId: "$3"
-        topic: "$4"
-        partition: "$5"
-    - pattern : kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
+       clientId: "$3"
+       topic: "$4"
+       partition: "$5"
+    - pattern: kafka.server<type=(.+), name=(.+), clientId=(.+), brokerHost=(.+), brokerPort=(.+)><>Value
       name: kafka_server_$1_$2
       type: GAUGE
       labels:
-        clientId: "$3"
-        broker: "$4:$5"
+       clientId: "$3"
+       broker: "$4:$5"
+    - pattern: kafka.server<type=(.+), cipher=(.+), protocol=(.+), listener=(.+), networkProcessor=(.+)><>connections
+      name: kafka_server_$1_connections_tls_info
+      type: GAUGE
+      labels:
+        cipher: "$2"
+        protocol: "$3"
+        listener: "$4"
+        networkProcessor: "$5"
+    - pattern: kafka.server<type=(.+), clientSoftwareName=(.+), clientSoftwareVersion=(.+), listener=(.+), networkProcessor=(.+)><>connections
+      name: kafka_server_$1_connections_software
+      type: GAUGE
+      labels:
+        clientSoftwareName: "$2"
+        clientSoftwareVersion: "$3"
+        listener: "$4"
+        networkProcessor: "$5"
+    - pattern: "kafka.server<type=(.+), listener=(.+), networkProcessor=(.+)><>(.+):"
+      name: kafka_server_$1_$4
+      type: GAUGE
+      labels:
+       listener: "$2"
+       networkProcessor: "$3"
+    - pattern: kafka.server<type=(.+), listener=(.+), networkProcessor=(.+)><>(.+)
+      name: kafka_server_$1_$4
+      type: GAUGE
+      labels:
+       listener: "$2"
+       networkProcessor: "$3"
     # Some percent metrics use MeanRate attribute
     # Ex) kafka.server<type=(KafkaRequestHandlerPool), name=(RequestHandlerAvgIdlePercent)><>MeanRate
     - pattern: kafka.(\w+)<type=(.+), name=(.+)Percent\w*><>MeanRate
@@ -101,30 +130,34 @@ data:
       type: GAUGE
       labels:
         quantile: "0.$4"
-  zookeeper-prometheus-metrics: |
-    # Inspired by Zookeeper rules
-    # https://github.com/prometheus/jmx_exporter/blob/master/example_configs/zookeeper.yaml
+  zookeeper-metrics-config.yml: |
+    # See https://github.com/prometheus/jmx_exporter for more info about JMX Prometheus Exporter metrics
     lowercaseOutputName: true
     rules:
     # replicated Zookeeper
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+)><>(\\w+)"
       name: "zookeeper_$2"
+      type: GAUGE
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+)><>(\\w+)"
       name: "zookeeper_$3"
+      type: GAUGE
+      labels:
+        replicaId: "$2"
+    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(Packets\\w+)"
+      name: "zookeeper_$4"
+      type: COUNTER
       labels:
         replicaId: "$2"
+        memberType: "$3"
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(\\w+)"
       name: "zookeeper_$4"
+      type: GAUGE
       labels:
         replicaId: "$2"
         memberType: "$3"
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+), name3=(\\w+)><>(\\w+)"
       name: "zookeeper_$4_$5"
+      type: GAUGE
       labels:
         replicaId: "$2"
         memberType: "$3"
-    # standalone Zookeeper
-    - pattern: "org.apache.ZooKeeperService<name0=StandaloneServer_port(\\d+)><>(\\w+)"
-      name: "zookeeper_$2"
-    - pattern: "org.apache.ZooKeeperService<name0=StandaloneServer_port(\\d+), name1=(InMemoryDataTree)><>(\\w+)"
-      name: "zookeeper_$2_$3"