commit 895c29b19304bf71dc6f626004ebdc7c5b824fc5
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 13 14:09:01 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Dec 13 14:09:01 2018 +0000
tree c9dacfcc4b35fdf18188f6cb9a4be37d1307c4ef
parent 82a469a20bf2e28b0a256fdcbb3dce520607d3e0
parent 871b2659755d71dfd2511316b59a73e010c98617

Merge "Added csv gainsight dir for persistent storage"

docker/swarm/stack/monitoring/gainsight.yml

diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 755fbf8..554c8ec 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -14,6 +14,7 @@
     gainsight_config_directory: '/srv/gainsight'
     gainsight_crontab_directory: '/etc/cron.d'
     gainsight_config_path: "${_param:gainsight_config_directory}/config.ini"
+    gainsight_csv_retention: 180
   docker:
     client:
       stack:
@@ -39,6 +40,7 @@
               volumes:
                 - ${prometheus:gainsight:dir:config}:${_param:gainsight_config_directory}
                 - ${prometheus:gainsight:dir:crontab}:${_param:gainsight_crontab_directory}
+                - ${prometheus:gainsight:dir:csv}:/opt/gainsight/csv
               environment:
                 CSV_UPLOAD_URL: "${_param:gainsight_csv_upload_url}"
                 ACCOUNT_ID: "${_param:gainsight_account_id}"
@@ -50,3 +52,4 @@
                 PROMETHEUS_URL: "${_param:gainsight_prometheus_url}"
                 CONFIG_PATH: "${_param:gainsight_config_path}"
                 ENABLED: "${_param:gainsight_enabled}"
+                RETENTION: ${_param:gainsight_csv_retention}

docker/swarm/stack/monitoring/gainsight_elasticsearch.yml

diff --git a/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
index f960fdc..d8649ed 100644
--- a/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
+++ b/docker/swarm/stack/monitoring/gainsight_elasticsearch.yml
@@ -14,6 +14,7 @@
     gainsight_elasticsearch_config_directory: '/srv/gainsight'
     gainsight_elasticsearch_crontab_directory: '/etc/cron.d'
     gainsight_elasticsearch_config_path: "${_param:gainsight_elasticsearch_config_directory}/config.ini"
+    gainsight_elasticsearch_csv_retention: 180
   docker:
     client:
       stack:
@@ -39,6 +40,7 @@
               volumes:
                 - ${prometheus:gainsight_elasticsearch:dir:config}:${_param:gainsight_elasticsearch_config_directory}
                 - ${prometheus:gainsight_elasticsearch:dir:crontab}:${_param:gainsight_elasticsearch_crontab_directory}
+                - ${prometheus:gainsight_elasticsearch:dir:csv}:/opt/gainsight/csv
               environment:
                 CSV_UPLOAD_URL: "${_param:gainsight_elasticsearch_csv_upload_url}"
                 ACCOUNT_ID: "${_param:gainsight_elasticsearch_account_id}"
@@ -50,3 +52,4 @@
                 ELASTICSEARCH_HOST: "${_param:gainsight_elasticsearch_elasticsearch_vip}"
                 CONFIG_PATH: "${_param:gainsight_elasticsearch_config_path}"
                 ENABLED: "${_param:gainsight_elasticsearch_enabled}"
+                RETENTION: ${_param:gainsight_elasticsearch_csv_retention}