From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/4] delete ip logs... WARNING UNTESTED! --- 02_activities/assignments/assignment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index d81e9a77b..001291867 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -33,6 +33,7 @@ unzip rawdata.zip # 6. Repeat the above step for user logs and event logs # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs +rf -rf ./data # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed From ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:55:44 -0500 Subject: [PATCH 2/4] initialize README file with company name --- 02_activities/assignments/assignment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 001291867..f2bfd22bd 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -11,6 +11,7 @@ set -x mkdir analysis output touch README.md +echo "# Project Name: DSI Consulting Inc." > README.md touch analysis/main.py # download client data From 69ff69cd7a34ebac58ef2cf6a43abc1c7fecfe1c Mon Sep 17 00:00:00 2001 From: Monika Kataria Date: Sun, 12 Oct 2025 01:01:27 -0400 Subject: [PATCH 3/4] Complete Part 1: data ingest script (moves/copies/deletes + inventory) --- 02_activities/assignments/assignment.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8af8dc092..6384eeee4 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,21 +28,30 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data +mkdir -p data # 2. Move the ./rawdata directory to ./data/raw +mv rawdata data/raw # 3. List the contents of the ./data/raw directory +echo "Contents of ./data/raw:" +ls -la data/raw # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs +mkdir -p data/processed/{server_logs,user_logs,event_logs} # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs +find data/raw -maxdepth 1 -type f -name '*server*.log' -print -exec cp {} data/processed/server_logs/ \; # 6. Repeat the above step for user logs and event logs +find data/raw -maxdepth 1 -type f -name '*user*.log' -print -exec cp {} data/processed/user_logs/ \; +find data/raw -maxdepth 1 -type f -name '*event*.log' -print -exec cp {} data/processed/event_logs/ \; # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs +find data/raw data/processed/user_logs -maxdepth 1 -type f -name '*ipaddr*' -print -delete # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +find data/processed -mindepth 2 -type f | sort > data/inventory.txt ########################################### From 211c5a58368a827794f33ccb91c0a52bf4f365a3 Mon Sep 17 00:00:00 2001 From: Monika Kataria Date: Sun, 12 Oct 2025 01:37:42 -0400 Subject: [PATCH 4/4] Fix: write inventory.txt; ensure privacy delete --- 02_activities/assignments/assignment.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 01ea15c78..d4b785d8a 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -38,23 +38,20 @@ mv rawdata data/raw echo "Contents of ./data/raw:" ls -la data/raw -# 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs +# 4. In ./data/processed, create: server_logs, user_logs, event_logs mkdir -p data/processed/{server_logs,user_logs,event_logs} -# 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs +# 5. Copy all server log files ("server" in name AND .log) find data/raw -maxdepth 1 -type f -name '*server*.log' -print -exec cp {} data/processed/server_logs/ \; -# 6. Repeat the above step for user logs and event logs +# 6. Copy all user and event logs find data/raw -maxdepth 1 -type f -name '*user*.log' -print -exec cp {} data/processed/user_logs/ \; find data/raw -maxdepth 1 -type f -name '*event*.log' -print -exec cp {} data/processed/event_logs/ \; -# 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs -HEAD +# 7. For privacy, remove files containing "ipaddr" from raw and user_logs find data/raw data/processed/user_logs -maxdepth 1 -type f -name '*ipaddr*' -print -delete -rf -rf ./data -ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 -# 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed +# 8. Create ./data/inventory.txt listing files inside subfolders of processed find data/processed -mindepth 2 -type f | sort > data/inventory.txt ###########################################