From e0775289ded4ebfc9a188830907ccbbf9811b653 Mon Sep 17 00:00:00 2001 From: Robin Bourianes Date: Mon, 30 Nov 2020 11:09:08 +0100 Subject: [PATCH] wip: SUBDOMAIN instead of INFRA in failure message + portainer.SUBDOMAIN -> alertmanager.SUBDOMAIN. --- deploy/arome-france-high-loader.yml | 3 +-- deploy/arome-france-loader.yml | 3 +-- deploy/arpege-europe-loader.yml | 3 +-- deploy/arpege-world-loader.yml | 3 +-- deploy/atlas-admin-express.yml | 2 +- deploy/gfs-world-loader.yml | 3 +-- deploy/hubeau-observations.yml | 3 +-- deploy/hubeau-stations.yml | 3 +-- deploy/openaq.yml | 3 +-- deploy/openradiation.yml | 3 +-- deploy/teleray.yml | 3 +-- deploy/vigicrues.yml | 3 +-- 12 files changed, 12 insertions(+), 23 deletions(-) diff --git a/deploy/arome-france-high-loader.yml b/deploy/arome-france-high-loader.yml index fee2ecadb..71c1d477e 100644 --- a/deploy/arome-france-high-loader.yml +++ b/deploy/arome-france-high-loader.yml @@ -17,9 +17,8 @@ services: - METEO_FRANCE_TOKEN - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://portainer.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/arome-france-loader.yml b/deploy/arome-france-loader.yml index 9db04de57..b2b7b3075 100644 --- a/deploy/arome-france-loader.yml +++ b/deploy/arome-france-loader.yml @@ -17,9 +17,8 @@ services: - METEO_FRANCE_TOKEN - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://portainer.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/arpege-europe-loader.yml b/deploy/arpege-europe-loader.yml index ea9861742..9389071af 100644 --- a/deploy/arpege-europe-loader.yml +++ b/deploy/arpege-europe-loader.yml @@ -17,9 +17,8 @@ services: - METEO_FRANCE_TOKEN - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://portainer.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/arpege-world-loader.yml b/deploy/arpege-world-loader.yml index 8d3074a44..069cbc4d5 100644 --- a/deploy/arpege-world-loader.yml +++ b/deploy/arpege-world-loader.yml @@ -17,9 +17,8 @@ services: - METEO_FRANCE_TOKEN - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://portainer.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/atlas-admin-express.yml b/deploy/atlas-admin-express.yml index 18bb9d0e8..2a0eeedbd 100644 --- a/deploy/atlas-admin-express.yml +++ b/deploy/atlas-admin-express.yml @@ -16,7 +16,7 @@ services: - SUBDOMAIN - SLACK_WEBHOOK_URL healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/gfs-world-loader.yml b/deploy/gfs-world-loader.yml index 5e0e3df0e..a34c9c48b 100644 --- a/deploy/gfs-world-loader.yml +++ b/deploy/gfs-world-loader.yml @@ -16,9 +16,8 @@ services: - S3_SECRET_ACCESS_KEY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://portainer.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "0.75", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/hubeau-observations.yml b/deploy/hubeau-observations.yml index 38913b826..25d5fa64a 100644 --- a/deploy/hubeau-observations.yml +++ b/deploy/hubeau-observations.yml @@ -15,9 +15,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "${HUBEAU_OBSERVATIONS_SUCCESS_RATE}", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--success-rate", "${HUBEAU_OBSERVATIONS_SUCCESS_RATE}", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/hubeau-stations.yml b/deploy/hubeau-stations.yml index 80445b61a..be1f5c6b1 100644 --- a/deploy/hubeau-stations.yml +++ b/deploy/hubeau-stations.yml @@ -12,9 +12,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/openaq.yml b/deploy/openaq.yml index 4fd0b5eb2..70f2fcd5a 100644 --- a/deploy/openaq.yml +++ b/deploy/openaq.yml @@ -12,9 +12,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/openradiation.yml b/deploy/openradiation.yml index 8a937cdb8..1ee12a5c9 100644 --- a/deploy/openradiation.yml +++ b/deploy/openradiation.yml @@ -14,9 +14,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/teleray.yml b/deploy/teleray.yml index 6add7ff7b..a8773abb8 100644 --- a/deploy/teleray.yml +++ b/deploy/teleray.yml @@ -13,9 +13,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3 diff --git a/deploy/vigicrues.yml b/deploy/vigicrues.yml index 3f3de66a9..04f26f831 100644 --- a/deploy/vigicrues.yml +++ b/deploy/vigicrues.yml @@ -13,9 +13,8 @@ services: - NO_PROXY - SUBDOMAIN - SLACK_WEBHOOK_URL - - INFRA healthcheck: - test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= INFRA %>: <%= error.message %>"] + test: ["CMD", "node", "/opt/krawler/healthcheck.js", "--debug", "--link-template", "https://alertmanager.<%= SUBDOMAIN %>", "--message-template", "Job <%= jobId %>@<%= SUBDOMAIN %>: <%= error.message %>"] interval: 1m timeout: 10s retries: 3