diff --git a/charts/ingress-nginx-monitoring/Chart.yaml b/charts/ingress-nginx-monitoring/Chart.yaml index 44d1cd5..a4cc959 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.6 -appVersion: 1.2.6 +version: 1.2.7 +appVersion: 1.2.7 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 42d6f9f..988ccc0 100644 --- a/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml +++ b/charts/ingress-nginx-monitoring/templates/prometheus/prometheusrule.yaml @@ -39,7 +39,7 @@ spec: {{- 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}}"}[2h])) / sum by (ingress, exported_namespace, status, method, path, host) (rate(nginx_ingress_controller_requests{controller_class=~"{{ $.Values.prometheus.rule.ingressClass}}"}[2h]))) > 10 + 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 }}" @@ -50,7 +50,7 @@ spec: {{- 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 }}" @@ -60,7 +60,6 @@ spec: {{- end }} {{- with $.Values.prometheus.rule.additionalAlerts }} - {{ . | nindent 6 }} + {{ . | nindent 4 }} {{- end }} - {{- end }} {{- end }}