From 32a11371d4d5e250a73f820d5a93c67f1963a550 Mon Sep 17 00:00:00 2001
From: Danylo Pilovets <danylo.p@sterl.in>
Date: Thu, 22 Aug 2024 14:36:42 +0300
Subject: [PATCH]  bump chart version & fixed chart  alerts 500s

---
 charts/ingress-nginx-monitoring/Chart.yaml     |  4 ++--
 .../templates/prometheus/prometheusrule.yaml   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/ingress-nginx-monitoring/Chart.yaml b/charts/ingress-nginx-monitoring/Chart.yaml
index 4e97e77..3fed8f6 100644
--- a/charts/ingress-nginx-monitoring/Chart.yaml
+++ b/charts/ingress-nginx-monitoring/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: ingress-nginx-monitoring
 description: Monitor nginx ingress controller
 type: application
-version: 1.2.3
-appVersion: 1.2.3
+version: 1.2.5
+appVersion: 1.2.5
 icon: https://raw.githubusercontent.com/SomeBlackMagic/helm-charts/master/charts/ingress-nginx-monitoring/nginx-prometheus-grafana.png
 keywords:
   - http
diff --git a/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml b/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml
index a450742..61b4005 100644
--- a/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml
+++ b/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml
@@ -1,4 +1,4 @@
-{{- if and $.Values.prometheus.enabled ( $.Capabilities.APIVersions.Has "monitoring.coreos.com/v1" )  }}
+{{- if and $.Values.prometheus.enabled ( $.Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
@@ -33,34 +33,34 @@ spec:
       labels:
         severity: "{{ $.Values.prometheus.rule.alerts.certificateExpiry.severity }}"
       annotations:
-        description: {{`ssl certificate {{$labels.host}} will expire in less then a week`}}
+        description: {{`ssl certificate {{$labels.host}} will expire in less than a week`}}
         summary: renew expiring certificates to avoid downtime
     {{- end }}
 
     {{- if $.Values.prometheus.rule.alerts.tooMany500s.enabled }}
     - alert: NGINXTooMany500s
-      expr: 100 * (sum by(ingress, exported_namespace, status,method,path,host) (rate(nginx_ingress_controller_requests{status=~"5.+", controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h])) / sum by(ingress, exported_namespace, status,method,path,host) (rate(nginx_ingress_controller_requests{controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h]))) > 5
-      for: 1m
+      expr: 100 * (sum by (ingress, exported_namespace, status, method, path, host) (rate(nginx_ingress_controller_requests{status=~"5.+", controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[2h])) / sum by (ingress, exported_namespace, status, method, path, host) (rate(nginx_ingress_controller_requests{controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[2h]))) > 10
+      for: {{ $.Values.prometheus.rule.alerts.tooMany500s.for }}
       labels:
         severity: "{{ $.Values.prometheus.rule.alerts.tooMany500s.severity }}"
       annotations:
         description: {{`Too many {{$labels.status}} on {{$labels.host}} `}}
-        summary: {{` More than 5% of all requests returned {{$labels.status}}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}}
+        summary: {{`{{ $.Values.prometheus.rule.alerts.tooMany500s.summary }}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}}
     {{- end }}
 
     {{- if $.Values.prometheus.rule.alerts.tooMany400s.enabled }}
     - alert: NGINXTooMany400s
-      expr: 100 * (sum by(ingress, exported_namespace, status,method,path,host) (rate(nginx_ingress_controller_requests{status=~"4.+", controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h])) / sum by(ingress, exported_namespace, status,method,path,host) (rate(nginx_ingress_controller_requests{controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h]))) > 5
+      expr: 100 * (sum by (ingress, exported_namespace, status, method, path, host) (rate(nginx_ingress_controller_requests{status=~"4.+", controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h])) / sum by (ingress, exported_namespace, status, method, path, host) (rate(nginx_ingress_controller_requests{controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[1h]))) > 5
       for: 1m
       labels:
         severity: "{{ $.Values.prometheus.rule.alerts.tooMany400s.severity }}"
       annotations:
         description: {{`Too many {{$labels.status}} on {{$labels.host}} `}}
-        summary: {{` More than 5% of all requests returned {{$labels.status}}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}}
+        summary: {{`More than 5% of all requests returned {{$labels.status}}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}}
     {{- end }}
 
-
     {{- with $.Values.prometheus.rule.additionalAlerts }}
-    {{ . | nindent 4 }}
+    {{ . | nindent 6 }}
     {{- end }}
 {{- end }}
+{{- end }}