Skip to content

Commit

Permalink
chore: analytics secure calls
Browse files Browse the repository at this point in the history
JIRA:CLOUDSEC-12
  • Loading branch information
katebygrace committed Nov 29, 2023
1 parent 3fe2ec5 commit 1088d81
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 5 deletions.
49 changes: 49 additions & 0 deletions dataeng/analytics_exporter/course_exporter.yaml
@@ -0,0 +1,49 @@
defaults:
auth_file: '{WORKSPACE}/analytics-secure/analytics-exporter/task-auth.json'
work_dir: /var/lib/jenkins/tmp/analytics-course-exporter
external_prefix: ''
output_bucket: edx-analytics-rdx
pipeline_bucket: edx-analytics-export
output_prefix: 'course_exports/raw/'
django_admin: ''
django_pythonpath: ''
django_settings: lms.envs.analytics_exporter
django_cms_settings: cms.envs.analytics_exporter
django_database: read_replica
mongo_collection: contents
sql_user: analytics001
sql_db: wwc
monitor: true

environments:
prod:
lms_config: ${WORKSPACE}/remote-config/prod-edx/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edx/studio.yml
mongo_host: prod-edx-mongo-1.edx.org:27017,prod-edx-mongo-2.edx.org:27017,prod-edx-mongo-3.edx.org:27017,prod-edx-mongo-4.edx.org:27017
mongo_db: comments-prod
name: prod-analytics
sql_host: prod-edx-edxapp-readonly.rds.edx.org
edge:
lms_config: ${WORKSPACE}/remote-config/prod-edge/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edge/studio.yml
mongo_host: prod-edge-mongo-1.edx.org:27017,prod-edge-mongo-2.edx.org:27017,prod-edge-mongo-3.edx.org:27017,prod-edge-mongo-4.edx.org:27017
mongo_db: comments-edge
name: prod-edge-analytics
sql_host: prod-edge-edxapp-readonly.rds.edx.org

tasks:
- StudentModuleTask
- TeamsTask
- TeamsMembershipTask
- CourseEnrollmentTask
- GeneratedCertificateTask
- InCourseReverificationTask
- AuthUserTask
- AuthUserProfileTask
- StudentLanguageProficiencyTask
- WikiArticleTask
- WikiArticleRevisionTask
- UserCourseTagTask
- ForumsTask
- CourseStructureTask
- CourseContentTask
50 changes: 50 additions & 0 deletions dataeng/analytics_exporter/default.yaml
@@ -0,0 +1,50 @@
# Configuration for exporting data for all orgs from Jenkins.
# This config makes some assumptions that are only valid for
# Jenkins-managed shiningpanda virtual environments.
#
# As part of the job, a symlink is created to the django-admin.py
# executable in the virtual environment workspace, which is subject to
# change. To fix this, we use the variable ${WORKSPACE} that is
# overridden in the Jenkins shell task with the appropiate value.

defaults:
auth_file: '{WORKSPACE}/analytics-secure/analytics-exporter/task-auth.json'
gpg_master_key: analytics@edx.org
gpg_keys: gpg-keys
work_dir: /var/lib/jenkins/tmp/analytics-exporter
external_prefix: ''
output_bucket: course-data
pipeline_bucket: edx-analytics-export
output_prefix: ''
se_bucket: edx-analytics-stackexchange
django_admin: ''
django_pythonpath: ''
django_settings: lms.envs.analytics_exporter
django_cms_settings: cms.envs.analytics_exporter
django_database: read_replica
mongo_collection: contents
sql_user: analytics001
sql_db: wwc
monitor: true
graphite_host: graphite.analytics.edx.org
graphite_port: 2003
graphite_prefix: edx.analytics.research
# Config to limit how many years of data the analytics exporter job dumps.
# This is the number of years in the past from today's date
time_constraint: 3

environments:
prod:
lms_config: ${WORKSPACE}/remote-config/prod-edx/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edx/studio.yml
mongo_host: prod-edx-mongo-1.edx.org:27017,prod-edx-mongo-2.edx.org:27017,prod-edx-mongo-3.edx.org:27017,prod-edx-mongo-4.edx.org:27017
mongo_db: comments-prod
name: prod-analytics
sql_host: prod-edx-edxapp-readonly.rds.edx.org
edge:
lms_config: ${WORKSPACE}/remote-config/prod-edge/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edge/studio.yml
mongo_host: prod-edge-mongo-1.edx.org:27017,prod-edge-mongo-2.edx.org:27017,prod-edge-mongo-3.edx.org:27017,prod-edge-mongo-4.edx.org:27017
mongo_db: comments-edge
name: prod-edge-analytics
sql_host: prod-edge-edxapp-readonly.rds.edx.org
35 changes: 35 additions & 0 deletions dataeng/analytics_exporter/email_optin.yaml
@@ -0,0 +1,35 @@
defaults:
auth_file: '{WORKSPACE}/analytics-secure/analytics-exporter/task-auth.json'
gpg_master_key: analytics@edx.org
gpg_keys: gpg-keys
work_dir: /var/lib/jenkins/tmp/analytics-exporter
external_prefix: ''
output_bucket: course-data
pipeline_bucket: edx-analytics-export
output_prefix: ''
se_bucket: edx-analytics-stackexchange
django_admin: ''
django_pythonpath: ''
django_settings: lms.envs.analytics_exporter
django_cms_settings: cms.envs.analytics_exporter
django_database: read_replica
mongo_collection: contents
sql_user: analytics001
sql_db: wwc
monitor: true

