This is an automated email from the ASF dual-hosted git repository.
guyuqi pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new d079d47e1 BIGTOP-3895: Use OSS version of Grafana for Ambari Metrics
(#1079)
d079d47e1 is described below
commit d079d47e15c926a87d2e2c5f7067f186df79646f
Author: Zhiguo Wu <[email protected]>
AuthorDate: Fri Dec 23 17:42:04 2022 +0800
BIGTOP-3895: Use OSS version of Grafana for Ambari Metrics (#1079)
(cherry picked from commit 4174fd2987a148ad11b48e748e2ea93bbc445174)
---
.../common/ambari/patch5-refine-AMBARI-25599-for-Hadoop-3.4.diff | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/bigtop-packages/src/common/ambari/patch5-refine-AMBARI-25599-for-Hadoop-3.4.diff
b/bigtop-packages/src/common/ambari/patch5-refine-AMBARI-25599-for-Hadoop-3.4.diff
index daed1e313..a614e4f0f 100644
---
a/bigtop-packages/src/common/ambari/patch5-refine-AMBARI-25599-for-Hadoop-3.4.diff
+++
b/bigtop-packages/src/common/ambari/patch5-refine-AMBARI-25599-for-Hadoop-3.4.diff
@@ -43,7 +43,7 @@ index f8423b3806..e37072e9f8 100644
</target>
</configuration>
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
-index a0a11b8e6e..7b0b1df2c7 100644
+index a0a11b8e6e..01144769c4 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -40,14 +40,14 @@
@@ -62,8 +62,8 @@ index a0a11b8e6e..7b0b1df2c7 100644
+ <hbase.folder>hbase-2.4.13</hbase.folder>
+
<hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.4.tar.gz</hadoop.tar>
+ <hadoop.folder>hadoop-3.3.4</hadoop.folder>
-+ <grafana.folder>grafana-9.1.2</grafana.folder>
-+
<grafana.tar>https://dl.grafana.com/enterprise/release/grafana-enterprise-9.1.2.linux-amd64.tar.gz</grafana.tar>
++ <grafana.folder>grafana-9.3.2</grafana.folder>
++
<grafana.tar>https://dl.grafana.com/oss/release/grafana-9.3.2.linux-amd64.tar.gz</grafana.tar>
+
<phoenix.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
+ <phoenix.folder>phoenix-hbase-2.4-5.1.2-bin</phoenix.folder>
<resmonitor.install.dir>/usr/lib/python2.6/site-packages/resource_monitoring</resmonitor.install.dir>