victoriametrics: improve migration to conf.d

Author: sni

packages/omd/omd.pre-update

@@ -152,16 +152,17 @@ fi
 if [ $OLD_VERSION -le 512 ]; then
     grep "do not edit manually" etc/apache/conf.d/victoriametrics.conf >/dev/null 2>&1 && rm -f etc/apache/conf.d/victoriametrics.conf
     if [ -e etc/victoriametrics/victoriametrics.conf -a -f $OLD_SKEL/etc/victoriametrics/victoriametrics.conf_template ]; then
+        mkdir -p etc/victoriametrics/conf.d
         rm -f etc/victoriametrics/conf.d/zzz_migrated.conf
         echo "migrating etc/victoriametrics/victoriametrics.conf to etc/victoriametrics/conf.d/zzz_migrated.conf"
         grep ^vm_ etc/victoriametrics/victoriametrics.conf | grep -v httpAuth | grep -v snapshotAuth | grep -v metricsAuth | \
         while read LINE; do
             # migrate only if its not the default
-            if ! grep "$LINE" $OLD_SKEL/etc/victoriametrics/victoriametrics.conf_template > /dev/null 2>&1; then
+            if ! grep "^$LINE" $OLD_SKEL/etc/victoriametrics/victoriametrics.conf_template > /dev/null 2>&1; then
                 echo "$LINE" >> etc/victoriametrics/conf.d/zzz_migrated.conf
             fi
         done
-        rm -f etc/victoriametrics/victoriametrics.conf
+        mv etc/victoriametrics/victoriametrics.conf etc/victoriametrics/victoriametrics.conf.migrated.to.conf.d
     fi
 fi
 

packages/victoriametrics/skel/etc/init.d/victoriametrics

@@ -30,27 +30,35 @@ mkdir -p \
 
 export LC_ALL=C
 
-# generate random passwords
-if [ ! -f ${AUTH_CONF_FILE} ]; then
-  httpAuth_password=$( tr -cd A-Za-z0-9 < /dev/urandom | head -c 16 )
-  snapshotAuthKey=$( tr -cd A-Za-z0-9 < /dev/urandom | head -c 16 )
-  cat << EOT > ${AUTH_CONF_FILE}
+case "$1" in start|restart|reload|checkconfig|check)
+  # generate random passwords
+  if [ ! -f ${AUTH_CONF_FILE} ]; then
+    # use existing ones if available
+    if [ -f etc/victoriametrics/victoriametrics.conf.migrated.to.conf.d ]; then
+      . etc/victoriametrics/victoriametrics.conf.migrated.to.conf.d
+    fi
+    httpAuth_username=${vm_httpAuth_username:-prom}
+    httpAuth_password=${vm_httpAuth_password:-$( tr -cd A-Za-z0-9 < /dev/urandom | head -c 16 )}
+    snapshotAuthKey=${vm_snapshotAuthKey:-$( tr -cd A-Za-z0-9 < /dev/urandom | head -c 16 )}
+    metricsAuthKey=${vm_metricsAuthKey:-metrics}
+    cat << EOT > ${AUTH_CONF_FILE}
 # this file is generated automatically, do not change manually. Changes will be overwritten.
-vm_httpAuth_username=prom
+vm_httpAuth_username=${httpAuth_username}
 vm_httpAuth_password=${httpAuth_password}
-vm_metricsAuthKey=metrics
+vm_metricsAuthKey=${metricsAuthKey}
 vm_snapshotAuthKey=${snapshotAuthKey}
 EOT
-  echo "created ${AUTH_CONF_FILE} with random passwords, for remote access check this file"
-
-  if [ -f ${OMD_ROOT}/etc/victoriametrics/grafana_datasources.yml ] ; then
-    sed -e "s/basicAuthPassword: .*/basicAuthPassword: ${httpAuth_password}/; s/basicAuthUser: .*/basicAuthUser: prom/" -i ${OMD_ROOT}/etc/victoriametrics/grafana_datasources.yml
-    if omd status grafana > /dev/null 2>&1 ; then
-      omd restart grafana
+    echo "created ${AUTH_CONF_FILE} with random passwords, for remote access check this file"
+
+    if [ -f ${OMD_ROOT}/etc/victoriametrics/grafana_datasources.yml ] ; then
+      sed -e "s/basicAuthPassword: .*/basicAuthPassword: ${httpAuth_password}/; s/basicAuthUser: .*/basicAuthUser: prom/" -i ${OMD_ROOT}/etc/victoriametrics/grafana_datasources.yml
+      if omd status grafana > /dev/null 2>&1 ; then
+        omd restart grafana
+      fi
+      echo "patched password in grafana_datasources.yml"
     fi
-    echo "patched password in grafana_datasources.yml"
   fi
-fi
+esac
 
 # export every parameter that is set after this line
 set -a