diff --git a/deploy/deploy.sh b/deploy/deploy.sh index efe4b9175e66cf44c7f781abd45af1a7a2a32995..6d99025770de6efbae17fe786b09a567135181e5 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -630,8 +630,8 @@ function deploy_kafka() { else KAFKA_LOCAL_TARBALL="./${KAFKA_VERSION}.tgz" if [ ! -f "$KAFKA_LOCAL_TARBALL" ] ; then - wget https://archive.apache.org/dist/kafka/2.8.2/${KAFKA_VERSION}.tgz --no-check-certificate - [ $? -ne 0 ] && echo_err_exit "Error: fail to download kafka tarball from official website, check proxy!" + wget https://mirrors.huaweicloud.com/apache/kafka/2.8.2/${KAFKA_VERSION}.tgz --no-check-certificate + [ $? -ne 0 ] && echo_err_exit "Error: fail to download kafka tarball from huaweicloud website, check proxy!" fi fi tar xzf ${KAFKA_LOCAL_TARBALL} -C ${middleware_install_dir} @@ -734,8 +734,8 @@ function deploy_elasticsearch() { else ES_LOCAL_TARBALL="./elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz" if [ ! -f "$ES_LOCAL_TARBALL" ] ; then - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz --no-check-certificate - [ $? -ne 0 ] && echo_err_exit "Error: fail to download elasticsearch rpm from official website, check proxy!" + wget https://mirrors.huaweicloud.com/elasticsearch/8.5.3/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz --no-check-certificate + [ $? -ne 0 ] && echo_err_exit "Error: fail to download elasticsearch rpm from huaweicloud website, check proxy!" fi fi @@ -756,27 +756,28 @@ function deploy_elasticsearch() { function deploy_logstash() { echo_info "======Deploying Logstash======" - echo -e "[1] Downloading logstash rpm and install" + echo -e "[1] Downloading logstash tarball and install" if rpm -qa | grep -q logstash ; then echo "logstash is already installed, skip installing..." else - LOGSTASH_LOCAL_RPM="$LOCAL_DEPLOY_SRCDIR/logstash-8.5.3-${OS_ARCH}.rpm" + LOGSTASH_LOCAL_TARBALL="$LOCAL_DEPLOY_SRCDIR/logstash-8.5.3-linux-${OS_ARCH}.tar.gz" if [ "$DEPLOY_TYPE" == "local" ] ; then - [ ! -f "$LOGSTASH_LOCAL_RPM" ] && echo_err_exit "Error: fail to find logstash local rpm" + [ ! -f "$LOGSTASH_LOCAL_TARBALL" ] && echo_err_exit "Error: fail to find logstash local tarball" else - LOGSTASH_LOCAL_RPM="./logstash-8.5.3-${OS_ARCH}.rpm" - if [ ! -f "$LOGSTASH_LOCAL_RPM" ] ; then - wget https://artifacts.elastic.co/downloads/logstash/logstash-8.5.3-${OS_ARCH}.rpm --no-check-certificate - [ $? -ne 0 ] && echo_err_exit "Error: fail to download logstash rpm from official website, check proxy!" + LOGSTASH_LOCAL_TARBALL="./logstash-8.5.3-linux-${OS_ARCH}.tar.gz" + if [ ! -f "$LOGSTASH_LOCAL_TARBALL" ] ; then + wget https://mirrors.huaweicloud.com/logstash/8.5.3/logstash-8.5.3-linux-${OS_ARCH}.tar.gz --no-check-certificate + [ $? -ne 0 ] && echo_err_exit "Error: fail to download logstash tarball from huaweicloud website, check proxy!" fi fi - yum install ${LOGSTASH_LOCAL_RPM} -y || echo_err_exit "Error: fail to install $LOGSTASH_LOCAL_RPM" + tar zxf $LOGSTASH_LOCAL_TARBALL -C /usr/share/ || echo_err_exit "Error: fail to install $LOGSTASH_LOCAL_TARBALL" fi echo -e "\n[2] Configure logstash" rm -f /etc/logstash/logstash-sample.conf + mkdir -p /etc/logstash/conf.d/ cat > /etc/logstash/conf.d/kafka2es.conf << EOF input { kafka { @@ -867,7 +868,7 @@ output { EOF echo -e "\n[3] Starting logstash service" - cd /usr/share/logstash + cd /usr/share/logstash-8.5.3 kill -9 $(ps -ef | grep logstash | grep 'kafka2es.conf' | awk '{print $2}') 2>/dev/null nohup ./bin/logstash -f /etc/logstash/conf.d/kafka2es.conf & cd - > /dev/null diff --git a/deploy/download_offline_res.sh b/deploy/download_offline_res.sh index b811987eb4f0100851215a106613486df6278ae0..d936c7fc284f08bd914b0b56817d5ab729c99b63 100755 --- a/deploy/download_offline_res.sh +++ b/deploy/download_offline_res.sh @@ -111,8 +111,8 @@ download_kafka_tarball() { KAFKA_VERSION='kafka_2.13-2.8.2' echo_info "- Download $KAFKA_VERSION tarball" if [ ! -f ${DOWNLOAD_DIR}/${KAFKA_VERSION}.tgz ] ; then - echo " Executing \"wget https://archive.apache.org/dist/kafka/2.8.2/${KAFKA_VERSION}.tgz\"" - wget https://archive.apache.org/dist/kafka/2.8.2/${KAFKA_VERSION}.tgz -P ${DOWNLOAD_DIR} --no-check-certificate + echo " Executing \"wget https://mirrors.huaweicloud.com/apache/kafka/2.8.2/${KAFKA_VERSION}.tgz\"" + wget https://mirrors.huaweicloud.com/apache/kafka/2.8.2/${KAFKA_VERSION}.tgz -P ${DOWNLOAD_DIR} --no-check-certificate fi if ! ls ${DOWNLOAD_DIR} | grep -q java-1.8.0-openjdk ; then @@ -133,14 +133,14 @@ download_prometheus() { download_es_logstash() { echo_info "- Download elasticsearch(8.5.3) tarball" if [ ! -f ${DOWNLOAD_DIR}/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz ] ; then - echo " Executing \"wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz\"" - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz -P ${DOWNLOAD_DIR} --no-check-certificate + echo " Executing \"wget https://mirrors.huaweicloud.com/elasticsearch/8.5.3/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz\"" + wget https://mirrors.huaweicloud.com/elasticsearch/8.5.3/elasticsearch-8.5.3-linux-${OS_ARCH}.tar.gz -P ${DOWNLOAD_DIR} --no-check-certificate fi - echo_info "- Download logstash(8.5.3) rpm" + echo_info "- Download logstash(8.5.3) tarball" if [ ! -f ${DOWNLOAD_DIR}/logstash-8.5.3-${OS_ARCH}.rpm ] ; then - echo " Executing \"wget https://artifacts.elastic.co/downloads/logstash/logstash-8.5.3-${OS_ARCH}.rpm\"" - wget https://artifacts.elastic.co/downloads/logstash/logstash-8.5.3-${OS_ARCH}.rpm -P ${DOWNLOAD_DIR} --no-check-certificate + echo " Executing \"wget https://mirrors.huaweicloud.com/logstash/8.5.3/logstash-8.5.3-linux-${OS_ARCH}.tar.gz\"" + wget https://mirrors.huaweicloud.com/logstash/8.5.3/logstash-8.5.3-linux-${OS_ARCH}.tar.gz -P ${DOWNLOAD_DIR} --no-check-certificate fi } diff --git a/deploy/middleware_archive/kafka_2.13-2.8.2.tgz b/deploy/middleware_archive/kafka_2.13-2.8.2.tgz deleted file mode 100644 index 000f577e261687c8a93528bc86b5c41551c776c6..0000000000000000000000000000000000000000 Binary files a/deploy/middleware_archive/kafka_2.13-2.8.2.tgz and /dev/null differ diff --git a/deploy/middleware_archive/pyroscope-0.37.2-1-aarch64.rpm b/deploy/middleware_archive/pyroscope-0.37.2-1-aarch64.rpm deleted file mode 100644 index 9005dfd30d7d66258d103b55361025cdc6668ecd..0000000000000000000000000000000000000000 Binary files a/deploy/middleware_archive/pyroscope-0.37.2-1-aarch64.rpm and /dev/null differ diff --git a/deploy/middleware_archive/pyroscope-0.37.2-1-x86_64.rpm b/deploy/middleware_archive/pyroscope-0.37.2-1-x86_64.rpm deleted file mode 100644 index 1e4a63eeedece431668e08ad7b17aa3d13065f89..0000000000000000000000000000000000000000 Binary files a/deploy/middleware_archive/pyroscope-0.37.2-1-x86_64.rpm and /dev/null differ