Add support for Kafka 2.7.1 and remove 2.6.x (strimzi#4973)

Signed-off-by: Jakub Scholz <[email protected]>

Author: scholzj

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 0.24.0
 
+* Add support for Kafka 2.7.1 and remove support for 2.6.0, 2.6.1, and 2.6.2
 
 ## 0.23.0
 

docker-images/kafka/kafka-thirdparty-libs/2.6.x/pom.xml

@@ -6,10 +6,8 @@
 
 |Kafka
 a|
-* {DockerOrg}/kafka:{DockerTag}-kafka-2.6.0
-* {DockerOrg}/kafka:{DockerTag}-kafka-2.6.1
-* {DockerOrg}/kafka:{DockerTag}-kafka-2.6.2
 * {DockerOrg}/kafka:{DockerTag}-kafka-2.7.0
+* {DockerOrg}/kafka:{DockerTag}-kafka-2.7.1
 * {DockerOrg}/kafka:{DockerTag}-kafka-2.8.0
 
 a|

documentation/modules/snip-images.adoc

@@ -6,9 +6,7 @@
 [options="header"]
 |=================
 |Kafka version |Interbroker protocol version |Log message format version| ZooKeeper version
-| 2.6.0 | 2.6 | 2.6 | 3.5.8
-| 2.6.1 | 2.6 | 2.6 | 3.5.8
-| 2.6.2 | 2.6 | 2.6 | 3.5.9
 | 2.7.0 | 2.7 | 2.7 | 3.5.8
+| 2.7.1 | 2.7 | 2.7 | 3.5.8
 | 2.8.0 | 2.8 | 2.8 | 3.5.9
 |=================

documentation/modules/snip-kafka-versions.adoc

@@ -4,7 +4,6 @@
  */
 package io.strimzi.kafka.agent;
 
-import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.Metric;
 import com.yammer.metrics.core.MetricName;
@@ -40,30 +39,10 @@ public KafkaAgent(File brokerReadyFile, File sessionConnectedFile) {
         this.sessionConnectedFile = sessionConnectedFile;
     }
 
-    /**
-     * Since Kafka 2.6.0, a new class KafkaYammerMetrics exists which has the default Metrics Registry. The old default
-     * registry does not work there anymore. So if the new class exists, we use it and if it doesn't exist we use the
-     * old one. More details can be found here: https://github.com/apache/kafka/blob/2.6.0/core/src/main/java/kafka/metrics/KafkaYammerMetrics.java
-     *
-     * Once we support only 2.6.0 and newer, we can clean this up and use only KafkaYammerMetrics all the time.
-     *
-     * @return  MetricsRegistry with Kafka metrics
-     */
-    private MetricsRegistry metricsRegistry()   {
-        try {
-            Class.forName("kafka.metrics.KafkaYammerMetrics");
-            LOGGER.info("KafkaYammerMetrics found and will be used.");
-            return KafkaYammerMetrics.defaultRegistry();
-        } catch (ClassNotFoundException e) {
-            LOGGER.info("KafkaYammerMetrics not found. Metrics will be used.");
-            return Metrics.defaultRegistry();
-        }
-    }
-
     private void run() {
         LOGGER.info("Starting metrics registry");
 
-        MetricsRegistry metricsRegistry = metricsRegistry();
+        MetricsRegistry metricsRegistry = KafkaYammerMetrics.defaultRegistry();
 
         metricsRegistry.addListener(new MetricsRegistryListener() {
             @Override

kafka-agent/src/main/java/io/strimzi/kafka/agent/KafkaAgent.java

@@ -91,7 +91,7 @@
   checksum: 022AB51605DFFB8A0E4522DF297F02F4C5E488696520BB38DA8E8E70457C0B2696A47D7AD39A86389B747981215B385B2659AC25B3D43A6093AF13239723560D
   zookeeper: 3.5.8
   third-party-libs: 2.6.x
-  supported: true
+  supported: false
   default: false
 - version: 2.6.1
   format: 2.6
@@ -100,7 +100,7 @@
   checksum: 105BF29E4BED9F1B7A7A3CAADF016DF8AA774F6F509E3606529F8231EA4CAB89C38236C58BE9C2E9BD3C52C2917892EA5D3A5EC0BD94BD8A5F7257522A5AF4DB
   zookeeper: 3.5.8
   third-party-libs: 2.6.x
-  supported: true
+  supported: false
   default: false
 - version: 2.6.2
   format: 2.6
@@ -109,7 +109,7 @@
   checksum: 70F992DFAB02D1E727E352124D53F89B096868E738DFC50563890EA394ADFE056B132BDC8BAD70BDD6CE48B0C7561CDB33CC50D56586F09BAD96FF699A054F85
   zookeeper: 3.5.9
   third-party-libs: 2.6.x
-  supported: true
+  supported: false
   default: false
 - version: 2.7.0
   format: 2.7
@@ -120,6 +120,15 @@
   third-party-libs: 2.7.x
   supported: true
   default: false
+- version: 2.7.1
+  format: 2.7
+  protocol: 2.7
+  url: https://archive.apache.org/dist/kafka/2.7.1/kafka_2.12-2.7.1.tgz
+  checksum: 33D365CC87ABC9B85AA51F0B0C26E3749A5E9821F611B3F73239AABC9D6CD2F1E55F01ED0647AF5818967AF35213FA1BEDFAB89C3F22B083015A75C318DDC5AB
+  zookeeper: 3.5.8
+  third-party-libs: 2.7.x
+  supported: true
+  default: false
 - version: 2.8.0
   format: 2.8
   protocol: 2.8