From eb402aa29492690559a86b37944e5c587c9f6042 Mon Sep 17 00:00:00 2001
From: Sandeep Kumar Choudhary <sandeep@opencraft.com>
Date: Mon, 24 May 2021 14:59:44 +0530
Subject: [PATCH] [SE-4481]: Upload edx-services logs to s3 bucket  (#167)

This PR add the flags to sync the edx services logs to s3 bucket.
---
 playbooks/retire_host.yml                                 | 8 ++++++--
 .../templates/etc/logrotate.d/hourly/edx_logrotate.j2     | 6 ++++++
 playbooks/roles/common_vars/defaults/main.yml             | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/playbooks/retire_host.yml b/playbooks/retire_host.yml
index 32fddd184f1..19388cc0d59 100644
--- a/playbooks/retire_host.yml
+++ b/playbooks/retire_host.yml
@@ -37,8 +37,12 @@
         - "edx-services"
     # This catches the case where tracking.log is 0b
     - name: Sync again
-      command: /edx/bin/send-logs-to-object-store -d "{{ COMMON_LOG_DIR }}/tracking/" -b "{{ COMMON_OBJECT_STORE_LOG_SYNC_BUCKET }}/logs/tracking"
-    
+      command: "/edx/bin/send-logs-to-object-store -d {{ COMMON_LOG_DIR }}{{ item.src }} -b {{ COMMON_OBJECT_STORE_LOG_SYNC_BUCKET }} -p {{ item.dest }}"
+      with_items:
+        - { src: '/tracking/',  dest: '{{ COMMON_OBJECT_STORE_LOG_SYNC_PREFIX }}' }
+        - { src: '/lms/',  dest: '{{ COMMON_OBJECT_STORE_EDX_LOG_SYNC_PREFIX }}lms/' }
+        - { src: '/cms/',  dest: '{{ COMMON_OBJECT_STORE_EDX_LOG_SYNC_PREFIX }}cms/' }
+
 - name: Run minos verification
   hosts: "{{TARGET}}"
   become: True
diff --git a/playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate.j2 b/playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate.j2
index 29eebfe7cc2..c8528b25c7b 100644
--- a/playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate.j2
+++ b/playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate.j2
@@ -13,4 +13,10 @@
   postrotate
     /usr/bin/killall -HUP rsyslogd
   endscript
+  lastaction
+    {% if COMMON_OBJECT_STORE_EDX_LOG_SYNC -%}
+    {{ COMMON_OBJECT_STORE_LOG_SYNC_SCRIPT }} -d "{{ COMMON_LOG_DIR }}/lms" -b "{{ COMMON_OBJECT_STORE_LOG_SYNC_BUCKET }}" -p "{{ COMMON_OBJECT_STORE_EDX_LOG_SYNC_PREFIX }}lms/"
+    {{ COMMON_OBJECT_STORE_LOG_SYNC_SCRIPT }} -d "{{ COMMON_LOG_DIR }}/cms" -b "{{ COMMON_OBJECT_STORE_LOG_SYNC_BUCKET }}" -p "{{ COMMON_OBJECT_STORE_EDX_LOG_SYNC_PREFIX }}cms/"
+    {% endif -%}
+  endscript
 }
diff --git a/playbooks/roles/common_vars/defaults/main.yml b/playbooks/roles/common_vars/defaults/main.yml
index b2cc53d561b..6c69ee18487 100644
--- a/playbooks/roles/common_vars/defaults/main.yml
+++ b/playbooks/roles/common_vars/defaults/main.yml
@@ -23,6 +23,9 @@ COMMON_OBJECT_STORE_LOG_SYNC_PREFIX: "logs/tracking/"
 COMMON_OBJECT_STORE_LOG_SYNC_SCRIPT: "{{ COMMON_BIN_DIR }}/send-logs-to-object-store"
 COMMON_OBJECT_STORE_LOG_SYNC_ON_EXIT: "{{ COMMON_BIN_DIR }}/sync-logs-on-exit"
 
+COMMON_OBJECT_STORE_EDX_LOG_SYNC_PREFIX : "logs/edx/"
+COMMON_OBJECT_STORE_EDX_LOG_SYNC : False
+
 COMMON_BASE_DIR: /edx
 COMMON_DATA_DIR: "{{ COMMON_BASE_DIR}}/var"
 COMMON_APP_DIR: "{{ COMMON_BASE_DIR}}/app"