From 042d94215b600ffb729736ba249dfa1c6bedfd99 Mon Sep 17 00:00:00 2001
From: cadem <cademfly@hotmail.com>
Date: Sat, 18 Mar 2023 12:50:07 +0800
Subject: [PATCH] feat/add topic total and stream total in monitor

---
 include/libs/monitor/monitor.h        | 2 ++
 source/dnode/mnode/impl/src/mndMain.c | 2 ++
 source/libs/monitor/src/monMain.c     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h
index 3dee59ab14..7811f64016 100644
--- a/include/libs/monitor/monitor.h
+++ b/include/libs/monitor/monitor.h
@@ -116,6 +116,8 @@ typedef struct {
   int32_t vnodes_total;
   int32_t vnodes_alive;
   int32_t connections_total;
+  int32_t topics_toal;
+  int32_t streams_total;
   SArray *dnodes;  // array of SMonDnodeDesc
   SArray *mnodes;  // array of SMonMnodeDesc
 } SMonClusterInfo;
diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c
index d83b969e2d..fe651011ac 100644
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -759,6 +759,8 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
   pClusterInfo->connections_total = mndGetNumOfConnections(pMnode);
   pClusterInfo->dbs_total = sdbGetSize(pSdb, SDB_DB);
   pClusterInfo->stbs_total = sdbGetSize(pSdb, SDB_STB);
+  pClusterInfo->topics_toal = sdbGetSize(pSdb, SDB_TOPIC);
+  pClusterInfo->streams_total = sdbGetSize(pSdb, SDB_STREAM);
 
   void *pIter = NULL;
   while (1) {
diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c
index b23a36d4df..949e91198a 100644
--- a/source/libs/monitor/src/monMain.c
+++ b/source/libs/monitor/src/monMain.c
@@ -210,6 +210,8 @@ static void monGenClusterJson(SMonInfo *pMonitor) {
   tjsonAddDoubleToObject(pJson, "vnodes_total", pInfo->vnodes_total);
   tjsonAddDoubleToObject(pJson, "vnodes_alive", pInfo->vnodes_alive);
   tjsonAddDoubleToObject(pJson, "connections_total", pInfo->connections_total);
+  tjsonAddDoubleToObject(pJson, "topics_total", pInfo->topics_toal);
+  tjsonAddDoubleToObject(pJson, "streams_total", pInfo->streams_total);
 
   SJson *pDnodesJson = tjsonAddArrayToObject(pJson, "dnodes");
   if (pDnodesJson == NULL) return;