From e24b2bcf742e5d66fefb7bb9cb78452029934ac8 Mon Sep 17 00:00:00 2001
From: Zhenxu Ke <kezhenxu94@apache.org>
Date: Mon, 4 Jan 2021 07:06:35 +0800
Subject: [PATCH] Fix bug that endpoint-name-grouping.yml can not be customized
 in docker / helm (#6124)

---
 CHANGES.md                                    | 1 +
 apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
 apm-dist/src/main/assembly/binary.xml         | 1 +
 oap-server/server-bootstrap/pom.xml           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f744a2acb2..1766fd6209 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -44,6 +44,7 @@ Release Notes.
 * Support Envoy {AccessLog,Metrics}Service API V3.
 * 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.
 
 #### UI
 * Fix un-removed tags in trace query.
diff --git a/apm-dist-es7/src/main/assembly/binary-es7.xml b/apm-dist-es7/src/main/assembly/binary-es7.xml
index d819c482d7..e47b334957 100644
--- a/apm-dist-es7/src/main/assembly/binary-es7.xml
+++ b/apm-dist-es7/src/main/assembly/binary-es7.xml
@@ -51,6 +51,7 @@
                 <include>gateways.yml</include>
                 <include>service-apdex-threshold.yml</include>
                 <include>endpoint-name-grouping.yml</include>
+                <include>metadata-service-mapping.yaml</include>
                 <include>oal/*.oal</include>
                 <include>fetcher-prom-rules/*.yaml</include>
                 <include>envoy-metrics-rules/*.yaml</include>
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index 4ddc268357..02586211bb 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -51,6 +51,7 @@
                 <include>gateways.yml</include>
                 <include>service-apdex-threshold.yml</include>
                 <include>endpoint-name-grouping.yml</include>
+                <include>metadata-service-mapping.yaml</include>
                 <include>oal/*.oal</include>
                 <include>fetcher-prom-rules/*.yaml</include>
                 <include>envoy-metrics-rules/*.yaml</include>
diff --git a/oap-server/server-bootstrap/pom.xml b/oap-server/server-bootstrap/pom.xml
index 8c636417d7..1afc7becf3 100644
--- a/oap-server/server-bootstrap/pom.xml
+++ b/oap-server/server-bootstrap/pom.xml
@@ -257,6 +257,7 @@
                         <exclude>gateways.yml</exclude>
                         <exclude>service-apdex-threshold.yml</exclude>
                         <exclude>endpoint-name-grouping.yml</exclude>
+                        <exclude>metadata-service-mapping.yaml</exclude>
                         <exclude>oal/</exclude>
                         <exclude>fetcher-prom-rules/</exclude>
                         <exclude>envoy-metrics-rules/</exclude>
-- 
GitLab