diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 536f740c61..267f780b99 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -92,6 +92,8 @@ * Fix duration time. * Remove the total field from query conditions. * Fix minDuration and maxDuration for the trace filter. +* Add Log configuration for the browser templates. +* Fix query conditions for the browser logs. #### Documentation diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json index 8669a2e522..6ba66d1740 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json @@ -360,19 +360,24 @@ "w": 24, "h": 48, "i": "0", - "type": "Trace", - "metricTypes": [ - "" - ], - "metrics": [ - "" - ], - "moved": false + "type": "Trace" + } + ] + }, + { + "name": "Log", + "children": [ + { + "x": 0, + "y": 0, + "w": 24, + "h": 48, + "i": "0", + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "BROWSER", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json index 4b3559e4f3..4174f11055 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json @@ -323,19 +323,24 @@ "w": 24, "h": 48, "i": "0", - "type": "Trace", - "metricTypes": [ - "" - ], - "metrics": [ - "" - ], - "moved": false + "type": "Trace" + } + ] + }, + { + "name": "Log", + "children": [ + { + "x": 0, + "y": 0, + "w": 24, + "h": 48, + "i": "0", + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "BROWSER", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json index d5754d2041..157fa9e95d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json @@ -137,19 +137,24 @@ "w": 24, "h": 48, "i": "0", - "type": "Trace", - "metricTypes": [ - "" - ], - "metrics": [ - "" - ], - "moved": false + "type": "Trace" + } + ] + }, + { + "name": "Log", + "children": [ + { + "x": 0, + "y": 0, + "w": 24, + "h": 48, + "i": "0", + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "BROWSER", diff --git a/skywalking-ui b/skywalking-ui index b544decbbb..f2e75f2b9f 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit b544decbbbb5c656118f2d45564dbea59c96d7e7 +Subproject commit f2e75f2b9fd47ef771fae5a9e381d520f2c5356a