[skywalking] branch istio-ctrl-patch updated (113e222 -> 3673a3b)

[ha...@apache.org]

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

hanahmily pushed a change to branch istio-ctrl-patch
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 113e222  Fix istio control plane ui template metric type mismatch issue
     new 3673a3b  Fix istio control plane ui template metric type mismatch issue

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (113e222)
            \
             N -- N -- N   refs/heads/istio-ctrl-patch (3673a3b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

[skywalking] 01/01: Fix istio control plane ui template metric type mismatch issue

[ha...@apache.org]

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

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

commit 3673a3b3e96f684c667b74945eb9dc67ad4c7e45
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jan 7 07:03:14 2021 +0800

    Fix istio control plane ui template metric type mismatch issue
    
    Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
 CHANGES.md                                                            | 1 +
 .../src/main/resources/ui-initialized-templates/istio.yml             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc46c9c..9e6528c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -46,6 +46,7 @@ Release Notes.
 * Adopt the [MAL](docs/en/concepts-and-designs/mal.md) in Envoy metrics service analyzer.
 * Fix the priority setting doesn't work of the ALS analyzers.
 * Fix bug that `endpoint-name-grouping.yml` is not customizable in Dockerized case.
+* Fix bug that istio version metric type on UI template mismatches the otel rule.
 
 #### UI
 * Fix un-removed tags in trace query.
diff --git a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
index 1e0f6df..d45122b 100644
--- a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
+++ b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
@@ -41,9 +41,9 @@ templates:
                   "height": 350,
                   "entityType": "Service",
                   "independentSelector": false,
-                  "metricType": "REGULAR_VALUE",
+                  "metricType": "LABELED_VALUE",
                   "metricName": "meter_istio_pilot_version",
-                  "queryMetricType": "readMetricsValues",
+                  "queryMetricType": "readLabeledMetricsValues",
                   "chartType": "ChartArea"
                 },
                 {