Merge branch '3.0' into fix/3_liaohj

source/libs/monitor/src/monMain.c

@@ -468,9 +468,6 @@ static void monGenLogJson(SMonInfo *pMonitor) {
     return;
   }
 
-  SJson *pLogsJson = tjsonAddArrayToObject(pJson, "logs");
-  if (pLogsJson == NULL) return;
-
   SMonLogs *logs[6];
   logs[0] = &pMonitor->log;
   logs[1] = &pMonitor->mmInfo.log;
@@ -490,22 +487,6 @@ static void monGenLogJson(SMonInfo *pMonitor) {
     numOfInfoLogs += pLog->numOfInfoLogs;
     numOfDebugLogs += pLog->numOfDebugLogs;
     numOfTraceLogs += pLog->numOfTraceLogs;
-
-    for (int32_t i = 0; i < taosArrayGetSize(pLog->logs); ++i) {
-      SJson *pLogJson = tjsonCreateObject();
-      if (pLogJson == NULL) continue;
-
-      SMonLogItem *pLogItem = taosArrayGet(pLog->logs, i);
-
-      char buf[40] = {0};
-      taosFormatUtcTime(buf, sizeof(buf), pLogItem->ts, TSDB_TIME_PRECISION_MILLI);
-
-      tjsonAddStringToObject(pLogJson, "ts", buf);
-      tjsonAddStringToObject(pLogJson, "level", monLogLevelStr(pLogItem->level));
-      tjsonAddStringToObject(pLogJson, "content", pLogItem->content);
-
-      if (tjsonAddItemToArray(pLogsJson, pLogJson) != 0) tjsonDelete(pLogJson);
-    }
   }
 
   SJson *pSummaryJson = tjsonAddArrayToObject(pJson, "summary");
@@ -547,7 +528,7 @@ void monSendReport() {
   monGenGrantJson(pMonitor);
   monGenDnodeJson(pMonitor);
   monGenDiskJson(pMonitor);
-  //monGenLogJson(pMonitor); // TS-3691
+  monGenLogJson(pMonitor);
 
   char *pCont = tjsonToString(pMonitor->pJson);
   // uDebugL("report cont:%s\n", pCont);

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

@@ -185,6 +185,19 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
         if "total" not in infoDict["disk_infos"]["tempdir"] or infoDict["disk_infos"]["tempdir"]["total"] <= 0:
             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 "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):
         """