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/11/02 03:55:25 UTC
[skywalking-showcase] 01/01: Bump up oap and adjust configurations
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch oap
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit b77c97f828c6b183a4570e7e0d6c422e40d647fe
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Nov 2 11:55:16 2022 +0800
Bump up oap and adjust configurations
---
Makefile.in | 4 ++--
deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e4c2364..554173c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,8 +26,8 @@ TAG ?= $(shell git rev-parse --short HEAD)
ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
-SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:4aa516ad5893573d63b7ff15042fc221d5fb4334
-SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui:4aa516ad5893573d63b7ff15042fc221d5fb4334
+SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:828e6e2f2b57a0f06bb0d507e3296d2377943d9a
+SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui:828e6e2f2b57a0f06bb0d507e3296d2377943d9a
SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:ec85225f3fc0d0d7e8a9513b828d305c7cb399ad
SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
SW_AGENT_JAVA_IMAGE ?= ghcr.io/apache/skywalking-java/skywalking-java:3f88d735ba2bfd1196aff946502447d4b14450c8-java8
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 106878e..e60c50d 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -200,7 +200,7 @@ spec:
# @feature: istiod-monitor; enable rules to analyze Istio control plane metrics
# @feature: mysql; enable mysql rules to analyze MySQL metrics
# @feature: apisix-monitor; enable APISIX rules to analyze APISIX metrics
- value: vm,oap,k8s-cluster,k8s-node,k8s-service,k8s-instance,istio-controlplane,mysql,postgresql,apisix
+ value: vm,oap,k8s/*,istio-controlplane,mysql,postgresql,apisix
- name: SW_STORAGE
value: elasticsearch
- name: SW_STORAGE_ES_CLUSTER_NODES
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index ef4deb5..e1b6b4e 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -127,7 +127,7 @@ spec:
# @feature: kubernetes-monitor; enable rules to analyze Kubernetes Cluster/Node/Service metrics
# @feature: istiod-monitor; enable rules to analyze Istio metrics
# @feature: mysql; enable rules to analyze MySQL metrics
- value: vm,oap,k8s-cluster,k8s-node,k8s-service,k8s-instance,istio-controlplane,mysql
+ value: vm,oap,k8s/*,istio-controlplane,mysql
- name: SW_STORAGE
value: elasticsearch
- name: SW_STORAGE_ES_CLUSTER_NODES