From da51977e71f5c2321eba218a839ee2985601c5be Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 3 Jun 2022 08:22:54 +0200 Subject: [PATCH] feat: prometheus --- smardigo/templates/connect/deployment.yml | 1 + smardigo/templates/connect/ingress.yml | 1 + smardigo/templates/connect/monitoring.yml | 1 + smardigo/templates/connect/secret.yml | 1 + smardigo/templates/connect/service.yml | 1 + .../templates/elastic/external-elastic-cert.yml | 1 + .../elastic/external-elastic-service.yml | 15 +++++++++++++++ smardigo/templates/iam/deployment.yml | 1 + smardigo/templates/iam/monitoring.yml | 1 + smardigo/templates/iam/service.yml | 1 + .../templates/maria/external-maria-service.yml | 4 ++++ .../postgres/external-postgres-service.yml | 5 +++++ smardigo/templates/sepa-exporter/deployment.yml | 1 + smardigo/templates/sepa-exporter/monitoring.yml | 1 + smardigo/templates/sepa-exporter/secret.yml | 1 + smardigo/templates/sepa-exporter/service.yml | 1 + smardigo/templates/uba-export/deployment.yml | 1 + smardigo/templates/uba-export/monitoring.yml | 1 + smardigo/templates/uba-export/secret.yml | 1 + smardigo/templates/uba-export/service.yml | 1 + smardigo/templates/wordpress/deployment.yml | 1 + smardigo/templates/wordpress/ingress.yml | 1 + smardigo/templates/wordpress/secret.yml | 1 + smardigo/templates/wordpress/service.yml | 1 + 24 files changed, 45 insertions(+) diff --git a/smardigo/templates/connect/deployment.yml b/smardigo/templates/connect/deployment.yml index 9b3a401..de96c7a 100644 --- a/smardigo/templates/connect/deployment.yml +++ b/smardigo/templates/connect/deployment.yml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/smardigo/templates/connect/ingress.yml b/smardigo/templates/connect/ingress.yml index 0ef16ac..ee00306 100644 --- a/smardigo/templates/connect/ingress.yml +++ b/smardigo/templates/connect/ingress.yml @@ -1,3 +1,4 @@ +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/smardigo/templates/connect/monitoring.yml b/smardigo/templates/connect/monitoring.yml index c49e9bd..3db950a 100644 --- a/smardigo/templates/connect/monitoring.yml +++ b/smardigo/templates/connect/monitoring.yml @@ -1,3 +1,4 @@ +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml index 3c3d147..15ba809 100644 --- a/smardigo/templates/connect/secret.yml +++ b/smardigo/templates/connect/secret.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Secret metadata: diff --git a/smardigo/templates/connect/service.yml b/smardigo/templates/connect/service.yml index bc30038..9336651 100644 --- a/smardigo/templates/connect/service.yml +++ b/smardigo/templates/connect/service.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/smardigo/templates/elastic/external-elastic-cert.yml b/smardigo/templates/elastic/external-elastic-cert.yml index 13906cd..380bb62 100644 --- a/smardigo/templates/elastic/external-elastic-cert.yml +++ b/smardigo/templates/elastic/external-elastic-cert.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 data: ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURTakNDQWpLZ0F3SUJBZ0lWQUxvYU8rdnllSmM2ZWxLTjRTTUlPYjlBS204SE1BMEdDU3FHU0liM0RRRUIKQ3dVQU1EUXhNakF3QmdOVkJBTVRLVVZzWVhOMGFXTWdRMlZ5ZEdsbWFXTmhkR1VnVkc5dmJDQkJkWFJ2WjJWdQpaWEpoZEdWa0lFTkJNQjRYRFRJeE1Ea3dNekV5TVRJd05Gb1hEVEl5TURrd016RXlNVEl3TkZvd05ERXlNREFHCkExVUVBeE1wUld4aGMzUnBZeUJEWlhKMGFXWnBZMkYwWlNCVWIyOXNJRUYxZEc5blpXNWxjbUYwWldRZ1EwRXcKZ2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ1NrSUgyUWx6Y0VuY21BQXd0a1Z3NwpOc3I3V0VCTzdlSUlTVDNtWTlYSndscVA0SXNSOUM5VW5TWFVTcFdTSkVjdjFJNm1yWkUzOEh5cS9ydmNFRlpLClpTZ0hZRHNKaVZnbGtVWkZkdjVTODR2Z1ZTUk9veSs4cjEwZm9rSGZwYmlkdEptWGFiUDVUNlZEK0xFK01nN3kKUmRkaEhaQ29NNHdIdmVvL3E1NWMzUkNvVmMwUEVFTHJrMHZWcXZZSzk5TE8reUFwckJQelJ1WERaeDVvSmt4RAorVWM0clR5TkNjVFRvOENrSzFCZmNjWGt0QkhUUXZPek9ZeHV3eUd4Yi9HQ2FLd2NHRytYUTRUUnQzbzdyM0dSClRPS0NOTytzTTZjMGc3VzBPb0wzOHY3L0lLQXVmVGNtVTdRTy90YjlOQnovRzlONTdFT3FoUGRwLzQ2aWgxWFgKQWdNQkFBR2pVekJSTUIwR0ExVWREZ1FXQkJRVFBSRVdTeDM3SzFJcEhlY0lxdU5kREU3enREQWZCZ05WSFNNRQpHREFXZ0JRVFBSRVdTeDM3SzFJcEhlY0lxdU5kREU3enREQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHClNJYjNEUUVCQ3dVQUE0SUJBUUFHVm9lUzFoZlZPckRubkxZelBTckY5SWZIRXp0L2VTcjN5bUVpTlVLOFphUlMKOWdwdlJnWDhuMHBTMTk3d1Z5SzhoZDJpWHpINThINktNa2hjV1pIMnVOTEVCOGFPRk9Da1F4blU0TnNNWVJqVApSYVMrcWYyOVliSDZMa3lPMWt4Q3RHeGxkS3liajhJOE1GZjhYMG1CTE40TmsrdytLcUtWRnNsNjNBTXRzSmtxCldPZ2pvWVpjWStGUVcwSHFTMkF6RFZrRFppWEF0and0WFhqT05BSk95bFJIRGllQTNVQnl1a05ISTBPdEl1clgKZVBzRFVvRWFrYXd0Z1habUQ4L1JDdDhKcHFtNVVEd0Fpb2ExOEtKdjN1NXlxdFgrd2hVbkZTSTd1NStNemxheQoyYU9UNXRJcE9YUVBWM3R1VVN2QzZDWXBvSk9yTGpnSlNKaGNQOFVvCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K diff --git a/smardigo/templates/elastic/external-elastic-service.yml b/smardigo/templates/elastic/external-elastic-service.yml index 3736534..8fc5c5a 100644 --- a/smardigo/templates/elastic/external-elastic-service.yml +++ b/smardigo/templates/elastic/external-elastic-service.yml @@ -3,6 +3,11 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.sharedService.elastic.host01.name }}" + labels: + app: "{{ .Values.sharedService.elastic.host01.name }}" +spec: + selector: + app: "{{ .Values.sharedService.elastic.host01.name }}" spec: ports: - protocol: TCP @@ -23,6 +28,11 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.sharedService.elastic.host02.name }}" + labels: + app: "{{ .Values.sharedService.elastic.host02.name }}" +spec: + selector: + app: "{{ .Values.sharedService.elastic.host02.name }}" spec: ports: - protocol: TCP @@ -43,6 +53,11 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.sharedService.elastic.host03.name }}" + labels: + app: "{{ .Values.sharedService.elastic.host03.name }}" +spec: + selector: + app: "{{ .Values.sharedService.elastic.host03.name }}" spec: ports: - protocol: TCP diff --git a/smardigo/templates/iam/deployment.yml b/smardigo/templates/iam/deployment.yml index 5bea126..212f819 100644 --- a/smardigo/templates/iam/deployment.yml +++ b/smardigo/templates/iam/deployment.yml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/smardigo/templates/iam/monitoring.yml b/smardigo/templates/iam/monitoring.yml index fc04aac..5d71fb2 100644 --- a/smardigo/templates/iam/monitoring.yml +++ b/smardigo/templates/iam/monitoring.yml @@ -1,3 +1,4 @@ +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/smardigo/templates/iam/service.yml b/smardigo/templates/iam/service.yml index a6ceef5..a013095 100644 --- a/smardigo/templates/iam/service.yml +++ b/smardigo/templates/iam/service.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/smardigo/templates/maria/external-maria-service.yml b/smardigo/templates/maria/external-maria-service.yml index c13112a..69f3c8f 100644 --- a/smardigo/templates/maria/external-maria-service.yml +++ b/smardigo/templates/maria/external-maria-service.yml @@ -3,7 +3,11 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.sharedService.maria.host.name }}" + labels: + app: "{{ .Values.sharedService.maria.host.name }}" spec: + selector: + app: "{{ .Values.sharedService.maria.host.name }}" ports: - protocol: TCP port: 3306 diff --git a/smardigo/templates/postgres/external-postgres-service.yml b/smardigo/templates/postgres/external-postgres-service.yml index 0ebda96..aeb58e5 100644 --- a/smardigo/templates/postgres/external-postgres-service.yml +++ b/smardigo/templates/postgres/external-postgres-service.yml @@ -3,6 +3,11 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.sharedService.postgres.host.name }}" + labels: + app: "{{ .Values.sharedService.postgres.host.name }}" +spec: + selector: + app: "{{ .Values.sharedService.postgres.host.name }}" spec: ports: - protocol: TCP diff --git a/smardigo/templates/sepa-exporter/deployment.yml b/smardigo/templates/sepa-exporter/deployment.yml index 493afae..b6cc113 100644 --- a/smardigo/templates/sepa-exporter/deployment.yml +++ b/smardigo/templates/sepa-exporter/deployment.yml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/smardigo/templates/sepa-exporter/monitoring.yml b/smardigo/templates/sepa-exporter/monitoring.yml index 9984196..7a047b5 100644 --- a/smardigo/templates/sepa-exporter/monitoring.yml +++ b/smardigo/templates/sepa-exporter/monitoring.yml @@ -1,3 +1,4 @@ +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/smardigo/templates/sepa-exporter/secret.yml b/smardigo/templates/sepa-exporter/secret.yml index 2bde583..6d466d1 100644 --- a/smardigo/templates/sepa-exporter/secret.yml +++ b/smardigo/templates/sepa-exporter/secret.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Secret metadata: diff --git a/smardigo/templates/sepa-exporter/service.yml b/smardigo/templates/sepa-exporter/service.yml index 2a83924..815d3e7 100644 --- a/smardigo/templates/sepa-exporter/service.yml +++ b/smardigo/templates/sepa-exporter/service.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/smardigo/templates/uba-export/deployment.yml b/smardigo/templates/uba-export/deployment.yml index 83837f2..0139b74 100644 --- a/smardigo/templates/uba-export/deployment.yml +++ b/smardigo/templates/uba-export/deployment.yml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/smardigo/templates/uba-export/monitoring.yml b/smardigo/templates/uba-export/monitoring.yml index 555bcc1..7c7bdc6 100644 --- a/smardigo/templates/uba-export/monitoring.yml +++ b/smardigo/templates/uba-export/monitoring.yml @@ -1,3 +1,4 @@ +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/smardigo/templates/uba-export/secret.yml b/smardigo/templates/uba-export/secret.yml index fc5ebac..3d77862 100644 --- a/smardigo/templates/uba-export/secret.yml +++ b/smardigo/templates/uba-export/secret.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Secret metadata: diff --git a/smardigo/templates/uba-export/service.yml b/smardigo/templates/uba-export/service.yml index 1ac7f9f..c205877 100644 --- a/smardigo/templates/uba-export/service.yml +++ b/smardigo/templates/uba-export/service.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/smardigo/templates/wordpress/deployment.yml b/smardigo/templates/wordpress/deployment.yml index 90acc6a..fcea139 100644 --- a/smardigo/templates/wordpress/deployment.yml +++ b/smardigo/templates/wordpress/deployment.yml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/smardigo/templates/wordpress/ingress.yml b/smardigo/templates/wordpress/ingress.yml index c51a6af..307c81d 100644 --- a/smardigo/templates/wordpress/ingress.yml +++ b/smardigo/templates/wordpress/ingress.yml @@ -1,3 +1,4 @@ +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/smardigo/templates/wordpress/secret.yml b/smardigo/templates/wordpress/secret.yml index f49762b..ce41862 100644 --- a/smardigo/templates/wordpress/secret.yml +++ b/smardigo/templates/wordpress/secret.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Secret metadata: diff --git a/smardigo/templates/wordpress/service.yml b/smardigo/templates/wordpress/service.yml index fe29172..f0999fc 100644 --- a/smardigo/templates/wordpress/service.yml +++ b/smardigo/templates/wordpress/service.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: