This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch otlp
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 5807c790bbc0d4e751bcee63f4df6e6d9e35a380
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Wed Aug 24 15:11:26 2022 +0800
Switch to otlp exporter for all OTEL collector
---
.github/workflows/publish-images.yaml | 1 +
deploy/platform/docker/config/mysql-otel-collector-config.yaml | 8 ++++----
deploy/platform/docker/config/otel-collector-config.yaml | 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 ++--
.../kubernetes/feature-istiod-monitor/open-telemetry.yaml | 4 ++--
.../kubernetes/feature-kubernetes-monitor/open-telemetry.yaml | 4 ++--
deploy/platform/kubernetes/feature-mysql/open-telemetry.yaml | 4 ++--
deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 +-
deploy/platform/kubernetes/feature-so11y/open-telemetry.yaml | 4 ++--
deploy/platform/kubernetes/feature-vm/open-telemetry.yaml | 4 ++--
12 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/publish-images.yaml
b/.github/workflows/publish-images.yaml
index 30960a0..c8f698f 100644
--- a/.github/workflows/publish-images.yaml
+++ b/.github/workflows/publish-images.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- main
+ - otlp
env:
HUB: ghcr.io/apache/skywalking-showcase
diff --git a/deploy/platform/docker/config/mysql-otel-collector-config.yaml
b/deploy/platform/docker/config/mysql-otel-collector-config.yaml
index ce35ee3..17f0846 100644
--- a/deploy/platform/docker/config/mysql-otel-collector-config.yaml
+++ b/deploy/platform/docker/config/mysql-otel-collector-config.yaml
@@ -15,19 +15,19 @@
receivers:
prometheus:
- config:
+ config:
scrape_configs:
- job_name: 'mysql-monitoring'
scrape_interval: 10s
static_configs:
- targets: ['mysql-service:9104']
- labels:
+ labels:
host_name: showcase
processors:
batch:
exporters:
- opencensus:
+ otlp:
endpoint: oap:11800
tls:
insecure: true
@@ -39,4 +39,4 @@ service:
processors:
- batch
exporters:
- - opencensus
\ No newline at end of file
+ - otlp
diff --git a/deploy/platform/docker/config/otel-collector-config.yaml
b/deploy/platform/docker/config/otel-collector-config.yaml
index bff9b32..0b44a52 100644
--- a/deploy/platform/docker/config/otel-collector-config.yaml
+++ b/deploy/platform/docker/config/otel-collector-config.yaml
@@ -27,7 +27,7 @@ processors:
batch:
exporters:
- opencensus:
+ otlp:
endpoint: "oap:11800"
insecure: true
logging:
@@ -38,4 +38,4 @@ service:
metrics:
receivers: [ prometheus ]
processors: [ batch ]
- exporters: [ opencensus,logging ]
+ exporters: [ otlp,logging ]
diff --git a/deploy/platform/docker/docker-compose.cluster.yaml
b/deploy/platform/docker/docker-compose.cluster.yaml
index a15cb64..d779371 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_OC_RULES: vm,mysql # @feature: vm; enable the
OC rules that analyse the VM metrics
+ SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql # @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 2089ff0..cb16873 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_OC_RULES: vm,mysql # @feature: vm; enable the
OC rules that analyse the VM metrics
+ SW_OTEL_RECEIVER_ENABLED_OTEL_RULES: vm,mysql # @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/kubernetes/feature-cluster/resources.yaml
b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 4d07499..999b349 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -153,7 +153,7 @@ spec:
value: "-Dmode=init" # @feature: cluster; set the OAP mode to
"init" so the job can complete
- name: SW_OTEL_RECEIVER
value: default
- - name: SW_OTEL_RECEIVER_ENABLED_OC_RULES
+ - name: SW_OTEL_RECEIVER_ENABLED_OTEL_RULES
value: vm,oap,mysql
- name: SW_STORAGE
value: elasticsearch
@@ -231,7 +231,7 @@ spec:
value: default
- name: SW_OTEL_RECEIVER
value: default # @feature: so11y;,mysql;kubernetes-monitor
enable OpenTelemetry receiver to receive OpenTelemetry metrics
- - name: SW_OTEL_RECEIVER_ENABLED_OC_RULES
+ - name: SW_OTEL_RECEIVER_ENABLED_OTEL_RULES
# @feature: vm; enable vm rules to analyze VM metrics
# @feature: so11y; enable oap rules to analyze OAP metrics
# @feature: kubernetes-monitor; enable rules to analyze
Kubernetes Cluster/Node/Service metrics
diff --git
a/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
b/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
index ac8b31d..2eff014 100644
--- a/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
@@ -30,9 +30,9 @@ data:
pipelines:
metrics:
receivers: [ prometheus ]
- exporters: [ logging, opencensus ]
+ exporters: [ logging, otlp ]
exporters:
- opencensus:
+ otlp:
endpoint: "oap:11800"
insecure: true
logging:
diff --git
a/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
b/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
index 6ee488a..e352eb9 100644
--- a/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
@@ -30,9 +30,9 @@ data:
pipelines:
metrics:
receivers: [ prometheus ]
- exporters: [ logging, opencensus ]
+ exporters: [ logging, otlp ]
exporters:
- opencensus:
+ otlp:
endpoint: "oap:11800"
tls:
insecure: true
diff --git a/deploy/platform/kubernetes/feature-mysql/open-telemetry.yaml
b/deploy/platform/kubernetes/feature-mysql/open-telemetry.yaml
index 3e7644f..d5a643e 100644
--- a/deploy/platform/kubernetes/feature-mysql/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-mysql/open-telemetry.yaml
@@ -47,7 +47,7 @@ data:
processors:
batch:
exporters:
- opencensus:
+ otlp:
endpoint: oap:11800
tls:
insecure: true
@@ -61,7 +61,7 @@ data:
processors:
- batch
exporters:
- - opencensus
+ - otlp
---
apiVersion: apps/v1
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml
b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 6244c77..92dee92 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -163,7 +163,7 @@ spec:
value: default
- name: SW_OTEL_RECEIVER
value: default # @feature: so11y;mysql;vm;kubernetes-monitor
enable OpenTelemetry receiver to receive OpenTelemetry metrics
- - name: SW_OTEL_RECEIVER_ENABLED_OC_RULES
+ - name: SW_OTEL_RECEIVER_ENABLED_OTEL_RULES
# @feature: vm; enable vm rules to analyze VM metrics
# @feature: so11y; enable oap rules to analyze OAP metrics
# @feature: kubernetes-monitor; enable rules to analyze
Kubernetes Cluster/Node/Service metrics
diff --git a/deploy/platform/kubernetes/feature-so11y/open-telemetry.yaml
b/deploy/platform/kubernetes/feature-so11y/open-telemetry.yaml
index 3f38161..afa7832 100644
--- a/deploy/platform/kubernetes/feature-so11y/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-so11y/open-telemetry.yaml
@@ -48,7 +48,7 @@ data:
replacement: $$1
exporters:
- opencensus:
+ otlp:
endpoint: "oap:11800"
tls:
insecure: true
@@ -59,7 +59,7 @@ data:
pipelines:
metrics:
receivers: [ prometheus ]
- exporters: [ opencensus,logging ]
+ exporters: [ otlp,logging ]
---
apiVersion: apps/v1
diff --git a/deploy/platform/kubernetes/feature-vm/open-telemetry.yaml
b/deploy/platform/kubernetes/feature-vm/open-telemetry.yaml
index 2e51653..a1996da 100644
--- a/deploy/platform/kubernetes/feature-vm/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-vm/open-telemetry.yaml
@@ -45,7 +45,7 @@ data:
replacement: $$1
exporters:
- opencensus:
+ otlp:
endpoint: "oap:11800"
tls:
insecure: true
@@ -56,7 +56,7 @@ data:
pipelines:
metrics:
receivers: [ prometheus ]
- exporters: [ opencensus,logging ]
+ exporters: [ otlp,logging ]
---
apiVersion: apps/v1
