Commit c9481cfa authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Resolved PR comments 

- Added priority in repocfg to make sure prometheus is first one to be installed
- Enabled servicemonitor in node-exporter and deleted the one in prometheus
- Added affinity for prometheus statefulsets
- Added meeporigincore
parent ea95eaff

.meepctl-repocfg.yaml

+2 −0
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ repo: 
      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-postgis.yaml

    meep-prometheus:

      # Priority 1 is highest to make sure Prometheus is deployed first

      priority: 1

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

charts/kube-prometheus-stack/charts/prometheus-node-exporter/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ service: 


prometheus:

  monitor:

    enabled: false

    enabled: true

    additionalLabels: {}

    namespace: ""

charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
{{- if .Values.nodeExporter.enabled }}

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

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

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

  labels:

    app: {{ template "kube-prometheus-stack.name" . }}-node-exporter

{{ include "kube-prometheus-stack.labels" . | indent 4 }}

spec:

  jobLabel: {{ .Values.nodeExporter.jobLabel }}

  selector:

    matchLabels:

      app: node-exporter

      release: {{ $.Release.Name }}

  endpoints:

  - port: metrics

    {{- if .Values.nodeExporter.serviceMonitor.interval }}

    interval: {{ .Values.nodeExporter.serviceMonitor.interval }}

    {{- end }}

    {{- if .Values.nodeExporter.serviceMonitor.scrapeTimeout }}

    scrapeTimeout: {{ .Values.nodeExporter.serviceMonitor.scrapeTimeout }}

    {{- end }}

{{- if .Values.nodeExporter.serviceMonitor.metricRelabelings }}

    metricRelabelings:

{{ tpl (toYaml .Values.nodeExporter.serviceMonitor.metricRelabelings | indent 4) . }}

{{- end }}

{{- if .Values.nodeExporter.serviceMonitor.relabelings }}

    relabelings:

{{ toYaml .Values.nodeExporter.serviceMonitor.relabelings | indent 4 }}

{{- end }}

{{- end }}

charts/kube-prometheus-stack/values.yaml

+17 −3
Original line number Diff line number Diff line
@@ -561,6 +561,13 @@ alertmanager: 
    #         values:

    #         - e2e-az1

    #         - e2e-az2

    affinity:

      nodeAffinity:

        requiredDuringSchedulingIgnoredDuringExecution:

          nodeSelectorTerms:

          - matchExpressions:

            - key: node-role.kubernetes.io/master

              operator: Exists



    ## If specified, the pod's tolerations.

    ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
@@ -1891,7 +1898,7 @@ prometheus: 
    ## Assign custom affinity rules to the prometheus instance

    ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/

    ##

    affinity: {}

    # affinity: {}

    # nodeAffinity:

    #   requiredDuringSchedulingIgnoredDuringExecution:

    #     nodeSelectorTerms:
@@ -1901,6 +1908,13 @@ prometheus: 
    #         values:

    #         - e2e-az1

    #         - e2e-az2

    affinity:

      nodeAffinity:

        requiredDuringSchedulingIgnoredDuringExecution:

          nodeSelectorTerms:

          - matchExpressions:

            - key: node-role.kubernetes.io/master

              operator: Exists



    ## The remote_read spec configuration for Prometheus.

    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#remotereadspec
@@ -1974,8 +1988,8 @@ prometheus: 
    additionalScrapeConfigs:

    - job_name: default/meep-prometheus-couchdb-exporter/0

      honor_timestamps: true

      scrape_interval: 1s

      scrape_timeout: 1s

      scrape_interval: 5s

      scrape_timeout: 5s

      metrics_path: /metrics

      scheme: http

      relabel_configs:

charts/redis/values.yaml

+2 −0
Original line number Diff line number Diff line
@@ -888,3 +888,5 @@ podDisruptionBudget: 
  enabled: false

  minAvailable: 1

  # maxUnavailable: 1



meepOrigin: core