You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/06/06 01:48:44 UTC
[skywalking] branch master updated: sync ui: visualize a on-demand log widget, update license and submodule (#9170)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f436e8b6c1 sync ui: visualize a on-demand log widget, update license and submodule (#9170)
f436e8b6c1 is described below
commit f436e8b6c1a724b38256f182ba800303530f6fc9
Author: Fine0830 <fi...@outlook.com>
AuthorDate: Mon Jun 6 09:48:38 2022 +0800
sync ui: visualize a on-demand log widget, update license and submodule (#9170)
---
dist-material/release-docs/LICENSE | 1 +
.../licenses/ui-licenses/LICENSE-monaco-editor | 21 +++++++++++++++++++++
docs/en/changes/changes.md | 2 ++
skywalking-ui | 2 +-
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index cabac6b751..23465250ae 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -438,6 +438,7 @@ batch-processor 1.0.0: https://github.com/wnr/batch-processor MIT
d3-tip 0.9.1: https: //github.com/Caged/d3-tip MIT
ctrl/tinycolor 3.4.0: https: //github.com/scttcper/tinycolor MIT
element-plus/icons-vue 0.2.7: https://github.com/element-plus/element-plus-icons MIT
+monaco-editor 0.27.0: https://github.com/microsoft/monaco-editor MIT
========================================
Apache 2.0 licenses
========================================
diff --git a/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor b/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor
new file mode 100644
index 0000000000..f692467207
--- /dev/null
+++ b/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 - present Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 971f373710..49fbdfbdaa 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -110,6 +110,8 @@
* Add Spanish Translation.
* Visualize the OFF CPU eBPF profiling.
* Add Spanish language to UI.
+* Sort spans with startTime or spanId in a segment.
+* Visualize a on-demand log widget.
#### Documentation
diff --git a/skywalking-ui b/skywalking-ui
index b34c0b0c72..30069ce825 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit b34c0b0c728beb60b8edb7332a0e305b2650c13f
+Subproject commit 30069ce82505c973b624531209611cea32d6db10