Skip to content

Commit 091f205

Browse files
author
fholmqvist
committed
Add 0.10.1.0 in scala, no new client jar
The client jar for 0.10.1.0 isnt backwards compatible. Probably kafka versions should be broken out to plugins with their own jar.
1 parent 73356af commit 091f205

File tree

6 files changed

+18
-4
lines changed

6 files changed

+18
-4
lines changed

app/controllers/Logkafka.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ class Logkafka (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaMana
7070
LogkafkaNewConfigs.configMaps(Kafka_0_10_0_0).map{case(k,v) => LKConfig(k,Some(v))}.toList)
7171
val kafka_0_10_0_1_Default = CreateLogkafka("","",
7272
LogkafkaNewConfigs.configMaps(Kafka_0_10_0_1).map{case(k,v) => LKConfig(k,Some(v))}.toList)
73+
val kafka_0_10_1_0_Default = CreateLogkafka("","",
74+
LogkafkaNewConfigs.configMaps(Kafka_0_10_1_0).map{case(k,v) => LKConfig(k,Some(v))}.toList)
7375

7476
val defaultCreateForm = Form(
7577
mapping(
@@ -116,6 +118,7 @@ class Logkafka (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaMana
116118
case Kafka_0_9_0_1 => (defaultCreateForm.fill(kafka_0_9_0_1_Default), clusterContext)
117119
case Kafka_0_10_0_0 => (defaultCreateForm.fill(kafka_0_10_0_0_Default), clusterContext)
118120
case Kafka_0_10_0_1 => (defaultCreateForm.fill(kafka_0_10_0_1_Default), clusterContext)
121+
case Kafka_0_10_1_0 => (defaultCreateForm.fill(kafka_0_10_1_0_Default), clusterContext)
119122
}
120123
}
121124
}
@@ -206,6 +209,7 @@ class Logkafka (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaMana
206209
case Kafka_0_9_0_1 => LogkafkaNewConfigs.configNames(Kafka_0_9_0_1).map(n => (n,LKConfig(n,None))).toMap
207210
case Kafka_0_10_0_0 => LogkafkaNewConfigs.configNames(Kafka_0_10_0_0).map(n => (n,LKConfig(n,None))).toMap
208211
case Kafka_0_10_0_1 => LogkafkaNewConfigs.configNames(Kafka_0_10_0_1).map(n => (n,LKConfig(n,None))).toMap
212+
case Kafka_0_10_1_0 => LogkafkaNewConfigs.configNames(Kafka_0_10_1_0).map(n => (n,LKConfig(n,None))).toMap
209213
}
210214
val identityOption = li.identityMap.get(log_path)
211215
if (identityOption.isDefined) {

app/controllers/Topic.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class Topic (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaManager
5454
val kafka_0_9_0_1_Default = CreateTopic("",1,1,TopicConfigs.configNames(Kafka_0_9_0_1).map(n => TConfig(n,None)).toList)
5555
val kafka_0_10_0_0_Default = CreateTopic("",1,1,TopicConfigs.configNames(Kafka_0_10_0_0).map(n => TConfig(n,None)).toList)
5656
val kafka_0_10_0_1_Default = CreateTopic("",1,1,TopicConfigs.configNames(Kafka_0_10_0_1).map(n => TConfig(n,None)).toList)
57+
val kafka_0_10_1_0_Default = CreateTopic("",1,1,TopicConfigs.configNames(Kafka_0_10_1_0).map(n => TConfig(n,None)).toList)
5758

5859
val defaultCreateForm = Form(
5960
mapping(
@@ -140,6 +141,7 @@ class Topic (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaManager
140141
case Kafka_0_9_0_1 => (defaultCreateForm.fill(kafka_0_9_0_1_Default), clusterContext)
141142
case Kafka_0_10_0_0 => (defaultCreateForm.fill(kafka_0_10_0_0_Default), clusterContext)
142143
case Kafka_0_10_0_1 => (defaultCreateForm.fill(kafka_0_10_0_1_Default), clusterContext)
144+
case Kafka_0_10_1_0 => (defaultCreateForm.fill(kafka_0_10_1_0_Default), clusterContext)
143145
}
144146
}
145147
}
@@ -376,6 +378,7 @@ class Topic (val messagesApi: MessagesApi, val kafkaManagerContext: KafkaManager
376378
case Kafka_0_9_0_1 => TopicConfigs.configNames(Kafka_0_9_0_1).map(n => (n,TConfig(n,None))).toMap
377379
case Kafka_0_10_0_0 => TopicConfigs.configNames(Kafka_0_10_0_0).map(n => (n,TConfig(n,None))).toMap
378380
case Kafka_0_10_0_1 => TopicConfigs.configNames(Kafka_0_10_0_1).map(n => (n,TConfig(n,None))).toMap
381+
case Kafka_0_10_1_0 => TopicConfigs.configNames(Kafka_0_10_1_0).map(n => (n,TConfig(n,None))).toMap
379382
}
380383
val combinedMap = defaultConfigMap ++ ti.config.toMap.map(tpl => tpl._1 -> TConfig(tpl._1,Option(tpl._2)))
381384
(defaultUpdateConfigForm.fill(UpdateTopicConfig(ti.topic,combinedMap.toList.map(_._2),ti.configReadVersion)),

app/kafka/manager/actor/cluster/KafkaStateActor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class KafkaAdminClient(context: => ActorContext, adminClientActorPath: ActorPath
143143

144144

145145
object KafkaManagedOffsetCache {
146-
val supportedVersions: Set[KafkaVersion] = Set(Kafka_0_8_2_0, Kafka_0_8_2_1, Kafka_0_8_2_2, Kafka_0_9_0_0, Kafka_0_9_0_1, Kafka_0_10_0_0, Kafka_0_10_0_1)
146+
val supportedVersions: Set[KafkaVersion] = Set(Kafka_0_8_2_0, Kafka_0_8_2_1, Kafka_0_8_2_2, Kafka_0_9_0_0, Kafka_0_9_0_1, Kafka_0_10_0_0, Kafka_0_10_0_1, Kafka_0_10_1_0)
147147
val ConsumerOffsetTopic = "__consumer_offsets"
148148

149149
def isSupported(version: KafkaVersion) : Boolean = {

app/kafka/manager/model/model.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ case object Kafka_0_10_0_1 extends KafkaVersion {
4444
override def toString = "0.10.0.1"
4545
}
4646

47+
case object Kafka_0_10_1_0 extends KafkaVersion {
48+
override def toString = "0.10.1.0"
49+
}
50+
4751
object KafkaVersion {
4852
val supportedVersions: Map[String,KafkaVersion] = Map(
4953
"0.8.1.1" -> Kafka_0_8_1_1,
@@ -54,7 +58,8 @@ object KafkaVersion {
5458
"0.9.0.0" -> Kafka_0_9_0_0,
5559
"0.9.0.1" -> Kafka_0_9_0_1,
5660
"0.10.0.0" -> Kafka_0_10_0_0,
57-
"0.10.0.1" -> Kafka_0_10_0_1
61+
"0.10.0.1" -> Kafka_0_10_0_1,
62+
"0.10.1.0" -> Kafka_0_10_1_0
5863
)
5964

6065
val formSelectList : IndexedSeq[(String,String)] = supportedVersions.toIndexedSeq.filterNot(_._1.contains("beta")).map(t => (t._1,t._2.toString))

app/kafka/manager/utils/LogkafkaNewConfigs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ object LogkafkaNewConfigs {
2525
Kafka_0_9_0_0 -> logkafka82.LogConfig,
2626
Kafka_0_9_0_1 -> logkafka82.LogConfig,
2727
Kafka_0_10_0_0 -> logkafka82.LogConfig,
28-
Kafka_0_10_0_1 -> logkafka82.LogConfig
28+
Kafka_0_10_0_1 -> logkafka82.LogConfig,
29+
Kafka_0_10_1_0 -> logkafka82.LogConfig
2930
)
3031

3132
def configNames(version: KafkaVersion) : Set[String] = {

app/kafka/manager/utils/TopicConfigs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ object TopicConfigs {
2525
Kafka_0_9_0_0 -> zero90.LogConfig,
2626
Kafka_0_9_0_1 -> zero90.LogConfig,
2727
Kafka_0_10_0_0 -> zero90.LogConfig,
28-
Kafka_0_10_0_1 -> zero90.LogConfig
28+
Kafka_0_10_0_1 -> zero90.LogConfig,
29+
Kafka_0_10_1_0 -> zero90.LogConfig
2930
)
3031

3132
def configNames(version: KafkaVersion) : Set[String] = {

0 commit comments

Comments
 (0)