diff --git a/clusters/cl01tl/helm/argocd/templates/prometheus-rule.yaml b/clusters/cl01tl/helm/argocd/templates/prometheus-rule.yaml index 93aee2099..66fe63dda 100644 --- a/clusters/cl01tl/helm/argocd/templates/prometheus-rule.yaml +++ b/clusters/cl01tl/helm/argocd/templates/prometheus-rule.yaml @@ -82,14 +82,6 @@ spec: annotations: summary: HAProxy pending requests (instance {{ `{{ $labels.instance }}` }}) description: "Some HAProxy requests are pending on {{ `{{ $labels.proxy }}` }} - {{ `{{ $value | printf \"%.2f\"}}` }}\n VALUE = {{ `{{ $value }}` }}\n LABELS = {{ `{{ $labels }}` }}" - - alert: HAProxyHTTPSlowingDown - expr: avg by (instance, proxy) (haproxy_backend_max_total_time_seconds) > 1 - for: 1m - labels: - severity: warning - annotations: - summary: HAProxy HTTP slowing down (instance {{ `{{ $labels.instance }}` }}) - description: "HAProxy backend max total time is above 1s on {{ `{{ $labels.proxy }}` }} - {{ `{{ $value | printf \"%.2f\"}}` }}s\n VALUE = {{ `{{ $value }}` }}\n LABELS = {{ `{{ $labels }}` }}" - alert: HAProxyRetryHigh expr: sum by (proxy) (rate(haproxy_backend_retry_warnings_total[1m])) > 10 for: 2m @@ -98,14 +90,6 @@ spec: annotations: summary: HAProxy retry high (instance {{ `{{ $labels.instance }}` }}) description: "High rate of retry on {{ `{{ $labels.proxy }}` }} - {{ `{{ $value | printf \"%.2f\"}}` }}\n VALUE = {{ `{{ $value }}` }}\n LABELS = {{ `{{ $labels }}` }}" - - alert: HAproxyHasNoAliveBackends - expr: haproxy_backend_active_servers + haproxy_backend_backup_servers == 0 - for: 0m - labels: - severity: critical - annotations: - summary: HAproxy has no alive backends (instance {{ `{{ $labels.instance }}` }}) - description: "HAProxy has no alive active or backup backends for {{ `{{ $labels.proxy }}` }}\n VALUE = {{ `{{ $value }}` }}\n LABELS = {{ `{{ $labels }}` }}" - alert: HAProxyFrontendSecurityBlockedRequests expr: sum by (proxy) (rate(haproxy_frontend_denied_connections_total[2m])) > 10 for: 2m diff --git a/clusters/cl01tl/helm/stalwart/values.yaml b/clusters/cl01tl/helm/stalwart/values.yaml index 3ea215add..7397bc024 100644 --- a/clusters/cl01tl/helm/stalwart/values.yaml +++ b/clusters/cl01tl/helm/stalwart/values.yaml @@ -25,6 +25,7 @@ stalwart: tag: v1.10.0@sha256:a6a4d4403f670faf6a94b8c7f9adbca3ead91f26dd64e5ccf95fa69025dc6e58 args: - '--es.uri=https://elasticsearch-stalwart-es-http.tubearchivist:9200' + - '--es.ssl-skip-verify=true' resources: requests: cpu: 1m diff --git a/clusters/cl01tl/helm/tubearchivist/values.yaml b/clusters/cl01tl/helm/tubearchivist/values.yaml index 27d6303b4..427bd94a5 100644 --- a/clusters/cl01tl/helm/tubearchivist/values.yaml +++ b/clusters/cl01tl/helm/tubearchivist/values.yaml @@ -108,6 +108,7 @@ tubearchivist: tag: v1.10.0@sha256:a6a4d4403f670faf6a94b8c7f9adbca3ead91f26dd64e5ccf95fa69025dc6e58 args: - '--es.uri=https://elasticsearch-tubearchivist-es-http.tubearchivist:9200' + - '--es.ssl-skip-verify=true' resources: requests: cpu: 1m