diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index 4bb98f5..a7fb048 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -53,6 +53,7 @@
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.swarm.master
+          - cluster.${_param:cluster_name}.monitoring.client
           - cluster.${_param:cluster_name}.monitoring.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/client.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/client.yml
new file mode 100644
index 0000000..518a3da
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/client.yml
@@ -0,0 +1,16 @@
+classes:
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:docker_swarm_address}
+    # Grafana client parameters
+    grafana_address: ${_param:docker_swarm_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:docker_swarm_address}
+    grafana_prometheus_port: 15010