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 2023/02/19 15:26:06 UTC
[skywalking] branch master updated: Remove TLS support from firehose receiver (#10409)
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 eda83dca93 Remove TLS support from firehose receiver (#10409)
eda83dca93 is described below
commit eda83dca930e30fc34879d64878183360181b6b1
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 19 23:25:59 2023 +0800
Remove TLS support from firehose receiver (#10409)
* Remove TLS support from firehose receiver
Notice, no HTTPS/TLS setup support. By following AWS Firehose request, it uses [proxy request](https://en.wikipedia.org/wiki/Proxy_server#Web_proxy_servers) (`https://...` instead of `/aws/firehose/metrics`), there must be a proxy(Nginx, Envoy, etc.).
* Update docs.
---
docs/en/changes/changes.md | 4 +++-
docs/en/setup/backend/configuration-vocabulary.md | 3 ---
.../server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java | 3 ---
.../receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java | 3 ---
oap-server/server-starter/src/main/resources/application.yml | 3 ---
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 47f800f617..b7b15361ba 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -87,7 +87,9 @@
* [Optional] Optimize single trace query performance by customizing routing in ElasticSearch. SkyWalking trace segments and Zipkin spans are using trace ID for routing. This is OFF by default, controlled by `storage/elasticsearch/enableCustomRouting`.
* Enhance OAP HTTP server to support HTTPS
* Remove handler scan in otel receiver, manual initialization instead
-* Add aws-firehose-receiver to support collecting AWS CloudWatch metric(OpenTelemetry format)
+* Add aws-firehose-receiver to support collecting AWS CloudWatch metric(OpenTelemetry format). Notice, no HTTPS/TLS setup
+ support. By following AWS Firehose request, it uses [proxy request](https://en.wikipedia.org/wiki/Proxy_server#Web_proxy_servers)
+ (`https://...` instead of `/aws/firehose/metrics`), there must be a proxy(Nginx, Envoy, etc.).
* Avoid Antlr dependencies' versions might be different in compile time and runtime.
* Now `PrometheusMetricConverter#escapedName` also support converting `/` to `_`.
* Add missing TCP throughput metrics.
diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md
index 284fa5af75..134719a116 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -312,9 +312,6 @@ The Configuration Vocabulary lists all available configurations provided by `app
| - | - | idleTimeOut | Idle timeout of a connection for keep-alive. [...]
| - | - | acceptQueueSize | Maximum allowed number of open connections [...]
| - | - | maxRequestHeaderSize | Maximum length of all headers in an HTTP/1 response [...]
-| - | - | enableTLS | Indicate if enable HTTPS for the server [...]
-| - | - | tlsKeyPath | TLS key path [...]
-| - | - | tlsCertChainPath | TLS certificate chain path [...]
## Note
diff --git a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java
index 0d4689df19..5955f319d2 100644
--- a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java
+++ b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java
@@ -29,7 +29,4 @@ public class AWSFirehoseReceiverModuleConfig extends ModuleConfig {
private long idleTimeOut = 30000;
private int acceptQueueSize = 0;
private int maxRequestHeaderSize = 8192;
- private boolean enableTLS = false;
- private String tlsKeyPath;
- private String tlsCertChainPath;
}
diff --git a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java
index 22d69f634f..36dd7e40dd 100644
--- a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java
+++ b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java
@@ -70,9 +70,6 @@ public class AWSFirehoseReceiverModuleProvider extends ModuleProvider {
.acceptQueueSize(moduleConfig.getAcceptQueueSize())
.maxRequestHeaderSize(
moduleConfig.getMaxRequestHeaderSize())
- .enableTLS(moduleConfig.isEnableTLS())
- .tlsKeyPath(moduleConfig.getTlsKeyPath())
- .tlsCertChainPath(moduleConfig.getTlsCertChainPath())
.build();
httpServer = new HTTPServer(httpServerConfig);
httpServer.initialize();
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index a42c55bd26..de052da12c 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -555,6 +555,3 @@ aws-firehose:
idleTimeOut: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_IDLE_TIME_OUT:30000}
acceptQueueSize: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_ACCEPT_QUEUE_SIZE:0}
maxRequestHeaderSize: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_MAX_REQUEST_HEADER_SIZE:8192}
- enableTLS: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_ENABLE_TLS:false}
- tlsKeyPath: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_TLS_KEY_PATH:}
- tlsCertChainPath: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_TLS_CERT_CHAIN_PATH:}