From 074bb615e7951e8dba191d03f878ab21648a9195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?= <58952836+tremor021@users.noreply.github.com> Date: Sat, 2 Aug 2025 15:13:21 +0200 Subject: [PATCH] VictoriaMetrics: Make VictoriaLogs optional add-on (#6489) * Make Logs optional * Update json --- ct/victoriametrics.sh | 7 +++++-- frontend/public/json/victoriametrics.json | 7 ++++++- install/victoriametrics-install.sh | 18 ++++++++++++------ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ct/victoriametrics.sh b/ct/victoriametrics.sh index 04e6f8b67..bf66dfeea 100644 --- a/ct/victoriametrics.sh +++ b/ct/victoriametrics.sh @@ -37,8 +37,11 @@ function update_script() { 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" + + if [[ -f /etc/systemd/system/victoriametrics-logs.service ]]; then + 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" + fi chmod +x /opt/victoriametrics/* msg_info "Starting $APP" diff --git a/frontend/public/json/victoriametrics.json b/frontend/public/json/victoriametrics.json index 4798d372e..77371cd73 100644 --- a/frontend/public/json/victoriametrics.json +++ b/frontend/public/json/victoriametrics.json @@ -31,5 +31,10 @@ "username": null, "password": null }, - "notes": [] + "notes": [ + { + "text": "Included option to install VictoriaLogs.", + "type": "info" + } + ] } diff --git a/install/victoriametrics-install.sh b/install/victoriametrics-install.sh index 3fd59a5ef..63843d3f9 100644 --- a/install/victoriametrics-install.sh +++ b/install/victoriametrics-install.sh @@ -15,8 +15,13 @@ 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" + +read -r -p "${TAB3}Would you like to add VictoriaLogs? " prompt + +if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then + 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" +fi msg_info "Setup VictoriaMetrics" mkdir -p /opt/victoriametrics/data @@ -38,8 +43,10 @@ ExecStart=/opt/victoriametrics/victoria-metrics-prod --storageDataPath="/opt/vic [Install] WantedBy=multi-user.target EOF +systemctl enable -q --now victoriametrics -cat </etc/systemd/system/victoriametrics-logs.service +if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then + cat </etc/systemd/system/victoriametrics-logs.service [Unit] Description=VictoriaMetrics Service @@ -53,15 +60,14 @@ ExecStart=/opt/victoriametrics/victoria-logs-prod [Install] WantedBy=multi-user.target EOF -systemctl enable -q --now victoriametrics -systemctl enable -q --now victoriametrics-logs + systemctl enable -q --now victoriametrics-logs +fi msg_ok "Created Service" motd_ssh customize msg_info "Cleaning up" -rm -rf $temp_dir $STD apt-get -y autoremove $STD apt-get -y autoclean msg_ok "Cleaned"