From 38e058268a35c460ba7ad5539b868845d33fa734 Mon Sep 17 00:00:00 2001 From: haasad Date: Mon, 22 Apr 2024 12:58:02 +0200 Subject: [PATCH 1/2] Run the ingester workaround every 10min instead of 30min This helps to prevent NodeDrainStuck alerts from firing in the situation where the first ingester pod doesn't come up during the maintenance. --- class/defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class/defaults.yml b/class/defaults.yml index 6a12550..e0adaa4 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -130,7 +130,7 @@ parameters: workaround: ingester_fix: - schedule: '0,30 * * * *' + schedule: '*/10 * * * *' sleep_time: 2m openshift4_elasticsearch_operator: From d08747340232630fb69d4657336c63488b30e812 Mon Sep 17 00:00:00 2001 From: haasad Date: Mon, 22 Apr 2024 13:06:15 +0200 Subject: [PATCH 2/2] Update golden test output --- .../openshift4-logging/50_loki_ingester_fix.yaml | 2 +- .../openshift4-logging/50_loki_ingester_fix.yaml | 2 +- .../openshift4-logging/50_loki_ingester_fix.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml index 9f89697..dcca6fb 100644 --- a/tests/golden/defaults/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml +++ b/tests/golden/defaults/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml @@ -150,4 +150,4 @@ spec: defaultMode: 364 name: loki-ingester-check name: wal-check - schedule: 0,30 * * * * + schedule: '*/10 * * * *' diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml index 9f89697..dcca6fb 100644 --- a/tests/golden/master/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml +++ b/tests/golden/master/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml @@ -150,4 +150,4 @@ spec: defaultMode: 364 name: loki-ingester-check name: wal-check - schedule: 0,30 * * * * + schedule: '*/10 * * * *' diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml index 9f89697..dcca6fb 100644 --- a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml +++ b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/50_loki_ingester_fix.yaml @@ -150,4 +150,4 @@ spec: defaultMode: 364 name: loki-ingester-check name: wal-check - schedule: 0,30 * * * * + schedule: '*/10 * * * *'