diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index fa13bdf..f154381 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -29,6 +29,7 @@
     docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
     docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
     docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:${_param:mcp_version}"
+    docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"
     docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus_relay:${_param:mcp_version}"
     docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:${_param:mcp_version}"
     docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:${_param:mcp_version}"
diff --git a/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
new file mode 100644
index 0000000..f960fdc
--- /dev/null
+++ b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
@@ -0,0 +1,52 @@
+classes:
+- system.prometheus.gainsight.elasticsearch_container
+parameters:
+  _param:
+    gainsight_elasticsearch_enabled: 'true'
+    gainsight_elasticsearch_csv_upload_url: 'http://localhost:9999'
+    gainsight_elasticsearch_account_id: 'default'
+    gainsight_elasticsearch_environment_id: 'default'
+    gainsight_elasticsearch_app_org_id: 'default'
+    gainsight_elasticsearch_access_key: 'default'
+    gainsight_elasticsearch_job_id: 'default'
+    gainsight_elasticsearch_login: 'default'
+    gainsight_elasticsearch_elasticsearch_vip: ${_param:stacklight_log_address}
+    gainsight_elasticsearch_config_directory: '/srv/gainsight'
+    gainsight_elasticsearch_crontab_directory: '/etc/cron.d'
+    gainsight_elasticsearch_config_path: "${_param:gainsight_elasticsearch_config_directory}/config.ini"
+  docker:
+    client:
+      stack:
+        monitoring:
+          network:
+            monitoring:
+              driver: overlay
+              driver_opts:
+                encrypted: 1
+          service:
+            gainsight_elasticsearch:
+              networks:
+                - monitoring
+              deploy:
+                replicas: 1
+                labels:
+                  com.mirantis.monitoring: "gainsight_elasticsearch"
+                restart_policy:
+                  condition: any
+              labels:
+                com.mirantis.monitoring: "gainsight_elasticsearch"
+              image: ${_param:docker_image_prometheus_gainsight_elasticsearch}
+              volumes:
+                - ${prometheus:gainsight_elasticsearch:dir:config}:${_param:gainsight_elasticsearch_config_directory}
+                - ${prometheus:gainsight_elasticsearch:dir:crontab}:${_param:gainsight_elasticsearch_crontab_directory}
+              environment:
+                CSV_UPLOAD_URL: "${_param:gainsight_elasticsearch_csv_upload_url}"
+                ACCOUNT_ID: "${_param:gainsight_elasticsearch_account_id}"
+                ENVIRONMENT_ID: "${_param:gainsight_elasticsearch_environment_id}"
+                APP_ORG_ID: "${_param:gainsight_elasticsearch_app_org_id}"
+                ACCESS_KEY: "${_param:gainsight_elasticsearch_access_key}"
+                JOB_ID: "${_param:gainsight_elasticsearch_job_id}"
+                LOGIN: "${_param:gainsight_elasticsearch_login}"
+                ELASTICSEARCH_HOST: "${_param:gainsight_elasticsearch_elasticsearch_vip}"
+                CONFIG_PATH: "${_param:gainsight_elasticsearch_config_path}"
+                ENABLED: "${_param:gainsight_elasticsearch_enabled}"
diff --git a/prometheus/gainsight/elasticsearch_container.yml b/prometheus/gainsight/elasticsearch_container.yml
new file mode 100644
index 0000000..8a10fbf
--- /dev/null
+++ b/prometheus/gainsight/elasticsearch_container.yml
@@ -0,0 +1,3 @@
+classes:
+- service.prometheus.gainsight.elasticsearch_container
+