bug fixes relate to re-location to /edx

playbooks/edx-east/elasticsearch.yml

-- hosts: tag_play_elasticsearch:&tag_environment_stage:&tag_deployment_edx
+- hosts: tag_play_commoncluster:&tag_environment_stage:&tag_deployment_edx
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/common/common.yml"

playbooks/roles/elasticsearch/tasks/main.yml

@@ -63,6 +63,12 @@
     src=edx/etc/elasticsearch/elasticsearch.yml.j2 dest={{ elasticsearch_cfg_dir }}/elasticsearch.yml
     mode=0744
   when: ELASTICSEARCH_CLUSTERED
+
+- name: drop the elasticsearch logging config
+  template: >
+    src=edx/etc/elasticsearch/logging.yml.j2 dest={{ elasticsearch_cfg_dir }}/logging.yml
+    mode=0744
+  when: ELASTICSEARCH_CLUSTERED  
     
 - name: Ensure elasticsearch is enabled and started
   service: name=elasticsearch state=restarted enabled=yes
\ No newline at end of file

playbooks/roles/elasticsearch/templates/edx/etc/elasticsearch/logging.yml.j2

+# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
+es.logger.level: INFO
+rootLogger: ${es.logger.level}, console, file
+logger:
+  # log action execution errors for easier debugging
+  action: DEBUG
+  # reduce the logging for aws, too much is logged under the default INFO
+  com.amazonaws: WARN
+
+  # gateway
+  #gateway: DEBUG
+  #index.gateway: DEBUG
+
+  # peer shard recovery
+  #indices.recovery: DEBUG
+
+  # discovery
+  #discovery: TRACE
+
+  index.search.slowlog: TRACE, index_search_slow_log_file
+  index.indexing.slowlog: TRACE, index_indexing_slow_log_file
+
+additivity:
+  index.search.slowlog: false
+  index.indexing.slowlog: false
+
+appender:
+  console:
+    type: console
+    layout:
+      type: consolePattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  index_search_slow_log_file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}_index_search_slowlog.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+  index_indexing_slow_log_file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}_index_indexing_slowlog.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
\ No newline at end of file

playbooks/roles/elasticsearch/templates/etc/default/elasticsearch.j2

@@ -35,7 +35,7 @@ DATA_DIR={{ COMMON_DATA_DIR }}
 CONF_DIR={{ elasticsearch_cfg_dir }}
 
 # ElasticSearch configuration file (elasticsearch.yml)
-# CONF_FILE=/etc/elasticsearch/elasticsearch.yml
+CONF_FILE=${CONF_DIR}/elasticsearch.yml
 
 # Additional Java OPTS
 #ES_JAVA_OPTS=