Merge pull request #22132 from taosdata/fix/TS-3691

fix/TS-3691: monitor no longer reports logs

source/libs/monitor/src/monMain.c

@@ -547,7 +547,7 @@ void monSendReport() {
   monGenGrantJson(pMonitor);
   monGenDnodeJson(pMonitor);
   monGenDiskJson(pMonitor);
-  monGenLogJson(pMonitor);
+  //monGenLogJson(pMonitor); // TS-3691
 
   char *pCont = tjsonToString(pMonitor->pJson);
   // uDebugL("report cont:%s\n", pCont);

tests/system-test/0-others/taosdMonitor.py

@@ -186,33 +186,6 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
             tdLog.exit("total is null!")
 
 
-        # log_infos  ====================================
-
-        if "log_infos" not in infoDict or infoDict["log_infos"]== None:
-            tdLog.exit("log_infos is null!")
-
-        if "logs" not in infoDict["log_infos"] or len(infoDict["log_infos"]["logs"]) < 8:#!= 10:
-            tdLog.exit("logs is null!")
-
-        if "ts" not in infoDict["log_infos"]["logs"][0] or len(infoDict["log_infos"]["logs"][0]["ts"]) <= 10:
-            tdLog.exit("ts is null!")
-
-        if "level" not in infoDict["log_infos"]["logs"][0] or infoDict["log_infos"]["logs"][0]["level"] not in ["error" ,"info" , "debug" ,"trace"]:
-            tdLog.exit("level is null!")
-
-        if "content" not in infoDict["log_infos"]["logs"][0] or len(infoDict["log_infos"]["logs"][0]["ts"]) <= 1:
-            tdLog.exit("content is null!")
-
-        if "summary" not in infoDict["log_infos"] or len(infoDict["log_infos"]["summary"])!= 4:
-            tdLog.exit("summary is null!")
-
-
-        if "total" not in infoDict["log_infos"]["summary"][0] or infoDict["log_infos"]["summary"][0]["total"] < 0 :
-            tdLog.exit("total is null!")
-
-        if "level" not in infoDict["log_infos"]["summary"][0] or infoDict["log_infos"]["summary"][0]["level"] not in ["error" ,"info" , "debug" ,"trace"]:
-            tdLog.exit("level is null!")
-
     def do_GET(self):
         """
         process GET request
@@ -315,4 +288,3 @@ class TDTestCase:
 
 tdCases.addLinux(__file__, TDTestCase())
 tdCases.addWindows(__file__, TDTestCase())
-