environments:
prod:
lms_config: ${WORKSPACE}/remote-config/prod-edx/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edx/studio.yml
mongo_host: prod-edx-mongo-1.edx.org:27017,prod-edx-mongo-2.edx.org:27017,prod-edx-mongo-3.edx.org:27017,prod-edx-mongo-4.edx.org:27017
mongo_db: comments-prod
name: prod-analytics
sql_host: prod-edx-edxapp-readonly.rds.edx.org
edge:
lms_config: ${WORKSPACE}/remote-config/prod-edge/lms.yml
studio_config: ${WORKSPACE}/remote-config/prod-edge/studio.yml
mongo_host: prod-edge-mongo-1.edx.org:27017,prod-edge-mongo-2.edx.org:27017,prod-edge-mongo-3.edx.org:27017,prod-edge-mongo-4.edx.org:27017
mongo_db: comments-edge
name: prod-edge-analytics
sql_host: prod-edge-edxapp-readonly.rds.edx.org
2 changes: 1 addition & 1 deletion dataeng/resources/event-export-incremental.sh
Expand Up @@ -3,7 +3,7 @@
####################################################################
# Exporter configuration

ROOT=${WORKSPACE}/analytics-secure/analytics-exporter
ROOT=${WORKSPACE}/dataeng/analytics-exporter
SECURE_HASH=`GIT_DIR=./analytics-secure/.git git rev-parse HEAD`
EXPORTER_CONFIG_BUCKET=s3://edx-analytics-scratch/exporter/config/$SECURE_HASH
EXPORTER_CONFIG_PATH=${EXPORTER_CONFIG_BUCKET}/${EXPORTER_CONFIG}
Expand Down
2 changes: 1 addition & 1 deletion dataeng/resources/run-course-exporter.sh
Expand Up @@ -21,7 +21,7 @@ popd
source platform_venv_path

# Configuration paths in analytics-secure
SECURE_ROOT=${WORKSPACE}/analytics-secure/analytics-exporter
SECURE_ROOT=${WORKSPACE}/dataeng/analytics-exporter
CONFIG_PATH=${SECURE_ROOT}/${EXPORTER_CONFIG_FILENAME}

DATE=$(date +%d ${DATE_MODIFIER})
Expand Down
2 changes: 1 addition & 1 deletion dataeng/resources/run-pipeline-acceptance-test.sh
Expand Up @@ -26,7 +26,7 @@ export COURSE_EXPORTER=$EXPORTER_BIN/course-exporter

# Exporter configuration destination

ROOT=${WORKSPACE}/analytics-secure/analytics-exporter
ROOT=${WORKSPACE}/dataeng/analytics-exporter
SECURE_HASH=`GIT_DIR=./analytics-secure/.git git rev-parse HEAD`
EXPORTER_CONFIG_BUCKET=$EXPORTER_BUCKET_PATH/$SECURE_HASH
EXPORTER_CONFIG_PATH=${EXPORTER_CONFIG_BUCKET}/${EXPORTER_CONFIG}
Expand Down
2 changes: 1 addition & 1 deletion dataeng/resources/setup-exporter-email-optin.sh
Expand Up @@ -17,7 +17,7 @@ pip install mysql-connector-python -e .
popd

# Configuration paths in analytics-secure
SECURE_ROOT=${WORKSPACE}/analytics-secure/analytics-exporter
SECURE_ROOT=${WORKSPACE}/dataeng/analytics-exporter
CONFIG_PATH=${SECURE_ROOT}/${EXPORTER_CONFIG_FILENAME}
GPG_KEYS_PATH=${WORKSPACE}/data-czar-keys

Expand Down
2 changes: 1 addition & 1 deletion dataeng/resources/setup-exporter.sh
Expand Up @@ -23,7 +23,7 @@ pip install mysql-connector-python -e .
popd

# Configuration paths in analytics-secure
SECURE_ROOT=${WORKSPACE}/analytics-secure/analytics-exporter
SECURE_ROOT=${WORKSPACE}/dataeng/analytics-exporter
CONFIG_PATH=${SECURE_ROOT}/${EXPORTER_CONFIG_FILENAME}
GPG_KEYS_PATH=${WORKSPACE}/data-czar-keys

Expand Down

0 comments on commit 1088d81

Please sign in to comment.