Commit 47b5a910 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added MetricsHandler to store REST API metrics using Prometheus + updated... 

added MetricsHandler to store REST API metrics using Prometheus + updated charts & services to expose /metrics endpoint on port 9000
parent 4d15b9ae

charts/meep-auth-svc/values.yaml

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ prometheus: 
    port: 9000

    interval: 10s

    additionalLabels: {}

    namespace: ""

    relabelings: []

    scrapeTimeout: 5s

charts/meep-gis-engine/templates/monitor.yaml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{{- if .Values.prometheus.monitor.enabled }}

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  name: {{ template "meep-gis-engine.fullname" . }}

  namespace: {{ .Release.Namespace }}

  labels:

    app: {{ template "meep-gis-engine.name" . }}

    chart: {{ template "meep-gis-engine.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

    meepOrigin: {{ .Values.meepOrigin }}

  {{- if .Values.prometheus.monitor.additionalLabels }}

{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}

  {{- end }}

spec:

  selector:

    matchLabels:

      app: {{ template "meep-gis-engine.name" . }}

      release: {{ .Release.Name }}

  endpoints:

    - port: metrics

      {{- if .Values.prometheus.monitor.interval }}

      interval: {{ .Values.prometheus.monitor.interval }}

      {{- end }}

      {{- if .Values.prometheus.monitor.scrapeTimeout }}

      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}

      {{- end }}

{{- if .Values.prometheus.monitor.relabelings }}

      relabelings:

{{ toYaml .Values.prometheus.monitor.relabelings | indent 6 }}

{{- end }}

{{- end }}

charts/meep-gis-engine/templates/service.yaml

+9 −2
Original line number Diff line number Diff line
@@ -14,8 +14,15 @@ spec: 
    app: {{ template "meep-gis-engine.name" . }}

    release: {{ .Release.Name }}

  ports:

    - port: {{ .Values.service.port }}

    - name: gis-engine

      port: {{ .Values.service.port }}

      targetPort: {{ .Values.deployment.port }}

      {{- if .Values.service.nodePort }}

      nodePort: {{ .Values.service.nodePort }}

      {{- end }}

    {{- if .Values.prometheus.monitor.enabled}}

    - name: metrics

      port: {{ .Values.prometheus.monitor.port }}

      targetPort: {{ .Values.prometheus.monitor.port }}

      protocol: TCP

    {{- end}}
 
 No newline at end of file

charts/meep-gis-engine/values-template.yaml

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,15 @@ ingress: 
  labels: {}

  tls:



prometheus:

  monitor:

    enabled: true

    port: 9000

    interval: 10s

    additionalLabels: {}

    relabelings: []

    scrapeTimeout: 5s

    

codecov:

  enabled: false

charts/meep-loc-serv/templates/monitor.yaml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{{- if .Values.prometheus.monitor.enabled }}

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  name: {{ template "meep-loc-serv.fullname" . }}

  namespace: {{ .Release.Namespace }}

  labels:

    app: {{ template "meep-loc-serv.name" . }}

    chart: {{ template "meep-loc-serv.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

    meepOrigin: {{ .Values.meepOrigin }}

  {{- if .Values.prometheus.monitor.additionalLabels }}

{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}

  {{- end }}

spec:

  selector:

    matchLabels:

      app: {{ template "meep-loc-serv.name" . }}

      release: {{ .Release.Name }}

  endpoints:

    - port: metrics

      {{- if .Values.prometheus.monitor.interval }}

      interval: {{ .Values.prometheus.monitor.interval }}

      {{- end }}

      {{- if .Values.prometheus.monitor.scrapeTimeout }}

      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}

      {{- end }}

{{- if .Values.prometheus.monitor.relabelings }}

      relabelings:

{{ toYaml .Values.prometheus.monitor.relabelings | indent 6 }}

{{- end }}

{{- end }}