You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/05/10 04:02:23 UTC
[skywalking] branch master updated: Recover the module name of
envoy-metric. (#2645)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 3a31812 Recover the module name of envoy-metric. (#2645)
3a31812 is described below
commit 3a318128545627da1420fb26eb24030df07623b4
Author: 彭勇升 pengys <pe...@apache.org>
AuthorDate: Fri May 10 12:02:17 2019 +0800
Recover the module name of envoy-metric. (#2645)
---
docs/en/setup/backend/backend-receivers.md | 4 ++--
.../oap/server/receiver/envoy/EnvoyMetricReceiverModule.java | 2 +-
oap-server/server-starter/src/main/assembly/application.yml | 2 +-
oap-server/server-starter/src/main/resources/application.yml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/en/setup/backend/backend-receivers.md b/docs/en/setup/backend/backend-receivers.md
index 2a2540f..a5cd09b 100644
--- a/docs/en/setup/backend/backend-receivers.md
+++ b/docs/en/setup/backend/backend-receivers.md
@@ -10,7 +10,7 @@ We have following receivers, and `default` implementors are provided in our Apac
1. **service-mesh**. gRPC services accept data from inbound mesh probes.
1. **receiver-jvm**. gRPC services accept JVM metrics data.
1. **istio-telemetry**. Istio telemetry is from Istio official bypass adaptor, this receiver match its gRPC services.
-1. **envoy-metrics**. Envoy `metrics_service` supported by this receiver. OAL script support all GAUGE type metrics.
+1. **envoy-metric**. Envoy `metrics_service` supported by this receiver. OAL script support all GAUGE type metrics.
1. **receiver_zipkin**. See [details](#zipkin-receiver).
1. **receiver_jaeger**. See [details](#jaeger-receiver).
@@ -35,7 +35,7 @@ service-mesh:
bufferFileCleanWhenRestart: false
istio-telemetry:
default:
-envoy-metrics:
+envoy-metric:
default:
receiver_zipkin:
default:
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
index 449518f..d430428 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java
@@ -26,7 +26,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine;
* @author wusheng
*/
public class EnvoyMetricReceiverModule extends ModuleDefine {
- public static final String NAME = "envoy-metrics";
+ public static final String NAME = "envoy-metric";
public EnvoyMetricReceiverModule() {
super(NAME);
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index 0f25c93..cd71767 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -100,7 +100,7 @@ service-mesh:
bufferFileCleanWhenRestart: ${SW_SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
istio-telemetry:
default:
-envoy-metrics:
+envoy-metric:
default:
#receiver_zipkin:
# default:
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 27a9f25..08ccd06 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -100,7 +100,7 @@ service-mesh:
bufferFileCleanWhenRestart: ${SW_SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
istio-telemetry:
default:
-envoy-metrics:
+envoy-metric:
default:
#receiver_zipkin:
# default: