diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h index eb9c3483d1..bc54a6b3c8 100644 --- a/source/dnode/vnode/src/inc/vnodeInt.h +++ b/source/dnode/vnode/src/inc/vnodeInt.h @@ -106,7 +106,7 @@ typedef struct SQueryNode SQueryNode; #define VND_INFO_FNAME "vnode.json" #define VND_INFO_FNAME_TMP "vnode_tmp.json" -#define VNODE_METRIC_SQL_COUNT "taoscd_sql_req:count" +#define VNODE_METRIC_SQL_COUNT "taos_sql_req:count" #define VNODE_METRIC_TAG_NAME_SQL_TYPE "sql_type" #define VNODE_METRIC_TAG_NAME_CLUSTER_ID "cluster_id" diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c index 83cde72a91..22b53340e1 100644 --- a/source/libs/monitor/src/monMain.c +++ b/source/libs/monitor/src/monMain.c @@ -23,7 +23,8 @@ SMonitor tsMonitor = {0}; char* tsMonUri = "/report"; -char* tsMonFwUri = "/td_metric"; +char* tsMonFwUri = "/general-metric"; +char* tsMonFwBasicUri = "/taosd-cluster-basic"; void monRecordLog(int64_t ts, ELogLevel level, const char *content) { taosThreadMutexLock(&tsMonitor.lock); @@ -554,7 +555,7 @@ static void monGenLogJson(SMonInfo *pMonitor) { void monSendReport(SMonInfo *pMonitor){ char *pCont = tjsonToString(pMonitor->pJson); if(tsMonitorLogProtocol){ - uInfoL("report cont basic:\n%s", pCont); + uInfoL("report cont:\n%s", pCont); } if (pCont != NULL) { EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; @@ -597,6 +598,20 @@ void monGenAndSendReport() { monCleanupMonitorInfo(pMonitor); } +void monSendReportBasic(SMonInfo *pMonitor){ + char *pCont = tjsonToString(pMonitor->pJson); + if(tsMonitorLogProtocol){ + uInfoL("report cont basic:\n%s", pCont); + } + if (pCont != NULL) { + EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; + if (taosSendHttpReport(tsMonitor.cfg.server, tsMonFwBasicUri, tsMonitor.cfg.port, pCont, strlen(pCont), flag) != 0) { + uError("failed to send monitor msg"); + } + taosMemoryFree(pCont); + } +} + void monGenAndSendReportBasic() { SMonInfo *pMonitor = monCreateMonitorInfo(); if (pMonitor == NULL) return; @@ -605,7 +620,7 @@ void monGenAndSendReportBasic() { monGenBasicJsonBasic(pMonitor); monGenClusterJsonBasic(pMonitor); - monSendReport(pMonitor); + monSendReportBasic(pMonitor); monCleanupMonitorInfo(pMonitor); } \ No newline at end of file