diff --git a/packages/victoriametrics/vmbackup-cleanup-cron b/packages/victoriametrics/vmbackup-cleanup-cron index ca325c22e..a40e49f9f 100644 --- a/packages/victoriametrics/vmbackup-cleanup-cron +++ b/packages/victoriametrics/vmbackup-cleanup-cron @@ -2,13 +2,18 @@ LOG_DIR=${OMD_ROOT}/var/victoriametrics DATA_PATH=${OMD_ROOT}/var/victoriametrics/data +CONF_DIR=$OMD_ROOT/etc/victoriametrics/conf.d mkdir -p $LOG_DIR ( -. ${OMD_ROOT}/etc/victoriametrics/victoriametrics.conf -if [ $? != 0 ] ; then +for CFG in ${CONF_DIR}/*.conf; do + . ${CFG} +done +. etc/victoriametrics/backup.conf + +if [ -z "$vm_loggerLevel" ] ; then echo "source of config failed" exit 8 fi @@ -49,8 +54,8 @@ fi echo ">> retention at $( date +%Y-%m-%d-%H) " RC=0 -LL=$(echo -n $SNAPSHOT_OUT | jsonpath.py '$.snapshots[*]') -for SNAPSHOT_NAME in $(echo -n $SNAPSHOT_OUT | jsonpath.py '$.snapshots[*]') + +for SNAPSHOT_NAME in $(echo -n $SNAPSHOT_OUT | grep -oP '"snapshots": *\[\K[^]]+' | tr -d ' "' | tr ',' ' ') do echo "snapshots: ${SNAPSHOT_NAME}" #du -ch -d1 $storageDataPath/snapshots/${SNAPSHOT_NAME} diff --git a/packages/victoriametrics/vmbackup-cron b/packages/victoriametrics/vmbackup-cron index f216d4335..f49ec0a31 100644 --- a/packages/victoriametrics/vmbackup-cron +++ b/packages/victoriametrics/vmbackup-cron @@ -2,14 +2,18 @@ LOG_DIR=${OMD_ROOT}/var/victoriametrics DATA_PATH=${OMD_ROOT}/var/victoriametrics/data +CONF_DIR=$OMD_ROOT/etc/victoriametrics/conf.d mkdir -p $LOG_DIR ( -. ${OMD_ROOT}/etc/victoriametrics/victoriametrics.conf +for CFG in ${CONF_DIR}/*.conf; do + . ${CFG} +done +. etc/victoriametrics/backup.conf -if [ $? != 0 ] ; then +if [ -z "$vm_loggerLevel" ] ; then echo "source of config failed" exit 8 fi @@ -70,7 +74,7 @@ fi echo $SNAPSHOT_OUT -SNAPSHOT_NAME=$(echo -n $SNAPSHOT_OUT | jsonpath.py '$.snapshot') +SNAPSHOT_NAME=$(echo -n $SNAPSHOT_OUT | grep -oP '"snapshot": *"\K[^"]+') if [ "${SNAPSHOT_NAME}" = "" ] ; then echo "snapshot failed"