This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 5721ab7 Bump up OAP and adjust configurations
5721ab7 is described below
commit 5721ab753c2470095a38db295e042455fbce8d78
Author: kezhenxu94 <[email protected]>
AuthorDate: Fri Nov 11 16:45:42 2022 +0800
Bump up OAP and adjust configurations
---
Makefile.in | 4 ++--
deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
deploy/platform/kubernetes/feature-cluster/resources.yaml | 4 ++--
deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 554173c..866358c 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:828e6e2f2b57a0f06bb0d507e3296d2377943d9a
-SW_UI_IMAGE ?=
ghcr.io/apache/skywalking/ui:828e6e2f2b57a0f06bb0d507e3296d2377943d9a
+SW_OAP_IMAGE ?=
ghcr.io/apache/skywalking/oap:7c8867bed7110c7eac5379dca5119ae6faf68857
+SW_UI_IMAGE ?=
ghcr.io/apache/skywalking/ui:7c8867bed7110c7eac5379dca5119ae6faf68857
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/docker/docker-compose.cluster.yaml
b/deploy/platform/docker/docker-compose.cluster.yaml
index 7a54720..16ad05b 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -53,7 +53,7 @@ services:
SW_CLUSTER_ZK_HOST_PORT: zookeeper:2181 # @feature: cluster; set up the
cluster coordinator address
SW_HEALTH_CHECKER: default # @feature: health-check;
SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that
receives the VM metrics
- SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql,postgresql,apisix #
@feature: vm; enable the OC rules that analyse the VM metrics
+ SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql/*,postgresql/*,apisix #
@feature: vm; enable the OC rules that analyse the VM metrics
SW_STORAGE: elasticsearch
SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self
o11y through prometheus
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml
b/deploy/platform/docker/docker-compose.single-node.yaml
index bb25593..72c076e 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -43,7 +43,7 @@ services:
environment:
SW_HEALTH_CHECKER: default # @feature: health-check;
SW_OTEL_RECEIVER: default # @feature: vm; enable the OC receiver that
receives the VM metrics
- SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql,postgresql # @feature:
vm,mysql,postgresql; enable the OC rules that analyse the metrics
+ SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql/*,postgresql/* # @feature:
vm,mysql,postgresql; enable the OC rules that analyse the metrics
SW_STORAGE: elasticsearch
SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self
o11y through prometheus
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index e60c50d..0357afb 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -106,7 +106,7 @@ spec:
- name: SW_OTEL_RECEIVER
value: default
- name: SW_OTEL_RECEIVER_ENABLED_OTEL_RULES
- value: vm,oap,mysql
+ value: vm,oap,mysql/*
- name: SW_STORAGE
value: elasticsearch
- name: SW_STORAGE_ES_CLUSTER_NODES
@@ -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/*,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 e1b6b4e..5d4a2ab 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/*,istio-controlplane,mysql
+ value: vm,oap,k8s/*,istio-controlplane,mysql/*
- name: SW_STORAGE
value: elasticsearch
- name: SW_STORAGE_ES_CLUSTER_NODES
