diff --git a/elk_metrics_6x/templates/heartbeat.yml.j2 b/elk_metrics_6x/templates/heartbeat.yml.j2
index 88ced69b..0973b06d 100644
--- a/elk_metrics_6x/templates/heartbeat.yml.j2
+++ b/elk_metrics_6x/templates/heartbeat.yml.j2
@@ -74,6 +74,7 @@ heartbeat.monitors:
 {%           set _ = hosts.extend([backend_host + ":" + (port | string)]) %}
 {%         endfor %}
 {%       endfor %}
+{%       if hosts | length > 0 %}
 - type: tcp # monitor type `tcp`. Connect via TCP and optionally verify endpoint
             # by sending/receiving a custom payload
 
@@ -146,6 +147,7 @@ heartbeat.monitors:
 
     # Required TLS protocols
     #supported_protocols: ["TLSv1.0", "TLSv1.1", "TLSv1.2"]
+{%       endif %}
 {%     elif item.type == 'http' %}
 {%       set hosts = [] %}
 {%       for port in item.ports | default([])  %}
@@ -154,6 +156,7 @@ heartbeat.monitors:
 {%           set _ = hosts.extend(["http://" + backend_host + ":" + (port | string) + item.path]) %}
 {%         endfor %}
 {%       endfor %}
+{%       if hosts | length > 0 %}
 - type: http # monitor type `http`. Connect via HTTP an optionally verify response
 
   # Monitor name used for job name and document type
@@ -224,6 +227,7 @@ heartbeat.monitors:
 
     # Required response contents.
     #body:
+{%       endif %}
 {%     endif %}
 {%   endif %}
 {% endfor %}
diff --git a/elk_metrics_6x/vars/variables.yml b/elk_metrics_6x/vars/variables.yml
index e07ada59..a81b385b 100644
--- a/elk_metrics_6x/vars/variables.yml
+++ b/elk_metrics_6x/vars/variables.yml
@@ -24,14 +24,14 @@ heartbeat_services:
     name: galera HTTP
     ports:
       - 9200
-    type: tcp
+    type: http
+    method: HEAD
+    path: "/"
   - group: "{{ groups['galera_all'] }}"
     name: galera TCP
     ports:
       - 3306
-    type: http
-    method: HEAD
-    path: "/"
+    type: tcp
   - group: "{{ groups['repo_all'] }}"
     name: repo git
     ports:
@@ -44,17 +44,10 @@ heartbeat_services:
     type: http
     method: HEAD
     path: "/"
-  - group: "{{ groups['repo_all'] }}"
-    name: repo cache
-    ports:
-      - 3142
-    type: http
-    method: HEAD
-    path: "/"
   - group: "{{ groups['repo_all'] }}"
     name: repo acng
     ports:
-      - 80
+      - 3142
     type: http
     method: HEAD
     path: "/acng-report.html"
@@ -135,9 +128,7 @@ heartbeat_services:
       - 6080
       - 6082
       - 6083
-    type: http
-    method: HEAD
-    path: "/"
+    type: tcp
   - group: "{{ groups['cinder_api'] }}"
     name: cinder api
     ports:
@@ -185,7 +176,6 @@ heartbeat_services:
     name: rabbitmq management
     ports:
       - 15672
-      - 15671
     type: http
     method: HEAD
     path: "/"
@@ -311,6 +301,21 @@ grafana_datasources:
       maxConcurrentShardRequests: 256
       timeField: "@timestamp"
       timeInterval: ">10s"
+  - name: "heartbeat-Elasticsearch"
+    type: "elasticsearch"
+    access: "proxy"
+    url: "http://{{ internal_lb_vip_address | default(hostvars[groups['elastic-logstash'][0]]['ansible_host']) }}:{{ elastic_hap_port }}"
+    basicAuth: false
+    basicAuthUser: ""
+    basicAuthPassword: ""
+    isDefault: false
+    database: "heartbeat-*"
+    jsonData:
+      esVersion: 56
+      keepCookies: []
+      maxConcurrentShardRequests: 256
+      timeField: "@timestamp"
+      timeInterval: ">10s"
   - name: "metricbeat-Elasticsearch"
     type: "elasticsearch"
     access: "proxy"