This is an automated email from the ASF dual-hosted git repository. wusheng 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 f0db6d4 Change RabbitMQ opentelemetry config for hierarchy (#164) f0db6d4 is described below commit f0db6d467a61ed3f3b1fca0d9ce17277618e828c Author: peachisai <2581009...@qq.com> AuthorDate: Wed Feb 28 11:46:32 2024 +0800 Change RabbitMQ opentelemetry config for hierarchy (#164) --- Makefile.in | 4 ++-- .../templates/feature-rabbitmq-monitor/opentelemetry-config.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0920998..5b11291 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 ?= 6b49098aed66680025e50b8b18419e2b02423c46 +SW_OAP_IMAGE_TAG ?= a65a6e0ff2ef9c716131b36172399076307c35f1 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= 6b49098aed66680025e50b8b18419e2b02423c46 +SW_UI_IMAGE_TAG ?= a65a6e0ff2ef9c716131b36172399076307c35f1 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/kubernetes/templates/feature-rabbitmq-monitor/opentelemetry-config.yaml b/deploy/platform/kubernetes/templates/feature-rabbitmq-monitor/opentelemetry-config.yaml index 16142b7..7f7f1d6 100644 --- a/deploy/platform/kubernetes/templates/feature-rabbitmq-monitor/opentelemetry-config.yaml +++ b/deploy/platform/kubernetes/templates/feature-rabbitmq-monitor/opentelemetry-config.yaml @@ -29,7 +29,8 @@ regex: rabbitmq;metrics - source_labels: [ ] target_label: cluster - replacement: rabbitmq-cluster + replacement: {{ include "common.names.fullname" .Subcharts.rabbitmq }}.{{ .Release.Namespace }} + - source_labels: [ __address__ ] target_label: node regex: (.+)