Merge branch 'develop' into 'main'

Develop

See merge request !96

charts/Chart.yaml

 name: eck-monitoring
 version: ${PROJECT_RELEASE_VERSION}
 appVersion: "${PROJECT_RELEASE_VERSION}"
-#version: 0.1.10
+#version: 0.1.13
 
 

charts/templates/_helpers.tpl

@@ -54,3 +54,17 @@ Filebeat for agents input dns
 {{- define "filebeat4agents.dns" -}}
 filebeat4agents.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
 {{- end -}}
+
+{{/*
+Apm api dns
+*/}}
+{{- define "apmServer.dns" -}}
+apm.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
+{{- end -}}
+
+{{/*
+OTEL colletor api dns
+*/}}
+{{- define "collector.dns" -}}
+collector.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
+{{- end -}}
\ No newline at end of file

charts/templates/apm-server.yaml

+{{- if eq .Values.namespaceTag .Values.mainNamespace }}
+apiVersion: apm.k8s.elastic.co/v1
+kind: ApmServer
+metadata:
+  name: apm-server
+spec:
+  version: {{ .Values.elasticVersion }}
+  image: {{ .Values.apmServer.image }}:{{ default .Values.elasticVersion   .Values.apmServer.imageTag }}
+  count: {{ .Values.apmServer.count}}
+  elasticsearchRef:
+    name: {{ .Release.Name }}-elasticsearch
+  kibanaRef:
+    name: {{ .Release.Name }}-kibana
+  podTemplate:
+    metadata:
+      labels:
+        stack-namespace: {{ .Release.Namespace }} 
+    spec:
+      containers:
+        - name: apm-server
+          workingDir: /usr/share/apm-server
+          imagePullPolicy: Always
+          resources:
+            requests:
+              cpu: 100m
+              memory: 200Mi
+            limits:
+              cpu: 500m
+              memory: 1Gi
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-apm-server
+  annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    cert-manager.io/cluster-issuer: {{ .Values.clusterIssuer }}
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+      - {{ template "apmServer.dns" . }}
+    secretName: {{ .Release.Name }}-apm-ssl
+  rules:
+    - host: {{ template "apmServer.dns" . }}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend: 
+              service:
+                name: apm-server-apm-http
+                port:
+                  number: 8200
+{{- end }}
\ No newline at end of file

charts/templates/heartbeat.yaml

@@ -6,17 +6,28 @@ metadata:
   namespace: {{.Release.Namespace}} 
 spec:
   type: heartbeat
+  serviceAccountName: heartbeat-account  
   version: {{ .Values.elasticVersion }}
   elasticsearchRef:
     name: {{ .Release.Name }}-elasticsearch
   config:
-    {{- with .Values.heartbeat.services }}
+    {{- range $k, $v := .Values.heartbeat.services -}}
+      {{ if eq $k $.Values.namespaceTag }}
         {{- toYaml . | nindent 4 }}
       {{- end}}
+    {{- end }}  
     setup.ilm.enabled: true
     setup.ilm.policy_name: heartbeat-ilm
-    setup.ilm.overwrite: true
+    #setup.ilm.overwrite: true
     setup.ilm.policy_file: "/usr/share/heartbeat/ilm/heartbeat-ilm.json"
+    processors:
+    - add_kubernetes_metadata: {}
+    - add_cloud_metadata: {}
+    - add_host_metadata: {}
+    - add_fields:
+        target: fields
+        fields:
+          namespace: {{ .Values.namespaceTag }}
   deployment:
     replicas: 1
     podTemplate:
