diff --git a/charts/ingress-nginx-monitoring/Chart.yaml b/charts/ingress-nginx-monitoring/Chart.yaml index a4cc959..d7b5bf0 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.7 -appVersion: 1.2.7 +version: 1.2.8 +appVersion: 1.2.8 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 988ccc0..b1f6df9 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,19 +33,19 @@ spec: labels: severity: "{{ $.Values.prometheus.rule.alerts.certificateExpiry.severity }}" annotations: - description: {{`ssl certificate {{$labels.host}} will expire in less than a week`}} + description: {{`ssl certificate {{$labels.host}} will expire in less then 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}}"}[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 }} + for: 5m labels: severity: "{{ $.Values.prometheus.rule.alerts.tooMany500s.severity }}" annotations: description: {{`Too many {{$labels.status}} on {{$labels.host}} `}} - summary: {{`{{ $.Values.prometheus.rule.alerts.tooMany500s.summary }}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}} + summary: {{` More than 10% of all requests returned {{$labels.status}}. Metadata -> { namespace="{{$labels.exported_namespace}}", ingress="{{$labels.ingress}}", method="{{$labels.method}}", path="{{$labels.path}})" } `}} {{- end }} {{- if $.Values.prometheus.rule.alerts.tooMany400s.enabled }} @@ -56,9 +56,10 @@ spec: 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 }} {{- end }} diff --git a/charts/ingress-nginx-monitoring/values.yaml b/charts/ingress-nginx-monitoring/values.yaml index 01d39d0..435b30f 100644 --- a/charts/ingress-nginx-monitoring/values.yaml +++ b/charts/ingress-nginx-monitoring/values.yaml @@ -21,8 +21,6 @@ prometheus: tooMany500s: enabled: true severity: warning - for: 5m - summary: More than 10% of all requests returned {{$labels.status}} tooMany400s: enabled: true