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/07/29 23:32:52 UTC

[skywalking] branch master updated (5d7da1a -> 5f769ca)

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 5d7da1a  Add internalComHost and internalComPort config to Nacos. (#5192)
     add 5f769ca  Add AvgLabeledFunction to ingest multiple labels (#5187)

No new revisions were added by this update.

Summary of changes:
 .../{AvgFunction.java => AvgLabeledFunction.java}  |  96 +++++++++---------
 .../server/core/analysis/metrics/DataTable.java    |   5 +
 .../promethues/PrometheusMetricConverter.java      |  38 ++++++-
 .../metric/promethues/operation/MetricSource.java  |   3 +
 .../metric/promethues/rule/PrometheusMetric.java   |   1 +
 .../server/core/metric/promethues/rule/Rules.java  |   1 +
 .../meter/function/AvgLabeledFunctionTest.java     | 112 +++++++++++++++++++++
 .../provider/PrometheusFetcherProvider.java        |   3 +
 8 files changed, 209 insertions(+), 50 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/{AvgFunction.java => AvgLabeledFunction.java} (66%)
 create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/AvgLabeledFunctionTest.java