[skywalking] 01/01: Document

[ha...@apache.org]

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

hanahmily pushed a commit to branch group-in-action
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 54958b599208a20661b00420e4f3b2baf8b6b7bf
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Nov 26 06:43:48 2020 +0800

    Document
    
    Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
 CHANGES.md                                                        | 1 +
 docs/en/setup/backend/backend-fetcher.md                          | 8 ++++----
 .../main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1918e5a..70682a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -54,6 +54,7 @@ Release Notes.
 * Fix "transaction too large error" when use TiDB as storage.
 * Add otel rules to ui template to observe Istio control plane.
 * Remove istio mixer
+* Insert group name into services of so11y and istio relevant metrics
 
 #### UI
 * Fix incorrect label in radial chart in topology.
diff --git a/docs/en/setup/backend/backend-fetcher.md b/docs/en/setup/backend/backend-fetcher.md
index 5ff8752..9bbb4da 100644
--- a/docs/en/setup/backend/backend-fetcher.md
+++ b/docs/en/setup/backend/backend-fetcher.md
@@ -46,10 +46,10 @@ staticConfig:
   # Labels assigned to all metrics fetched from the targets.
   labels:
     [ <labelname>: <labelvalue> ... ]
-# insert group_name into metric name, for example, meter_<group_name>_<raw_metric_name>
-group: <group_name>
-# default metric level function appends to all expression in this file.
-defaultMetricLevel: <exp>
+# expSuffix is appended to all expression in this file.
+expSuffix: tag({tags -> tags.service = 'oap::' + tags.service}).instance(['service'], ['instance'])
+# insert metricPrefix into metric name:  <metricPrefix>_<raw_metric_name>
+metricPrefix: <exp>
 # Metrics rule allow you to recompute queries.
 metricsRules:
    [ - <metric_rules> ]
diff --git a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
index 9fc9285..8755390 100644
--- a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
+++ b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
@@ -129,9 +129,9 @@ public class MetricsQuery extends AbstractQuery<MetricsQuery> {
     private String id;
     private String metricsName;
 
-    public static String METER_JVM_MEMORY_MAX = "meter_oap_jvm_memory_max";
-    public static String METER_JVM_THREADS_LIVE = "meter_oap_jvm_threads_live";
-    public static String METER_PROCESS_FILES_MAX = "meter_oap_process_files_max";
+    public static String METER_JVM_MEMORY_MAX = "meter_jvm_memory_max";
+    public static String METER_JVM_THREADS_LIVE = "meter_jvm_threads_live";
+    public static String METER_PROCESS_FILES_MAX = "meter_process_files_max";
     public static String[] SIMPLE_MICROMETER_METERS = {
         METER_JVM_MEMORY_MAX,
         METER_JVM_THREADS_LIVE,