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 2020/09/05 09:01:24 UTC

[skywalking] branch master updated (4f4ed3c -> 35264e6)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 4f4ed3c  skywalking-ui submodule update (#5442)
     add 35264e6  Support SSL for prometheus telemetry and prometheus fetcher (#5431)

No new revisions were added by this update.

Summary of changes:
 dist-material/release-docs/LICENSE                 |   2 +-
 docs/en/setup/backend/backend-fetcher.md           |  11 ++-
 docs/en/setup/backend/backend-telemetry.md         |  18 +++-
 .../src/main/resources/application.yml             |   3 +
 .../main/resources/fetcher-prom-rules/self.yaml    |   3 +-
 .../core/metric/promethues/rule/StaticConfig.java  |   2 +-
 .../rule/{LabelMatchRule.java => Target.java}      |   7 +-
 .../prometheus-fetcher-plugin/pom.xml              |   4 -
 .../server/fetcher/prometheus/http/HttpClient.java |  88 +++++++++++++++++
 .../fetcher/prometheus/http/HttpClientHandler.java |  64 +++++++++++++
 .../prometheus/http/HttpClientInitializer.java     |  55 +++++++++++
 .../provider/PrometheusFetcherProvider.java        |  22 ++---
 .../resources/fetcher-prom-rules/localhost.yaml    |   2 +-
 .../library/server/grpc/ssl/DynamicSslContext.java |  84 +++--------------
 .../AbstractSslContext.java}                       |  55 +++--------
 .../library/server/ssl/HttpDynamicSslContext.java  |  64 +++++++++++++
 .../server/{grpc => }/ssl/PrivateKeyUtil.java      |   6 +-
 .../server-telemetry/telemetry-prometheus/pom.xml  |  12 ++-
 .../telemetry/prometheus/PrometheusConfig.java     |   3 +
 .../prometheus/PrometheusTelemetryProvider.java    |   7 +-
 .../prometheus/httpserver/HttpServer.java          |  70 ++++++++++++++
 .../prometheus/httpserver/HttpServerHandler.java   | 105 +++++++++++++++++++++
 .../httpserver/HttpServerInitializer.java          |  32 ++++---
 .../known-oap-backend-dependencies-es7.txt         |   1 -
 .../known-oap-backend-dependencies.txt             |   1 -
 25 files changed, 550 insertions(+), 171 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/metric/promethues/rule/{LabelMatchRule.java => Target.java} (89%)
 create mode 100644 oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/http/HttpClient.java
 create mode 100644 oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/http/HttpClientHandler.java
 create mode 100644 oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/http/HttpClientInitializer.java
 copy oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/{grpc/ssl/DynamicSslContext.java => ssl/AbstractSslContext.java} (60%)
 create mode 100644 oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ssl/HttpDynamicSslContext.java
 rename oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/{grpc => }/ssl/PrivateKeyUtil.java (94%)
 create mode 100644 oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/httpserver/HttpServer.java
 create mode 100644 oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/httpserver/HttpServerHandler.java
 copy test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/retryable/RetryableTestContext.java => oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/httpserver/HttpServerInitializer.java (52%)