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 bbe2e5d Fix docker configurations and bump up images (#167)
bbe2e5d is described below
commit bbe2e5d3b17c3d68094aafc16ae0d5f1e3328448
Author: Starry <codeprince2...@163.com>
AuthorDate: Sun Apr 7 23:33:55 2024 +0800
Fix docker configurations and bump up images (#167)
---
Makefile.in | 4 ++--
deploy/platform/docker/docker-compose.mongodb-monitor.yaml | 2 +-
deploy/platform/docker/docker-compose.pulsar-monitor.yaml | 2 +-
deploy/platform/docker/docker-compose.rocketmq-monitor.yaml | 4 ++--
docs/readme.md | 1 +
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index fd1de2d..566e680 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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2
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/docker/docker-compose.mongodb-monitor.yaml
b/deploy/platform/docker/docker-compose.mongodb-monitor.yaml
index 640c9f3..b311f34 100644
--- a/deploy/platform/docker/docker-compose.mongodb-monitor.yaml
+++ b/deploy/platform/docker/docker-compose.mongodb-monitor.yaml
@@ -77,7 +77,7 @@ services:
- '--collector.diagnosticdata'
- '--collector.replicasetstatus'
otel-collector:
- image: otel/opentelemetry-collector:0.72.0
+ image: ${OTEL_COLLECTOR_IMAGE}:${OTEL_COLLECTOR_IMAGE_TAG}
networks:
- sw
command: [ "--config=/etc/otel-collector-config.yaml" ]
diff --git a/deploy/platform/docker/docker-compose.pulsar-monitor.yaml
b/deploy/platform/docker/docker-compose.pulsar-monitor.yaml
index 6fbdcf5..7357b3b 100644
--- a/deploy/platform/docker/docker-compose.pulsar-monitor.yaml
+++ b/deploy/platform/docker/docker-compose.pulsar-monitor.yaml
@@ -120,7 +120,7 @@ services:
command: bash -c "bin/pulsar-perf produce -m 1 sw-topic"
otel-collector:
- image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION}
+ image: ${OTEL_COLLECTOR_IMAGE}:${OTEL_COLLECTOR_IMAGE_TAG}
networks:
- sw
command: [ "--config=/etc/otel-collector-config.yaml" ]
diff --git a/deploy/platform/docker/docker-compose.rocketmq-monitor.yaml
b/deploy/platform/docker/docker-compose.rocketmq-monitor.yaml
index 2a5fc52..bf57f08 100644
--- a/deploy/platform/docker/docker-compose.rocketmq-monitor.yaml
+++ b/deploy/platform/docker/docker-compose.rocketmq-monitor.yaml
@@ -101,10 +101,10 @@ services:
- e2e
otel-collector:
- image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION}
+ image: ${OTEL_COLLECTOR_IMAGE}:${OTEL_COLLECTOR_IMAGE_TAG}
networks:
- e2e
- command: [ "--config=/etc/otel-collector-rocketmq-config.yaml" ]
+ command: [ "--config=/etc/otel-collector-config.yaml" ]
volumes:
-
./config/rocketmq/otel-collector-rocketmq-config.yaml:/etc/otel-collector-config.yaml
expose:
diff --git a/docs/readme.md b/docs/readme.md
index 40f1c76..c5131ef 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -113,6 +113,7 @@ Currently, the features supported are:
| `r3` | Deploy [R3](https://github.com/SkyAPM/R3) as
RESTful URL recognition service.
|
|
| `rocketmq-monitor` | Deploy OpenTelemetry and export RocketMQ
monitoring metrics to SkyWalking for analysis and display on UI.
|
|
| `pulsar-monitor` | Deploy OpenTelemetry and export Pulsar monitoring
metrics to SkyWalking for analysis and display on UI.
|
|
+| `rabbitmq-monitor` | Deploy OpenTelemetry and export RabbitMQ
monitoring metrics to SkyWalking for analysis and display on UI.
|
|
### Kubernetes
