diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d6d0776dc8b285e0457e7704b6cddb5b26ff8ca..ff0d7aeac902cd324093ef373418e6998e16333b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -693,7 +693,7 @@ prometheus-alerts: RESOURCE: "kube-prometheus-stack" script: - *debug_information - - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | cut -d'=' -f2) + - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | awk '{ print $4 }') - cd test/ - bash ../.gitlab/ci_scripts/retry_cmd_until_success.sh 30 10 pytest -s -m prometheus extends: diff --git a/docs/requirements.txt b/docs/requirements.txt index 7903affab17f9ccbb6d584685f2e7d74c6ba6bb6..ba7d20f4dc06267497cd316e7a2c287cd495065d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -31,7 +31,7 @@ packaging==21.3 # via sphinx pygments==2.11.2 # via sphinx -pyparsing==3.0.6 +pyparsing==3.0.7 # via packaging pytz==2021.3 # via babel diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml index f44583442f77494943f2c3b37f24c7447cd679d2..12d15a5ebef6c4db228877a6fca818fff7e7d5a8 100644 --- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml +++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml @@ -13,11 +13,14 @@ data: kubeEtcd: enabled: false - # Disable kube-controller-manager and kube-scheduler monitoring. See https://github.com/cablespaghetti/k3s-monitoring/issues/2 + # Disable kube-controller-manager, kube-scheduler and kube-proxy monitoring. + # See https://github.com/cablespaghetti/k3s-monitoring/issues/2 kubeControllerManager: enabled: false kubeScheduler: enabled: false + kubeProxy: + enabled: false # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L115 alertmanager: diff --git a/flux2/core/base/single-sign-on/single-sign-on-database-release.yaml b/flux2/core/base/single-sign-on/single-sign-on-database-release.yaml index bdf2a27beecf40b1f27ac4a224425dae1098f892..fd1c5df055cfb0a193aa84fc6027aaad69bac9b0 100644 --- a/flux2/core/base/single-sign-on/single-sign-on-database-release.yaml +++ b/flux2/core/base/single-sign-on/single-sign-on-database-release.yaml @@ -9,7 +9,7 @@ spec: spec: # renovate: registryUrl=https://charts.bitnami.com/bitnami chart: postgresql - version: 10.16.1 + version: 10.16.2 sourceRef: kind: HelmRepository name: bitnami diff --git a/flux2/core/base/single-sign-on/single-sign-on-release.yaml b/flux2/core/base/single-sign-on/single-sign-on-release.yaml index 782aac140318faedbb2ab24c41ce1a9da504d46b..84e851237d757be02f243c763b4848da2899bfb5 100644 --- a/flux2/core/base/single-sign-on/single-sign-on-release.yaml +++ b/flux2/core/base/single-sign-on/single-sign-on-release.yaml @@ -11,7 +11,7 @@ spec: spec: # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/8/packages/helm/stable chart: single-sign-on - version: 0.7.5 + version: 0.7.6 sourceRef: kind: HelmRepository name: single-sign-on diff --git a/requirements.txt b/requirements.txt index 1cb114b38482d240a50c58a8746ae4a65bc563bb..d400c9699cb02b895c5592c1970e28a5c28262ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -78,7 +78,7 @@ pynacl==1.5.0 # via paramiko pyopenssl==21.0.0 # via -r requirements.in -pyparsing==3.0.6 +pyparsing==3.0.7 # via packaging pytest==6.2.5 # via diff --git a/test/pytest/test_prometheus.py b/test/pytest/test_prometheus.py index 542bad0b09b9fdb1bdcb2b2df2f4946398a43db6..7e90f0d874a3d1bc72c4b247b4064bcd8a9545db 100755 --- a/test/pytest/test_prometheus.py +++ b/test/pytest/test_prometheus.py @@ -21,8 +21,7 @@ def ignore_alert(alert): return True # Ignore issues fom high load during installation phase - # KubeProxyDown: https://open.greenhost.net/stackspin/stackspin/-/issues/1105 - if re.search(r"(KubeAPIDown|KubeletDown|NodeFilesystemSpaceFillingUp|NodeClockNotSynchronising|KubeProxyDown)", + if re.search(r"(KubeAPIDown|KubeletDown|NodeFilesystemSpaceFillingUp|NodeClockNotSynchronising)", alert["labels"]["alertname"]): return True # Ignore nextcloud cron jobs (https://open.greenhost.net/stackspin/stackspin/-/issues/984)