You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2023/04/14 07:12:40 UTC

[skywalking-showcase] 01/01: update OAP and UI

This is an automated email from the ASF dual-hosted git repository.

wankai pushed a commit to branch update-ui
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit 9534c5b1d9fb2c809c14b9691cab29d0c1dfefae
Author: wankai123 <wa...@foxmail.com>
AuthorDate: Fri Apr 14 15:12:18 2023 +0800

    update OAP and UI
---
 Makefile.in                                                    | 4 ++--
 deploy/platform/config/promql/dashboards/general-service.json  | 6 +++---
 deploy/platform/config/promql/dashboards/service-mesh.json     | 6 +++---
 deploy/platform/config/promql/dashboards/virtual-database.json | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5bcbfbc..d24f8f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,10 +29,10 @@ ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss
 ES_IMAGE_TAG ?= 7.10.2
 
 SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 3dea32a098f73f534bc3e268dea91daed90c4662
+SW_OAP_IMAGE_TAG ?= 95c398115b5df06b2a070cb322577927bdf2f36a
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 3dea32a098f73f534bc3e268dea91daed90c4662
+SW_UI_IMAGE_TAG ?= 95c398115b5df06b2a070cb322577927bdf2f36a
 
 SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
 SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/config/promql/dashboards/general-service.json b/deploy/platform/config/promql/dashboards/general-service.json
index 3938f4b..f98216c 100644
--- a/deploy/platform/config/promql/dashboards/general-service.json
+++ b/deploy/platform/config/promql/dashboards/general-service.json
@@ -3320,8 +3320,8 @@
       {
         "current": {
           "selected": false,
-          "text": "Prometheus",
-          "value": "Prometheus"
+          "text": "SkyWalking",
+          "value": "SkyWalking"
         },
         "hide": 2,
         "includeAll": false,
@@ -3330,7 +3330,7 @@
         "options": [],
         "query": "prometheus",
         "refresh": 1,
-        "regex": "",
+        "regex": "SkyWalking",
         "skipUrlSync": false,
         "type": "datasource"
       }
diff --git a/deploy/platform/config/promql/dashboards/service-mesh.json b/deploy/platform/config/promql/dashboards/service-mesh.json
index b1e2448..8ed7a59 100644
--- a/deploy/platform/config/promql/dashboards/service-mesh.json
+++ b/deploy/platform/config/promql/dashboards/service-mesh.json
@@ -3864,8 +3864,8 @@
       {
         "current": {
           "selected": false,
-          "text": "Prometheus",
-          "value": "Prometheus"
+          "text": "SkyWalking",
+          "value": "SkyWalking"
         },
         "hide": 2,
         "includeAll": false,
@@ -3874,7 +3874,7 @@
         "options": [],
         "query": "prometheus",
         "refresh": 1,
-        "regex": "",
+        "regex": "SkyWalking",
         "skipUrlSync": false,
         "type": "datasource"
       }
diff --git a/deploy/platform/config/promql/dashboards/virtual-database.json b/deploy/platform/config/promql/dashboards/virtual-database.json
index 5ef9c94..338f48c 100644
--- a/deploy/platform/config/promql/dashboards/virtual-database.json
+++ b/deploy/platform/config/promql/dashboards/virtual-database.json
@@ -528,8 +528,8 @@
       {
         "current": {
           "selected": false,
-          "text": "Prometheus",
-          "value": "Prometheus"
+          "text": "SkyWalking",
+          "value": "SkyWalking"
         },
         "hide": 2,
         "includeAll": false,
@@ -538,7 +538,7 @@
         "options": [],
         "query": "prometheus",
         "refresh": 1,
-        "regex": "",
+        "regex": "SkyWalking",
         "skipUrlSync": false,
         "type": "datasource"
       }