From 397c3c88bc9b4d98d13b3e69f83a64164caeeeb0 Mon Sep 17 00:00:00 2001
From: DingGGu <ggu@dunamu.com>
Date: Sun, 18 Apr 2021 22:58:06 +0900
Subject: [PATCH] Kafka - Added session metrics

---
 kafka/datadog_checks/kafka/data/metrics.yaml | 18 ++++++++++++++++++
 kafka/metadata.csv                           |  2 ++
 kafka/tests/common.py                        |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/kafka/datadog_checks/kafka/data/metrics.yaml b/kafka/datadog_checks/kafka/data/metrics.yaml
index cc7ce05b6e7bd..d8f1567bc2cac 100644
--- a/kafka/datadog_checks/kafka/data/metrics.yaml
+++ b/kafka/datadog_checks/kafka/data/metrics.yaml
@@ -664,3 +664,21 @@ jmx_metrics:
           Count:
             metric_type: rate
             alias: kafka.session.zookeeper.sync.rate
+
+    #
+    # Session stats
+    #
+    - include:
+        domain: 'kafka.server'
+        bean: 'kafka.server:type=FetchSessionCache,name=NumIncrementalFetchSessions'
+        attribute:
+          Value:
+            metric_type: gauge
+            alias: kafka.session.fetch.count
+    - include:
+        domain: 'kafka.server'
+        bean: 'kafka.server:type=FetchSessionCache,name=IncrementalFetchSessionEvictionsPerSec'
+        attribute:
+          Count:
+            alias: kafka.session.fetch.eviction
+            metric_type: rate
diff --git a/kafka/metadata.csv b/kafka/metadata.csv
index 59dab3d552dc1..ffa74a103f5d7 100644
--- a/kafka/metadata.csv
+++ b/kafka/metadata.csv
@@ -85,3 +85,5 @@ kafka.topic.messages_in.rate,gauge,10,message,,Incoming message rate by topic,0,
 kafka.topic.net.bytes_out.rate,gauge,10,byte,second,Outgoing byte rate by topic.,0,kafka,topic bytes out
 kafka.topic.net.bytes_in.rate,gauge,10,byte,second,Incoming byte rate by topic.,0,kafka,topic bytes in
 kafka.topic.net.bytes_rejected.rate,gauge,10,byte,second,Rejected byte rate by topic.,-1,kafka,topic bytes rejected
+kafka.session.fetch.count,gauge,10,,,Number of fetch sessions.,0,kafka,fetch sessions
+kafka.session.fetch.eviction,gauge,10,event,second,Eviction rate of fetch session.,0,kafka,eviction session rate
diff --git a/kafka/tests/common.py b/kafka/tests/common.py
index fac0e9e668839..bbf9b0213f3a6 100644
--- a/kafka/tests/common.py
+++ b/kafka/tests/common.py
@@ -59,4 +59,7 @@
     "kafka.session.zookeeper.expire.rate",
     "kafka.session.zookeeper.readonly.rate",
     "kafka.session.zookeeper.sync.rate",
+    # Session
+    "kafka.session.fetch.count",
+    "kafka.session.fetch.eviction",
 ]