Unverified Commit aba3e977 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #221 from nikhildoifode/mec-250 

Added prometheus alerts and slack configuration in separate config file.
parents 9f6410d9 02b359e2

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

+1 −1
Original line number Diff line number Diff line 
{{- if or .Values.additionalPrometheusRules .Values.additionalPrometheusRulesMap}}

{{- if and (.Values.alertmanager.enabled) (or .Values.additionalPrometheusRules .Values.additionalPrometheusRulesMap) }}

apiVersion: v1

kind: List

items:

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/pvc-deleter.yaml

+12 −3
Original line number Diff line number Diff line 
{{- if and .Values.prometheus.prometheusSpec.persistentVolume.enabled .Values.alertmanager.alertmanagerSpec.persistentVolume.enabled }}

{{- $prometheus := .Values.prometheus.enabled -}}

{{- $alertmanager := .Values.alertmanager.enabled -}}

{{- $promStorageSpec := .Values.prometheus.prometheusSpec.storageSpec }}

{{- $alertStorageSpec := .Values.alertmanager.alertmanagerSpec.storage }}



{{- if or (and $prometheus $promStorageSpec) (and $alertmanager $alertStorageSpec) }}

apiVersion: rbac.authorization.k8s.io/v1

kind: Role

metadata:
@@ -50,8 +55,12 @@ spec: 
        args:

        - "delete"

        - "pvc"

        - "{{ .Values.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.metadata.name }}-prometheus-{{ template "kube-prometheus-stack.fullname" . }}-prometheus-0"

        - "{{ .Values.alertmanager.alertmanagerSpec.storage.volumeClaimTemplate.metadata.name }}-alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager-0"

        {{- if and $prometheus $promStorageSpec }}

        - "{{ $promStorageSpec.volumeClaimTemplate.metadata.name }}-prometheus-{{ template "kube-prometheus-stack.fullname" . }}-server-0"

        {{- end }}

        {{- if and $alertmanager $alertStorageSpec }}

        - "{{ $alertStorageSpec.volumeClaimTemplate.metadata.name }}-alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager-0"

        {{- end }}

      serviceAccountName: pvc-deleter-sa

      securityContext:

        runAsUser: 0

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 }}