Commit 4ceeb624 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Final changes for prometheus alerts

parent f7f291fd

charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
apiVersion: monitoring.coreos.com/v1

kind: Prometheus

metadata:

  name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus

  name: {{ template "kube-prometheus-stack.fullname" . }}-server

  namespace: {{ template "kube-prometheus-stack.namespace" . }}

  labels:

    app: {{ template "kube-prometheus-stack.name" . }}-prometheus
@@ -57,7 +57,7 @@ spec: 
{{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }}

  externalUrl: "http://{{ tpl (index .Values.prometheus.ingress.hosts 0) . }}{{ .Values.prometheus.prometheusSpec.routePrefix }}"

{{- else }}

  externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }}

  externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-server.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }}

{{- end }}

{{- if .Values.prometheus.prometheusSpec.nodeSelector }}

  nodeSelector:

charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ rules: 
  resources: ['podsecuritypolicies']

  verbs:     ['use']

  resourceNames:

  - {{ template "kube-prometheus-stack.fullname" . }}-prometheus

  - {{ template "kube-prometheus-stack.fullname" . }}-server

{{- end }}

charts/kube-prometheus-stack/templates/prometheus/service.yaml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ spec: 
{{- end }}

  selector:

    app: prometheus

    prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus

    prometheus: {{ template "kube-prometheus-stack.fullname" . }}-server

{{- if .Values.prometheus.service.sessionAffinity }}

  sessionAffinity: {{ .Values.prometheus.service.sessionAffinity }}

{{- end }}

charts/kube-prometheus-stack/templates/prometheus/serviceThanosSIdecar.yaml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ spec: 
    targetPort: {{ .Values.prometheus.thanosService.targetPort }}

  selector:

    app: prometheus

    prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus

    prometheus: {{ template "kube-prometheus-stack.fullname" . }}-server

{{- end }}

charts/kube-prometheus-stack/values.yaml

+19 −19
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ defaultRules: 


## Provide custom recording or alerting rules to be deployed into the cluster.

##

# additionalPrometheusRulesMap: {}

additionalPrometheusRulesMap: {}

#  rule-name:

#    groups:

#    - name: my_group
@@ -115,7 +115,7 @@ alertmanager: 


  ## Deploy alertmanager

  ##

  enabled: false

  enabled: true



  ## Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2

  ##
@@ -143,23 +143,23 @@ alertmanager: 
  ## ref: https://prometheus.io/docs/alerting/configuration/#configuration-file

  ##      https://prometheus.io/webtools/alerting/routing-tree-editor/

  ##

  # config:

  #   global:

  #     resolve_timeout: 5m

  #   route:

  #     group_by: ['job']

  #     group_wait: 30s

  #     group_interval: 5m

  #     repeat_interval: 12h

  #     receiver: 'null'

  #     routes:

  #     - match:

  #         alertname: Watchdog

  #       receiver: 'null'

  #   receivers:

  #   - name: 'null'

  #   templates:

  #   - '/etc/alertmanager/config/*.tmpl'

  config:

    global:

      resolve_timeout: 5m

    route:

      group_by: ['job']

      group_wait: 30s

      group_interval: 5m

      repeat_interval: 12h

      receiver: 'null'

      routes:

      - match:

          alertname: Watchdog

        receiver: 'null'

    receivers:

    - name: 'null'

    templates:

    - '/etc/alertmanager/config/*.tmpl'



  ## Pass the Alertmanager configuration directives through Helm's templating

  ## engine. If the Alertmanager configuration contains Alertmanager templates,