@@ -66,4 +77,80 @@ data:
       }
     }
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: heartbeat-role-{{ .Release.Namespace }}
+rules:
+- apiGroups: [""] 
+  resources:
+  - namespaces
+  - pods
+  - nodes
+  verbs:
+  - get
+  - watch
+  - list
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: heartbeat-account
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: heartbeat-rolebinding-{{ .Release.Namespace }}
+subjects:
+- kind: ServiceAccount
+  name: heartbeat-account
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: heartbeat-role-{{ .Release.Namespace }}
+  apiGroup: rbac.authorization.k8s.io
+---
+
+{{- end }}
+{{- if ne .Values.namespaceTag .Values.mainNamespace }}
+apiVersion: beat.k8s.elastic.co/v1beta1
+kind: Beat
+metadata:
+  name: heartbeat
+  namespace: {{ .Release.Namespace}} 
+spec:
+  type: heartbeat
+  serviceAccountName: heartbeat-account
+  version: {{ .Values.elasticVersion }}
+  elasticsearchRef:
+    name: {{ .Release.Name }}-elasticsearch
+    namespace: {{ .Values.mainNamespace }}
+  config:
+    {{- range $k, $v := .Values.heartbeat.services -}}
+      {{- if eq $k $.Values.namespaceTag }}
+        {{- toYaml . | nindent 4 }}
+      {{- end}}
+    {{- end}}
+    setup.ilm.enabled: true
+    setup.ilm.policy_name: heartbeat-ilm
+    processors:
+    - add_kubernetes_metadata: {}
+    - add_cloud_metadata: {}
+    - add_host_metadata: {}
+    - add_fields:
+        target: fields
+        fields:
+          namespace: {{ .Values.namespaceTag }}
+  deployment:
+    replicas: 1
+    podTemplate:
+      spec:
+        securityContext:
+          runAsUser: 0
+        containers:
+        - name: heartbeat
 {{- end }}
+
+
+

charts/templates/otel-collector.yaml

