Merge pull request #2224 from edx/max/readd-reverts

Max/readd reverts

playbooks/edx-east/mongo_3_0.yml

@@ -6,6 +6,7 @@
     serial_count: 3
   serial: "{{ serial_count }}"
   roles:
+    - aws
     - mongo_3_0
     - role: datadog
       when: COMMON_ENABLE_DATADOG

playbooks/roles/mongo_3_0/defaults/main.yml

@@ -73,3 +73,4 @@ MONGO_S3_S3CMD_CONFIG: "{{ COMMON_DATA_DIR }}/mongo-s3-backup.s3cfg"
 MONGO_S3_BACKUP_AWS_ACCESS_KEY: !!null
 MONGO_S3_BACKUP_AWS_SECRET_KEY: !!null
 
+MONGO_LOG_MONGOSTAT: true

playbooks/roles/mongo_3_0/tasks/main.yml

@@ -57,6 +57,22 @@
     - "{{ mongo_log_dir }}"
     - "{{ mongo_journal_dir }}"
 
+- name: add mongostat logging script
+  template:
+    src="log-mongostat.sh.j2"
+    dest="{{ COMMON_BIN_DIR }}/log-mongostat.sh"
+    owner="{{ mongo_user }}"
+    group="{{ mongo_user }}"
+    mode=0700
+  when: MONGO_LOG_MONGOSTAT
+
+- name: add mongostat logging script to cron
+  cron:
+    name: "mongostat logging job"
+    job: /edx/bin/log-mongostat.sh >{{ mongo_log_dir }}/mongostat.log 2>&1
+  become: yes
+  when: MONGO_LOG_MONGOSTAT
+
 - name: stop mongod service
   service: name=mongod state=stopped
 

playbooks/roles/mongo_3_0/templates/log-mongostat.sh.j2

+/usr/bin/mongostat -u {{ MONGO_ADMIN_USER }} --authenticationDatabase admin -p '{{ MONGO_ADMIN_PASSWORD }}' --all -n 1 --json