From ffcd9ad4fc820286004ce98a1e6f3fdcb59e9c2c Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Mon, 12 Sep 2022 19:13:52 +0200
Subject: [PATCH] Fix healthchecks
---
datacore.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/datacore.yml b/datacore.yml
index d194117..cd4de9e 100644
--- a/datacore.yml
+++ b/datacore.yml
@@ -24,15 +24,15 @@ DeployDataCore:
# Create docker-compose.yml
- curl --silent https://gitlab.lakedrops.com/gitlab-ci-cd/general/-/raw/main/templates/datacore/docker-compose.yml | envsubst > docker-compose.yml
# Create ./borgconfig/.env ./borgconfig/crontab.txt ./borgconfig/config.yaml
- - export HEALTHCHECK1=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS}) --jobname="Borg Backup datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="55 */6 * * *")
- - export HEALTHCHECK2=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS}) --jobname="Borg Backup Check datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 23 1 * *")
+ - export HEALTHCHECK1=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="Borg Backup datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="55 */6 * * *")
+ - export HEALTHCHECK2=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="Borg Backup Check datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 23 1 * *")
- curl --silent https://gitlab.lakedrops.com/gitlab-ci-cd/general/-/raw/main/templates/datacore/borg-config.yaml | envsubst > borgconfig/config.yaml
- curl --silent https://gitlab.lakedrops.com/gitlab-ci-cd/general/-/raw/main/templates/datacore/borg-crontab.txt | envsubst > borgconfig/crontab.txt
- if [[ ! -f borgconfig/.env ]]; then echo "${BORG_SSH_KEY}" > borgdata/ssh/id_rsa || true; fi
- if [[ ! -f borgconfig/.env ]]; then echo "StrictHostKeyChecking no" > borgdata/ssh/config || true; fi
- echo "BORG_PASSPHRASE=${BORG_PASSPHRASE}" > borgconfig/.env
# Create ./crontabs/jobs.ini
- - export HEALTHCHECK=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS}) --jobname="DB Backup datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 0 * * *")
+ - export HEALTHCHECK=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="DB Backup datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 0 * * *")
- curl --silent https://gitlab.lakedrops.com/gitlab-ci-cd/general/-/raw/main/templates/datacore/jobs.ini | envsubst > crontabs/jobs.ini
# Download JAR file
- |
--
GitLab