You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/06/05 07:15:03 UTC
[skywalking] branch meter/prometheus updated (655af5b -> ed701c1)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch meter/prometheus
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 655af5b Merge branch 'master' into meter/prometheus
add f650cbf Document prometheus fetcher and some nists
add 402bb15 Merge branch 'master' into meter/prometheus
add ed701c1 Merge branch 'meter/prometheus' of github.com:apache/skywalking into meter/prometheus
No new revisions were added by this update.
Summary of changes:
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
apm-dist/src/main/assembly/binary.xml | 1 +
docker/oap/docker-entrypoint.sh | 5 -
docs/en/setup/backend/backend-fetcher.md | 76 +++-
docs/en/setup/backend/backend-telemetry.md | 34 +-
oap-server/server-bootstrap/pom.xml | 11 +-
.../src/main/resources/application.yml | 8 -
.../main/resources/fetcher-prom-rules/self.yaml | 28 +-
.../server-bootstrap/src/main/resources/log4j2.xml | 1 -
...on.java => AvgHistogramPercentileFunction.java} | 22 +-
.../provider/PrometheusFetcherProvider.java | 28 +-
oap-server/server-receiver-plugin/pom.xml | 1 -
.../skywalking-so11y-receiver-plugin/pom.xml | 39 --
.../server/receiver/so11y/So11yReceiverConfig.java | 27 --
.../server/receiver/so11y/So11yReceiverModule.java | 37 --
.../so11y/So11yReceiverModuleProvider.java | 426 ---------------------
...ywalking.oap.server.library.module.ModuleDefine | 19 -
...alking.oap.server.library.module.ModuleProvider | 19 -
oap-server/server-telemetry/pom.xml | 1 -
.../server-telemetry/telemetry-so11y/pom.xml | 39 --
.../oap/server/telemetry/so11y/So11yConfig.java | 38 --
.../telemetry/so11y/So11yMetricsCollector.java | 50 ---
.../telemetry/so11y/So11yMetricsCreator.java | 48 ---
.../telemetry/so11y/So11yTelemetryProvider.java | 85 ----
...alking.oap.server.library.module.ModuleProvider | 20 -
pom.xml | 1 +
.../known-oap-backend-dependencies-es7.txt | 2 +
.../known-oap-backend-dependencies.txt | 2 +
28 files changed, 131 insertions(+), 938 deletions(-)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/{AvgPercentileFunction.java => AvgHistogramPercentileFunction.java} (92%)
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverConfig.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
delete mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/pom.xml
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yConfig.java
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java
delete mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider