Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.

[SE-4481] Feature to upload edX service logs #6418

Merged
jdmulloy merged 7 commits into from
Jun 29, 2021
Merged

[SE-4481] Feature to upload edX service logs #6418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c39d741
add feature of uploading edx services log to s3 bucket
May 24, 2021
d8f4569
add edx services own flag to upload logs
May 31, 2021
2c46fee
rename flag to more appropriate name
Jun 3, 2021
88ca71b
fix the edx serverices log folder
Jun 3, 2021
e35e823
handle the case where file name same in both the services
Jun 3, 2021
7b2c1c8
add commands to sync the edx services logs
Jun 3, 2021
1d6bf90
compress the command with items
Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions playbooks/retire_host.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
Skchoudhary marked this conversation as resolved.

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/' }

Comment thread
Skchoudhary marked this conversation as resolved.
- name: Run minos verification
hosts: "{{TARGET}}"
become: True
Expand Down
6 changes: 6 additions & 0 deletions playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Comment thread
Skchoudhary marked this conversation as resolved.
{{ 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
}
3 changes: 3 additions & 0 deletions playbooks/roles/common_vars/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down