display configs on broker page

yahoo · Jul 29, 2021 · 5a050fb · 5a050fb
1 parent 4f7d908
commit 5a050fb
Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/app/controllers/Cluster.scala b/app/controllers/Cluster.scala
@@ -210,8 +210,14 @@ class Cluster (val cc: ControllerComponents, val kafkaManagerContext: KafkaManag
   }
 
   def broker(c: String, b: Int) = Action.async { implicit request: RequestHeader =>
-    kafkaManager.getBrokerView(c,b).map { errorOrBrokerView =>
-      Ok(views.html.broker.brokerView(c,b,errorOrBrokerView)).withHeaders("X-Frame-Options" -> "SAMEORIGIN")
+    val futureErrorOrBrokerIdentity = kafkaManager.getBrokerIdentity(c,b)
+    kafkaManager.getBrokerView(c,b).zip(futureErrorOrBrokerIdentity).map {
+      case (errorOrBrokerView,errorOrBrokerIdentity) =>
+        var newRst = errorOrBrokerView
+        errorOrBrokerIdentity.map(bi=>{
+            newRst = errorOrBrokerView.map(x=>x.copy(broker=Option(bi)))
+        })
+      Ok(views.html.broker.brokerView(c,b,newRst)).withHeaders("X-Frame-Options" -> "SAMEORIGIN")
     }
   }
 

diff --git a/app/kafka/manager/model/ActorModel.scala b/app/kafka/manager/model/ActorModel.scala
@@ -52,7 +52,9 @@ object ActorModel {
   case class BVView(topicPartitions: Map[TopicIdentity, BrokerTopicInfo], clusterContext: ClusterContext,
                     metrics: Option[BrokerMetrics] = None,
                     messagesPerSecCountHistory: Option[Queue[BrokerMessagesPerSecCount]] = None,
-                    stats: Option[BrokerClusterStats] = None) extends QueryResponse {
+                    stats: Option[BrokerClusterStats] = None,
+                    broker: Option[BrokerIdentity] = None
+                   ) extends QueryResponse {
     def numTopics : Int = topicPartitions.size
     def numPartitions : Int = topicPartitions.values.foldLeft(0)((acc,i) => acc + i.partitions.size)
     def numPartitionsAsLeader : Int = topicPartitions.values.foldLeft(0)((acc,i) => acc + i.partitionsAsLeader.size)

diff --git a/app/views/broker/brokerViewContent.scala.html b/app/views/broker/brokerViewContent.scala.html
@@ -31,6 +31,21 @@
                         }
                         </tbody>
                     </table>
+                        @if(!brokerView.broker.isEmpty && !brokerView.broker.get.config.isEmpty) {
+                        <table class="table">
+                            <thead>
+                            <th>Config</th><th>Value</th>
+                            </thead>
+                            <tbody>
+                            @for( (k,v) <- brokerView.broker.get.config) {
+                            <tr>
+                                <td>@k</td>
+                                <td>@v</td>
+                            </tr>
+                            }
+                            </tbody>
+                        </table>
+                        }
                     </div>
                 </div>
             </div>