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/01 07:17:45 UTC

[skywalking] branch meter/prometheus updated (51be4b9 -> 969b4ca)

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 51be4b9  Merge branch 'master' into meter/prometheus
     add 969b4ca  Polish codes

No new revisions were added by this update.

Summary of changes:
 .../main/resources/fetcher-prom-rules/self.yaml    | 37 +++++++++++++++-------
 .../provider/PrometheusFetcherProvider.java        | 12 +++----
 .../prometheus/provider/counter/Window.java        |  2 +-
 .../{downsampling => operation}/Operation.java     |  2 +-
 .../{downsampling => operation}/Source.java        |  2 +-
 .../prometheus/provider/rule/MetricsRule.java      |  2 +-
 .../resources/fetcher-prom-rules/localhost.yaml    |  2 +-
 .../src/main/resources/query-protocol              |  2 +-
 8 files changed, 38 insertions(+), 23 deletions(-)
 rename oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/provider/{downsampling => operation}/Operation.java (98%)
 rename oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/provider/{downsampling => operation}/Source.java (98%)