This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new baf53cc AMBARI-25825: Adjust Ambari metrics dependency (#90)
baf53cc is described below
commit baf53ccfc4d2c5bbccec00c8286cb68ee9aa0f80
Author: Yu Hou <524860...@qq.com>
AuthorDate: Thu Dec 22 23:45:11 2022 +0800
AMBARI-25825: Adjust Ambari metrics dependency (#90)
---
ambari-metrics-grafana/conf/unix/ambari-metrics-grafana | 4 ++--
ambari-metrics-hadoop-sink/pom.xml | 5 +++++
.../metrics2/sink/timeline/HadoopTimelineMetricsSink.java | 2 +-
ambari-metrics-timelineservice/pom.xml | 12 +++++++++---
pom.xml | 7 ++++---
5 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
b/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
index dba2f5f..58c2598 100644
--- a/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
+++ b/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
@@ -118,7 +118,7 @@ case "$1" in
then
for i in {1..10}
do
- sleep 2
+ sleep 12
# check if pid file has been written to
if [ -s $PID_FILE ]; then
echo " $(date) pid_file has been written to" >> $LOG_FILE
@@ -132,7 +132,7 @@ case "$1" in
exit 1
fi
i=0
- timeout=60
+ timeout=120
# Wait for the process to be properly started before exiting
until { cat "$PID_FILE" | xargs kill -0; } >/dev/null 2>&1
do
diff --git a/ambari-metrics-hadoop-sink/pom.xml
b/ambari-metrics-hadoop-sink/pom.xml
index de5b911..0811770 100644
--- a/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics-hadoop-sink/pom.xml
@@ -199,6 +199,11 @@ limitations under the License.
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git
a/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
b/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
index 6021c30..5cbfe45 100644
---
a/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
+++
b/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.metrics2.sink.timeline;
import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.metrics2.AbstractMetric;
diff --git a/ambari-metrics-timelineservice/pom.xml
b/ambari-metrics-timelineservice/pom.xml
index ddc5df0..f221b21 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -371,9 +371,15 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-2.4.1</artifactId>
+ <version>${phoenix.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8b9fc6f..4061782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,14 +43,15 @@
<phoenix.version>5.1.2</phoenix.version>
<hbase.version>2.4.13</hbase.version>
<curator.version>4.2.0</curator.version>
-
<hbase.tar>https://archive.apache.org/dist/hbase/2.4.13/hbase-2.4.13-bin.tar.gz</hbase.tar>
+ <commons-lang3.version>3.12.0</commons-lang3.version>
+
<hbase.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hbase-2.4.13-bin.tar.gz</hbase.tar>
<hbase.folder>hbase-2.4.13</hbase.folder>
-
<hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.3.4/hadoop-3.3.4.tar.gz</hadoop.tar>
+
<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>
<hadoop.version>3.3.4</hadoop.version>
<grafana.folder>grafana-6.7.4</grafana.folder>
<grafana.tar>https://dl.grafana.com/oss/release/grafana-6.7.4.linux-amd64.tar.gz</grafana.tar>
-
<phoenix.tar>https://downloads.apache.org/phoenix/phoenix-5.1.2/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.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>
<powermock.version>1.6.2</powermock.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
