From 034a32b09964cc361ea504e1bfc9af7b384f2521 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 12 Oct 2021 10:07:20 +0200 Subject: [PATCH] OZG-1279: Configure prometheus metrics --- templates/_helpers.tpl | 1 + templates/deployment.yaml | 1 + templates/service.yaml | 6 +++++- templates/service_monitor.yaml | 25 +++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 templates/service_monitor.yaml diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 248f40fb3..cd31289ce 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -31,6 +31,7 @@ app.kubernetes.io/instance: {{ include "app.name" . }} app.kubernetes.io/managed-by: {{ include "app.managedBy" . }} app.kubernetes.io/name: {{ include "app.name" . }} +app.kubernetes.io/part-of: kop app.kubernetes.io/version: {{ include "app.version" . }} app.kubernetes.io/namespace: {{ include "app.namespace" . }} helm.sh/chart: {{ include "app.chart" . }} diff --git a/templates/deployment.yaml b/templates/deployment.yaml index a286acb21..d674d4420 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -21,6 +21,7 @@ spec: metadata: labels: {{- include "app.defaultLabels" . | indent 8 }} + app.kubernetes.io/component: intelliform-adapter spec: topologySpreadConstraints: - maxSkew: 1 diff --git a/templates/service.yaml b/templates/service.yaml index a17f17261..4ebd84fd2 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -6,9 +6,13 @@ metadata: spec: selector: {{- include "app.matchLabels" . | indent 4 }} + app.kubernetes.io/component: intelliform-adapter-service type: ClusterIP ports: - name: http port: 8080 protocol: TCP - targetPort: 8080 \ No newline at end of file + targetPort: 8080 + - name: metrics + port: 8081 + protocol: TCP \ No newline at end of file diff --git a/templates/service_monitor.yaml b/templates/service_monitor.yaml new file mode 100644 index 000000000..ed5e5cc84 --- /dev/null +++ b/templates/service_monitor.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "app.name" . }} + namespace: {{ include "app.namespace" . }} + labels: + {{- include "app.defaultLabels" . | indent 4 }} +spec: + endpoints: + - honorLabels: true + port: metrics + path: /actuator/prometheus + relabelings: + - targetLabel: component + sourceLabels: + - __meta_kubernetes_pod_label_app_kubernetes_io_component + - targetLabel: partOf + sourceLabels: + - __meta_kubernetes_pod_label_app_kubernetes_io_part_of + namespaceSelector: + matchNames: + - {{ include "app.namespace" . }} + selector: + matchLabels: + {{- include "app.matchLabels" . | indent 6 }} \ No newline at end of file -- GitLab