This is an automated email from the ASF dual-hosted git repository. tanjian 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 f07cdad fix env var typo (#154) f07cdad is described below commit f07cdad0d6a5fcf54fda3836713b9282d2c2eb6b Author: Jared Tan <jian....@daocloud.io> AuthorDate: Sun Dec 24 19:21:48 2023 +0800 fix env var typo (#154) --- deploy/platform/docker/docker-compose.cluster.yaml | 2 +- deploy/platform/docker/docker-compose.single-node.yaml | 2 +- deploy/platform/kubernetes/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/platform/docker/docker-compose.cluster.yaml b/deploy/platform/docker/docker-compose.cluster.yaml index 07b7f65..bb4d41f 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,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: vm; enable the OC rules that analyse the VM metrics + SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: vm,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/* # @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 1aa6fc6..705ca26 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/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: vm,mysql,postgresql,elasticsearch; enable the OC rules that analyse the metrics + SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: vm,mysql/*,postgresql/*,elasticsearch/*,rabbitmq/*,mongodb/* # @feature: vm,mysql,postgresql,elasticsearch; 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/values.yaml b/deploy/platform/kubernetes/values.yaml index dffd3f7..180778f 100644 --- a/deploy/platform/kubernetes/values.yaml +++ b/deploy/platform/kubernetes/values.yaml @@ -40,7 +40,7 @@ skywalking: # @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 - SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/* + SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES: vm,oap,k8s/*,istio-controlplane,mysql/*,postgresql/*,apisix,elasticsearch/*,rabbitmq/*,mongodb/*,nginx/* SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self o11y through prometheus SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS: "mx-mesh,persistence" # @feature: als; enable mesh analyzer (mx-mesh) to analyze ALS logs K8S_SERVICE_NAME_RULE: "mesh-svr::${service.metadata.name}"