From 01be7acf10b67dc848783d39734af1ef9b927251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Thu, 24 Jul 2025 21:37:20 +0200
Subject: [PATCH] Refactor (#6210)

---
 ct/victoriametrics.sh              | 22 ++++++++--------------
 install/victoriametrics-install.sh | 28 +++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/ct/victoriametrics.sh b/ct/victoriametrics.sh
index 246f13ded..04e6f8b67 100644
--- a/ct/victoriametrics.sh
+++ b/ct/victoriametrics.sh
@@ -27,31 +27,25 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
+  
   RELEASE=$(curl -fsSL https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  if [[ ! -f ~/.victoriametrics ]] || [[ "${RELEASE}" != "$(cat ~/.victoriametrics)" ]]; then
     msg_info "Stopping $APP"
     systemctl stop victoriametrics
+    [[ -f /etc/systemd/system/victoriametrics-logs.service ]] && systemctl stop victoriametrics-logs
     msg_ok "Stopped $APP"
 
-    msg_info "Updating ${APP} to v${RELEASE}"
-    temp_dir=$(mktemp -d)
-    cd $temp_dir
-    curl -fsSL "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-v${RELEASE}.tar.gz" -o $(basename "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-v${RELEASE}.tar.gz")
-    curl -fsSL "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/vmutils-linux-amd64-v${RELEASE}.tar.gz" -o $(basename "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/vmutils-linux-amd64-v${RELEASE}.tar.gz")
-    find /opt/victoriametrics -maxdepth 1 -type f -executable -delete
-    tar -xf victoria-metrics-linux-amd64-v${RELEASE}.tar.gz -C /opt/victoriametrics
-    tar -xf vmutils-linux-amd64-v${RELEASE}.tar.gz -C /opt/victoriametrics
+    fetch_and_deploy_gh_release "victoriametrics" "VictoriaMetrics/VictoriaMetrics" "prebuild" "latest" "/opt/victoriametrics" "victoria-metrics-linux-amd64-v+([0-9.]).tar.gz"
+    fetch_and_deploy_gh_release "vmutils" "VictoriaMetrics/VictoriaMetrics" "prebuild" "latest" "/opt/victoriametrics" "vmutils-linux-amd64-v+([0-9.]).tar.gz"
+    fetch_and_deploy_gh_release "victorialogs" "VictoriaMetrics/VictoriaLogs" "prebuild" "latest" "/opt/victoriametrics" "victoria-logs-linux-amd64*.tar.gz"
+    fetch_and_deploy_gh_release "vlutils" "VictoriaMetrics/VictoriaLogs" "prebuild" "latest" "/opt/victoriametrics" "vlutils-linux-amd64*.tar.gz"
     chmod +x /opt/victoriametrics/*
-    echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting $APP"
     systemctl start victoriametrics
+    [[ -f /etc/systemd/system/victoriametrics-logs.service ]] && systemctl start victoriametrics-logs
     msg_ok "Started $APP"
 
-    msg_info "Cleaning Up"
-    rm -rf $temp_dir
-    msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"
diff --git a/install/victoriametrics-install.sh b/install/victoriametrics-install.sh
index 2c53d579a..3fd59a5ef 100644
--- a/install/victoriametrics-install.sh
+++ b/install/victoriametrics-install.sh
@@ -13,15 +13,13 @@ setting_up_container
 network_check
 update_os
 
+fetch_and_deploy_gh_release "victoriametrics" "VictoriaMetrics/VictoriaMetrics" "prebuild" "latest" "/opt/victoriametrics" "victoria-metrics-linux-amd64-v+([0-9.]).tar.gz"
+fetch_and_deploy_gh_release "vmutils" "VictoriaMetrics/VictoriaMetrics" "prebuild" "latest" "/opt/victoriametrics" "vmutils-linux-amd64-v+([0-9.]).tar.gz"
+fetch_and_deploy_gh_release "victorialogs" "VictoriaMetrics/VictoriaLogs" "prebuild" "latest" "/opt/victoriametrics" "victoria-logs-linux-amd64*.tar.gz"
+fetch_and_deploy_gh_release "vlutils" "VictoriaMetrics/VictoriaLogs" "prebuild" "latest" "/opt/victoriametrics" "vlutils-linux-amd64*.tar.gz"
+
 msg_info "Setup VictoriaMetrics"
-temp_dir=$(mktemp -d)
-cd $temp_dir
 mkdir -p /opt/victoriametrics/data
-RELEASE=$(curl -fsSL https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/victoria-metrics-linux-amd64-v${RELEASE}.tar.gz" -o "victoria-metrics-linux-amd64-v${RELEASE}.tar.gz"
-curl -fsSL "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${RELEASE}/vmutils-linux-amd64-v${RELEASE}.tar.gz" -o "vmutils-linux-amd64-v${RELEASE}.tar.gz"
-tar -xf victoria-metrics-linux-amd64-v${RELEASE}.tar.gz -C /opt/victoriametrics
-tar -xf vmutils-linux-amd64-v${RELEASE}.tar.gz -C /opt/victoriametrics
 chmod +x /opt/victoriametrics/*
 msg_ok "Setup VictoriaMetrics"
 
@@ -37,10 +35,26 @@ User=root
 WorkingDirectory=/opt/victoriametrics
 ExecStart=/opt/victoriametrics/victoria-metrics-prod --storageDataPath="/opt/victoriametrics/data"
 
+[Install]
+WantedBy=multi-user.target
+EOF
+
+cat <<EOF >/etc/systemd/system/victoriametrics-logs.service
+[Unit]
+Description=VictoriaMetrics Service
+
+[Service]
+Type=simple
+Restart=always
+User=root
+WorkingDirectory=/opt/victoriametrics
+ExecStart=/opt/victoriametrics/victoria-logs-prod
+
 [Install]
 WantedBy=multi-user.target
 EOF
 systemctl enable -q --now victoriametrics
+systemctl enable -q --now victoriametrics-logs
 msg_ok "Created Service"
 
 motd_ssh