+{{- if eq .Values.namespaceTag .Values.mainNamespace }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: otel-collector
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: otel-collector
+  template:
+    metadata:
+      labels:
+        app: otel-collector
+    spec:
+      containers:
+        - name: opentelemetry-collector
+          image: "otel/opentelemetry-collector-k8s:0.121.0"
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          ports:
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+          volumeMounts:
+            - name: opentelemetry-collector-configmap
+              mountPath: /conf
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: opentelemetry-collector
+data:
+  relay: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: "0.0.0.0:4317"
+          http:
+            endpoint: "0.0.0.0:4318"
+    processors:
+      batch:
+    exporters:
+      otlphttp:
+        endpoint: "https://apm.common01.dev.simpl-europe.eu"
+        headers:
+          Authorization: "Bearer xN50r7gwP1DNrBj19RW1890l"
+        tls:
+          insecure: true
+    service:
+      pipelines:
+        traces:
+          receivers: [otlp]
+          processors: [batch]
+          exporters: [otlphttp]
+        metrics:
+          receivers: [otlp]  
+          processors: [batch]
+          exporters: [otlphttp]
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: otel-collector
+spec:
+  type: ClusterIP
+  ports:
+    - name: otpl-grpc
+      port: 4317
+      targetPort: 4317
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+  selector:
+    app: otel-collector
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-otel-collector
+  annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    #cert-manager.io/cluster-issuer: {{ .Values.clusterIssuer }}
+spec:
+  ingressClassName: nginx
+  #tls:
+  #- hosts:
+  #    - {{ template "collector.dns" . }}
+  #  secretName: {{ .Release.Name }}-collector-ssl
+  rules:
+    - host: {{ template "collector.dns" . }}
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend: 
+              service:
+                name:  otel-collector
+                port:
+                  number: 4318
+{{- end }}
\ No newline at end of file

charts/values.yaml

@@ -8,7 +8,7 @@ image:
 elasticVersion: 8.16.0
 
 namespaceTag: "test-namespace"
-mainNamespace: observability
+mainNamespace: "common01"
 
 # This suffix will be used to create subdomain of following template:
 # kibana.NAMESPACE.NAMESPACE_TAG.DOMAIN_SUFFIX
@@ -494,19 +494,433 @@ heartbeat:
     delete:
       min_age: 365d
   services:
+    common01:
       heartbeat.monitors:
+      - type: http
+        schedule: '30 * * * * * *'
+        id: common01-apm-server-apm-http
+        name: apm-server-apm-http
+        hosts: ["https://apm.common01.dev.simpl-europe.eu/"]
       - type: tcp
-      name: Elasticsearch Service
-      id: elasticsearch:9200
-      schedule: '@every 5s'
-      hosts: ["elastic-elasticsearch-es-http.observability.svc:9200"]
-    - type: tcp
-      name: Kibana GUI
-      id: kibana:443
-      schedule: '@every 5s'
-      hosts: ["kibana.dev.simpl-europe.eu:443"]
-    - type: icmp
-      id: kibana/icmp
-      name: Kibana ICMP
-      hosts: ["elastic-kibana-kb-http.observability.svc"]
-      schedule: '*/5 * * * * * *'
\ No newline at end of file
+        schedule: '31 * * * * * *'
+        id: common01-confluent-operator
+        name: confluent-operator
+        hosts: ["confluent-operator.common01:7778"]
+      - type: http
+        schedule: '32 * * * * * *'
+        id: common01-elastic-elasticsearch-es-http
+        name: elastic-elasticsearch-es-http
+        hosts: ["https://elasticsearch.common01.dev.simpl-europe.eu/"]
+      - type: tcp
+        schedule: '33 * * * * * *'
+        id: common01-elastic-elasticsearch-es-internal-http
+        name: elastic-elasticsearch-es-internal-http
+        hosts: ["elastic-elasticsearch-es-internal-http.common01:9200"]
+      - type: tcp
+        schedule: '34 * * * * * *'
+        id: common01-elastic-elasticsearch-es-node
+        name: elastic-elasticsearch-es-node
+        hosts: ["elastic-elasticsearch-es-node.common01:9200"]
+      - type: tcp
+        schedule: '35 * * * * * *'
+        id: common01-elastic-elasticsearch-es-transport
+        name: elastic-elasticsearch-es-transport
+        hosts: ["elastic-elasticsearch-es-transport.common01:9300"]
+      - type: http
+        schedule: '36 * * * * * *'
+        id: common01-elastic-kibana-kb-http
+        name: elastic-kibana-kb-http
+        hosts: ["https://kibana.common01.dev.simpl-europe.eu/"]
+      - type: tcp
+        schedule: '37 * * * * * *'
+        id: common01-kafka-9074
+        name: kafka-9074
+        hosts: ["kafka.common01:9074"]
+      - type: tcp
+        schedule: '38 * * * * * *'
+        id: common01-kafka-9092
+        name: kafka-9092
+        hosts: ["kafka.common01:9092"]
+      - type: tcp
+        schedule: '39 * * * * * *'
+        id: common01-kafka-8090
+        name: kafka-8090
+        hosts: ["kafka.common01:8090"]
+      - type: tcp
+        schedule: '40 * * * * * *'
+        id: common01-kafka-9071
+        name: kafka-9071
+        hosts: ["kafka.common01:9071"]
+      - type: tcp
+        schedule: '41 * * * * * *'
+        id: common01-kafka-7203
+        name: kafka-7203
+        hosts: ["kafka.common01:7203"]
+      - type: tcp
+        schedule: '42 * * * * * *'
+        id: common01-kafka-7777
+        name: kafka-7777
+        hosts: ["kafka.common01:7777"]
+      - type: tcp
+        schedule: '43 * * * * * *'
+        id: common01-kafka-7778
+        name: kafka-7778
+        hosts: ["kafka.common01:7778"]
+      - type: tcp
+        schedule: '44 * * * * * *'
+        id: common01-kafka-9072
+        name: kafka-9072
+        hosts: ["kafka.common01:9072"]
+      - type: tcp
+        schedule: '45 * * * * * *'
+        id: common01-kafka-0-internal-9074
+        name: kafka-0-internal-9074
+        hosts: ["kafka-0-internal.common01:9074"]
+      - type: tcp
+        schedule: '46 * * * * * *'
+        id: common01-kafka-0-internal-9092
+        name: kafka-0-internal-9092
+        hosts: ["kafka-0-internal.common01:9092"]
+      - type: tcp
+        schedule: '47 * * * * * *'
+        id: common01-kafka-0-internal-8090
+        name: kafka-0-internal-8090
+        hosts: ["kafka-0-internal.common01:8090"]
+      - type: tcp
+        schedule: '48 * * * * * *'
+        id: common01-kafka-0-internal-9071
+        name: kafka-0-internal-9071
+        hosts: ["kafka-0-internal.common01:9071"]
+      - type: tcp
+        schedule: '49 * * * * * *'
+        id: common01-kafka-0-internal-7203
+        name: kafka-0-internal-7203
+        hosts: ["kafka-0-internal.common01:7203"]
+      - type: tcp
+        schedule: '50 * * * * * *'
+        id: common01-kafka-0-internal-7777
+        name: kafka-0-internal-7777
+        hosts: ["kafka-0-internal.common01:7777"]
+      - type: tcp
+        schedule: '51 * * * * * *'
+        id: common01-kafka-0-internal-7778
+        name: kafka-0-internal-7778
+        hosts: ["kafka-0-internal.common01:7778"]
+      - type: tcp
+        schedule: '52 * * * * * *'
+        id: common01-kafka-0-internal-9072
+        name: kafka-0-internal-9072
+        hosts: ["kafka-0-internal.common01:9072"]
+      - type: tcp
+        schedule: '53 * * * * * *'
+        id: common01-kafka-1-internal-9074
+        name: kafka-1-internal-9074
+        hosts: ["kafka-1-internal.common01:9074"]
+      - type: tcp
+        schedule: '54 * * * * * *'
+        id: common01-kafka-1-internal-9092
+        name: kafka-1-internal-9092
+        hosts: ["kafka-1-internal.common01:9092"]
+      - type: tcp
+        schedule: '55 * * * * * *'
+        id: common01-kafka-1-internal-8090
+        name: kafka-1-internal-8090
+        hosts: ["kafka-1-internal.common01:8090"]
+      - type: tcp
+        schedule: '56 * * * * * *'
+        id: common01-kafka-1-internal-9071
+        name: kafka-1-internal-9071
+        hosts: ["kafka-1-internal.common01:9071"]
+      - type: tcp
+        schedule: '57 * * * * * *'
+        id: common01-kafka-1-internal-7203
+        name: kafka-1-internal-7203
+        hosts: ["kafka-1-internal.common01:7203"]
+      - type: tcp
+        schedule: '58 * * * * * *'
+        id: common01-kafka-1-internal-7777
+        name: kafka-1-internal-7777
+        hosts: ["kafka-1-internal.common01:7777"]
+      - type: tcp
+        schedule: '59 * * * * * *'
+        id: common01-kafka-1-internal-7778
+        name: kafka-1-internal-7778
+        hosts: ["kafka-1-internal.common01:7778"]
+      - type: tcp
+        schedule: '0 * * * * * *'
+        id: common01-kafka-1-internal-9072
+        name: kafka-1-internal-9072
+        hosts: ["kafka-1-internal.common01:9072"]
+      - type: tcp
+        schedule: '1 * * * * * *'
+        id: common01-kafka-2-internal-9074
+        name: kafka-2-internal-9074
+        hosts: ["kafka-2-internal.common01:9074"]
+      - type: tcp
+        schedule: '2 * * * * * *'
+        id: common01-kafka-2-internal-9092
+        name: kafka-2-internal-9092
+        hosts: ["kafka-2-internal.common01:9092"]
+      - type: tcp
+        schedule: '3 * * * * * *'
+        id: common01-kafka-2-internal-8090
+        name: kafka-2-internal-8090
+        hosts: ["kafka-2-internal.common01:8090"]
+      - type: tcp
+        schedule: '4 * * * * * *'
+        id: common01-kafka-2-internal-9071
+        name: kafka-2-internal-9071
+        hosts: ["kafka-2-internal.common01:9071"]
+      - type: tcp
+        schedule: '5 * * * * * *'
+        id: common01-kafka-2-internal-7203
+        name: kafka-2-internal-7203
+        hosts: ["kafka-2-internal.common01:7203"]
+      - type: tcp
+        schedule: '6 * * * * * *'
+        id: common01-kafka-2-internal-7777
+        name: kafka-2-internal-7777
+        hosts: ["kafka-2-internal.common01:7777"]
+      - type: tcp
+        schedule: '7 * * * * * *'
+        id: common01-kafka-2-internal-7778
+        name: kafka-2-internal-7778
+        hosts: ["kafka-2-internal.common01:7778"]
+      - type: tcp
+        schedule: '8 * * * * * *'
+        id: common01-kafka-2-internal-9072
+        name: kafka-2-internal-9072
+        hosts: ["kafka-2-internal.common01:9072"]
+      - type: tcp
+        schedule: '9 * * * * * *'
+        id: common01-kraftcontroller-9074
+        name: kraftcontroller-9074
+        hosts: ["kraftcontroller.common01:9074"]
+      - type: tcp
+        schedule: '10 * * * * * *'
+        id: common01-kraftcontroller-7203
+        name: kraftcontroller-7203
+        hosts: ["kraftcontroller.common01:7203"]
+      - type: tcp
+        schedule: '11 * * * * * *'
+        id: common01-kraftcontroller-7777
+        name: kraftcontroller-7777
+        hosts: ["kraftcontroller.common01:7777"]
+      - type: tcp
+        schedule: '12 * * * * * *'
+        id: common01-kraftcontroller-7778
+        name: kraftcontroller-7778
+        hosts: ["kraftcontroller.common01:7778"]
+      - type: tcp
+        schedule: '13 * * * * * *'
+        id: common01-kraftcontroller-9072
+        name: kraftcontroller-9072
+        hosts: ["kraftcontroller.common01:9072"]
+      - type: tcp
+        schedule: '14 * * * * * *'
+        id: common01-kraftcontroller-0-internal-9074
+        name: kraftcontroller-0-internal-9074
+        hosts: ["kraftcontroller-0-internal.common01:9074"]
+      - type: tcp
+        schedule: '15 * * * * * *'
+        id: common01-kraftcontroller-0-internal-7203
+        name: kraftcontroller-0-internal-7203
+        hosts: ["kraftcontroller-0-internal.common01:7203"]
+      - type: tcp
+        schedule: '16 * * * * * *'
+        id: common01-kraftcontroller-0-internal-7777
+        name: kraftcontroller-0-internal-7777
+        hosts: ["kraftcontroller-0-internal.common01:7777"]
+      - type: tcp
+        schedule: '17 * * * * * *'
+        id: common01-kraftcontroller-0-internal-7778
+        name: kraftcontroller-0-internal-7778
+        hosts: ["kraftcontroller-0-internal.common01:7778"]
+      - type: tcp
+        schedule: '18 * * * * * *'
+        id: common01-kraftcontroller-0-internal-9072
+        name: kraftcontroller-0-internal-9072
+        hosts: ["kraftcontroller-0-internal.common01:9072"]
+      - type: tcp
+        schedule: '19 * * * * * *'
+        id: common01-kraftcontroller-1-internal-9074
+        name: kraftcontroller-1-internal-9074
+        hosts: ["kraftcontroller-1-internal.common01:9074"]
+      - type: tcp
+        schedule: '20 * * * * * *'
+        id: common01-kraftcontroller-1-internal-7203
+        name: kraftcontroller-1-internal-7203
+        hosts: ["kraftcontroller-1-internal.common01:7203"]
+      - type: tcp
+        schedule: '21 * * * * * *'
+        id: common01-kraftcontroller-1-internal-7777
+        name: kraftcontroller-1-internal-7777
+        hosts: ["kraftcontroller-1-internal.common01:7777"]
+      - type: tcp
+        schedule: '22 * * * * * *'
+        id: common01-kraftcontroller-1-internal-7778
+        name: kraftcontroller-1-internal-7778
+        hosts: ["kraftcontroller-1-internal.common01:7778"]
+      - type: tcp
+        schedule: '23 * * * * * *'
+        id: common01-kraftcontroller-1-internal-9072
+        name: kraftcontroller-1-internal-9072
+        hosts: ["kraftcontroller-1-internal.common01:9072"]
+    authority01:
+      heartbeat.monitors:
+      - type: http
+        schedule: '0 * * * * * *'
+        id: authority01-adapter-service
+        name: adapter-service
+        hosts: ["https://adapter.authority01.dev.simpl-europe.eu/"]
+      - type: tcp
+        schedule: '1 * * * * * *'
+        id: authority01-authentication-provider
+        name: authentication-provider
+        hosts: ["authentication-provider.authority01:8080"]
+      - type: tcp
+        schedule: '2 * * * * * *'
+        id: authority01-ejbca-community-helm-30080
+        name: ejbca-community-helm-30080
+        hosts: ["ejbca-community-helm.authority01:30080"]
+      - type: tcp
+        schedule: '3 * * * * * *'
+        id: authority01-ejbca-community-helm-30443
+        name: ejbca-community-helm-30443
+        hosts: ["ejbca-community-helm.authority01:30443"]
+      - type: tcp
+        schedule: '4 * * * * * *'
+        id: authority01-identity-provider
+        name: identity-provider
+        hosts: ["identity-provider.authority01:8080"]
+      - type: tcp
+        schedule: '5 * * * * * *'
+        id: authority01-keycloak
+        name: keycloak
+        hosts: ["keycloak.authority01:80"]
+      - type: tcp
+        schedule: '6 * * * * * *'
+        id: authority01-keycloak-headless
+        name: keycloak-headless
+        hosts: ["keycloak-headless.authority01:8080"]
+      - type: tcp
+        schedule: '7 * * * * * *'
+        id: authority01-onboarding
+        name: onboarding
+        hosts: ["onboarding.authority01:8080"]
+      - type: tcp
+        schedule: '8 * * * * * *'
+        id: authority01-postgresql
+        name: postgresql
+        hosts: ["postgresql.authority01:5432"]
+      - type: tcp
+        schedule: '9 * * * * * *'
+        id: authority01-postgresql-hl
+        name: postgresql-hl
+        hosts: ["postgresql-hl.authority01:5432"]
+      - type: tcp
+        schedule: '10 * * * * * *'
+        id: authority01-redis-headless
+        name: redis-headless
+        hosts: ["redis-headless.authority01:6379"]
+      - type: tcp
+        schedule: '11 * * * * * *'
+        id: authority01-redis-master
+        name: redis-master
+        hosts: ["redis-master.authority01:6379"]
+      - type: tcp
+        schedule: '12 * * * * * *'
+        id: authority01-security-attributes-provider
+        name: security-attributes-provider
+        hosts: ["security-attributes-provider.authority01:8080"]
+      - type: http
+        schedule: '13 * * * * * *'
+        id: authority01-simpl-cloud-gateway
+        name: simpl-cloud-gateway
+        hosts: ["https://authority.be.authority01.dev.simpl-europe.eu/"]
+      - type: http
+        schedule: '14 * * * * * *'
+        id: authority01-simpl-fe-onboarding-onboarding
+        name: simpl-fe-onboarding-onboarding
+        hosts: ["https://authority.fe.authority01.dev.simpl-europe.eu/onboarding"]
+      - type: http
+        schedule: '15 * * * * * *'
+        id: authority01-simpl-fe-participant-participant-utility
+        name: simpl-fe-participant-participant-utility
+        hosts: ["https://authority.fe.authority01.dev.simpl-europe.eu/participant-utility"]
+      - type: http
+        schedule: '16 * * * * * *'
+        id: authority01-simpl-fe-sap-sap
+        name: simpl-fe-sap-sap
+        hosts: ["https://authority.fe.authority01.dev.simpl-europe.eu/sap"]
+      - type: http
+        schedule: '17 * * * * * *'
+        id: authority01-simpl-fe-usersroles-users-roles
+        name: simpl-fe-usersroles-users-roles
+        hosts: ["https://authority.fe.authority01.dev.simpl-europe.eu/users-roles"]
+      - type: tcp
+        schedule: '18 * * * * * *'
+        id: authority01-tls-gateway
+        name: tls-gateway
+        hosts: ["tls-gateway.authority01:443"]
+      - type: tcp
+        schedule: '19 * * * * * *'
+        id: authority01-users-roles
+        name: users-roles
+        hosts: ["users-roles.authority01:8080"]
+      - type: tcp
+        schedule: '20 * * * * * *'
+        id: authority01-xsfc-neo4j-7687
+        name: xsfc-neo4j-7687
+        hosts: ["xsfc-neo4j.authority01:7687"]
+      - type: tcp
+        schedule: '21 * * * * * *'
+        id: authority01-xsfc-neo4j-7474
+        name: xsfc-neo4j-7474
+        hosts: ["xsfc-neo4j.authority01:7474"]
+      - type: tcp
+        schedule: '22 * * * * * *'
+        id: authority01-xsfc-neo4j-admin-7687
+        name: xsfc-neo4j-admin-7687
+        hosts: ["xsfc-neo4j-admin.authority01:7687"]
+      - type: tcp
+        schedule: '23 * * * * * *'
+        id: authority01-xsfc-neo4j-admin-7474
+        name: xsfc-neo4j-admin-7474
+        hosts: ["xsfc-neo4j-admin.authority01:7474"]
+      - type: tcp
+        schedule: '24 * * * * * *'
+        id: authority01-xsfc-neo4j-db-lb-neo4j-7474
+        name: xsfc-neo4j-db-lb-neo4j-7474
+        hosts: ["xsfc-neo4j-db-lb-neo4j.authority01:7474"]
+      - type: tcp
+        schedule: '25 * * * * * *'
+        id: authority01-xsfc-neo4j-db-lb-neo4j-7473
+        name: xsfc-neo4j-db-lb-neo4j-7473
+        hosts: ["xsfc-neo4j-db-lb-neo4j.authority01:7473"]
+      - type: tcp
+        schedule: '26 * * * * * *'
+        id: authority01-xsfc-neo4j-db-lb-neo4j-7687
+        name: xsfc-neo4j-db-lb-neo4j-7687
+        hosts: ["xsfc-neo4j-db-lb-neo4j.authority01:7687"]
+      - type: tcp
+        schedule: '27 * * * * * *'
+        id: authority01-xsfc-postgres
+        name: xsfc-postgres
+        hosts: ["xsfc-postgres.authority01:5432"]
+      - type: tcp
+        schedule: '28 * * * * * *'
+        id: authority01-xsfc-postgres-hl
+        name: xsfc-postgres-hl
+        hosts: ["xsfc-postgres-hl.authority01:5432"]
+      - type: http
+        schedule: '29 * * * * * *'
+        id: authority01-xsfc-service
+        name: xsfc-service
+        hosts: ["https://xsfc-server-service.authority01.dev.simpl-europe.eu/"]
+    consumer01:
+      heartbeat.monitors:
+apmServer:
+  count: 1
+  image: docker.elastic.co/apm/apm-server
+  imageTag: ""

monitors-consumer.yaml

+heartbeat.monitors:
+  - type: http
+    id: consumer-catalogue-ui
+    name: Simpl-catalogue-ui
+    schedule: '1 * * * * * *'
+    urls: ["https://catalogue-ui.consumer01.dev.simpl-europe.eu/"]
+
+  - type: http
+    id: consumer-contract-consumption-be
+    name: Simpl-contract-consumption-be
+    schedule: '2 * * * * * *'
+    urls: ["https://contract-consumption-be.consumer01.dev.simpl-europe.eu/"]
+
+  - type: http
+    id: consumer-simpl-edc-service-management
+    name: Simpl-edc-service-management
+    schedule: '3 * * * * * *'
+    urls: ["https://edc.consumer01.dev.simpl-europe.eu/management"]
+
+  - type: http
+    id: consumer-simpl-edc-service-api
+    name: Simpl-edc-service-api
+    schedule: '4 * * * * * *'
+    urls: ["https://edc.consumer01.dev.simpl-europe.eu/api"]
+
+  - type: http
+    id: consumer-simpl-edc-service-protocol
+    name: Simpl-edc-service-protocol
+    schedule: '5 * * * * * *'
+    urls: ["https://edc.consumer01.dev.simpl-europe.eu/protocol"]
+
+  - type: http
+    id: consumer-simpl-edc-service-public
+    name: Simpl-edc-service-public
+    schedule: '6 * * * * * *'
+    urls: ["https://edc.consumer01.dev.simpl-europe.eu/public"]
+
+  - type: http
+    id: consumer-simpl-edc-service-control
+    name: Simpl-edc-service-control
+    schedule: '7 * * * * * *'
+    urls: ["https://edc.consumer01.dev.simpl-europe.eu/control"]
+
+  - type: http
+    id: consumer-simpl-fe-usersroles
+    name: Simpl-fe-usersroles
+    schedule: '8 * * * * * *'
+    urls: ["https://participant.fe.consumer01.dev.simpl-europe.eu/users-roles"]
+
+  - type: http
+    id: consumer-simpl-fe-participant-utility
+    name: Simpl-fe-participant-utility
+    schedule: '9 * * * * * *'
+    urls: ["https://participant.fe.consumer01.dev.simpl-europe.eu/participant-utility"]
+
+  - type: http
+    id: consumer-simpl-cloud-gateway
+    name: Simpl-cloud-gateway
+    schedule: '10 * * * * * *'
+    urls: ["https://participant.be.consumer01.dev.simpl-europe.eu/"]
+
+  - type: http
+    id: consumer-xsfc-advsearch-be
+    name: Simpl-xsfc-advsearch-be
+    schedule: '1 * * * * * *'
+    urls: ["https://xsfc-advsearch-be.consumer01.dev.simpl-europe.eu/"]
+
+  - type: http
+    id: consumer-authentication-provider
+    name: Simpl-authentication-provider
+    schedule: '2 * * * * * *'
+    hosts: ["http://authentication-provider.consumer01:8080"]
+
+  - type: http
+    id: consumer-contract-consumer
+    name: Simpl-contract-consumer
+    schedule: '3 * * * * * *'
+    hosts: ["http://contract-consumer.consumer01:8080"]
+
+  - type: http
+    id: consumer-keycloak
+    name: Simpl-keycloak
+    schedule: '4 * * * * * *'
+    hosts: ["http://keycloak.consumer01:80"]
+
+  - type: tcp
+    id: consumer-postgresql
+    name: Simpl-postgresql
+    schedule: '5 * * * * * *'
+    hosts: ["postgresql.consumer01:5432"]
+
+  - type: tcp
+    id: consumer-redis-master
+    name: Simpl-redis-master
+    schedule: '6 * * * * * *'
+    hosts: ["redis-master.consumer01:6379"]
+
+  - type: http
+    id: consumer-simpl-stubs
+    name: Simpl-simpl-stubs
+    schedule: '7 * * * * * *'
+    hosts: ["http://simpl-stubs.consumer01:8080"]
+
+  - type: http
+    id: consumer-tls-gateway
+    name: Simpl-tls-gateway
+    schedule: '8 * * * * * *'
+    hosts: ["http://tls-gateway.consumer01:443"]
+
+  - type: http
+    id: consumer-users-roles
+    name: Simpl-users-roles
+    schedule: '9 * * * * * *'
+    hosts: ["http://users-roles.consumer01:8080"]

pipeline.variables.sh

-PROJECT_VERSION_NUMBER="0.1.12"
+PROJECT_VERSION_NUMBER="0.1.13"
 export LOGSTASH_HOSTS="\${LOGSTASH_HOSTS}"
 export ELASTIC_ELASTICSEARCH_ES_HOSTS="\${ELASTIC_ELASTICSEARCH_ES_HOSTS}"
 export LOGSTASH_USER="\${LOGSTASH_USER}"