From f6ecd8d20477812493b8b4194fd62941900da493 Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 25 Jan 2024 01:37:32 +0000 Subject: [PATCH] keep old protocal --- source/dnode/mgmt/node_mgmt/src/dmMonitor.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c index 590c25b936..3d6be1f433 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c +++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c @@ -19,7 +19,13 @@ #include "audit.h" static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) { - //pInfo->protocol = 1; + pInfo->protocol = 1; + pInfo->dnode_id = pDnode->data.dnodeId; + pInfo->cluster_id = pDnode->data.clusterId; + tstrncpy(pInfo->dnode_ep, tsLocalEp, TSDB_EP_LEN); +} + +static void dmGetMonitorBasicInfoBasic(SDnode *pDnode, SMonBasicInfo *pInfo) { pInfo->protocol = 2; pInfo->dnode_id = pDnode->data.dnodeId; pInfo->cluster_id = pDnode->data.clusterId; @@ -45,6 +51,12 @@ static void dmGetDmMonitorInfo(SDnode *pDnode) { monSetDmInfo(&dmInfo); } +static void dmGetDmMonitorInfoBasic(SDnode *pDnode) { + SMonDmInfo dmInfo = {0}; + dmGetMonitorBasicInfoBasic(pDnode, &dmInfo.basic); + monSetDmInfo(&dmInfo); +} + static void dmGetMmMonitorInfo(SDnode *pDnode) { SMgmtWrapper *pWrapper = &pDnode->wrappers[MNODE]; if (dmMarkWrapper(pWrapper) == 0) { @@ -115,11 +127,8 @@ void dmSendMonitorReportBasic() { dTrace("send monitor report to %s:%u", tsMonitorFqdn, tsMonitorPort); SDnode *pDnode = dmInstance(); - dmGetDmMonitorInfo(pDnode); + dmGetDmMonitorInfoBasic(pDnode); dmGetMmMonitorInfo(pDnode); - //dmGetVmMonitorInfo(pDnode); - //dmGetQmMonitorInfo(pDnode); - //dmGetSmMonitorInfo(pDnode); monGenAndSendReportBasic(); }