From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/6] 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/6] 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 903beedbc32eccddab12f9d34c9c8807b2b26162 Mon Sep 17 00:00:00 2001 From: Catalina Barboza Solis Date: Mon, 9 Feb 2026 13:26:36 -0700 Subject: [PATCH 3/6] First assignment --- 02_activities/assignments/assignment.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 4b2baa7ae..8c0a9b124 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,21 +28,27 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data +mkdir data # 2. Move the ./rawdata directory to ./data/raw - +mv ./rawdata ./data/raw # 3. List the contents of the ./data/raw directory +ls ./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 +cp ./data/raw/*server*.log ./data/processed/server_logs # 6. Repeat the above step for user logs and event logs +cp ./data/raw/*user*.log ./data/processed/server_logs +cp ./data/raw/*event*.log ./data/processed/server_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 -type f -name "*ipaddr*" -delete # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +find ./data/processed -type f | sort > ./data/inventory.txt ########################################### From bf38e822dc3c99ae2a407c5ed6318d2be1003c52 Mon Sep 17 00:00:00 2001 From: Catalina Barboza Solis Date: Mon, 9 Feb 2026 13:32:05 -0700 Subject: [PATCH 4/6] Try 1 --- 02_activities/assignments/assignment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8c0a9b124..6d2a756c2 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -39,11 +39,11 @@ ls ./data/raw 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 -cp ./data/raw/*server*.log ./data/processed/server_logs +cp ./data/raw/*server*.log ./data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs -cp ./data/raw/*user*.log ./data/processed/server_logs -cp ./data/raw/*event*.log ./data/processed/server_logs +cp ./data/raw/*user*.log ./data/processed/user_logs/ +cp ./data/raw/*event*.log ./data/processed/events_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 -type f -name "*ipaddr*" -delete From 6699a0162375d98c9625980b68c2e1a977e9ebb7 Mon Sep 17 00:00:00 2001 From: Catalina Barboza Solis Date: Mon, 9 Feb 2026 13:39:10 -0700 Subject: [PATCH 5/6] Try 2 --- 02_activities/assignments/assignment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 6d2a756c2..867142a60 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -43,7 +43,7 @@ cp ./data/raw/*server*.log ./data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs cp ./data/raw/*user*.log ./data/processed/user_logs/ -cp ./data/raw/*event*.log ./data/processed/events_logs/ +cp ./data/raw/*event*.log ./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 -type f -name "*ipaddr*" -delete From 6860f7d92cb8423ac941935f3d91fd288f1c9b87 Mon Sep 17 00:00:00 2001 From: Catalina Barboza Solis Date: Mon, 9 Feb 2026 14:13:01 -0700 Subject: [PATCH 6/6] Try3 --- 02_activities/assignments/assignment.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 00ff90ecc..89ade3976 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -47,12 +47,8 @@ cp ./data/raw/*user*.log ./data/processed/user_logs/ cp ./data/raw/*event*.log ./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 find ./data/raw ./data/processed/user_logs -type f -name "*ipaddr*" -delete -======= -rf -rf ./data ->>>>>>> ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed find ./data/processed -type f | sort > ./data/inventory.txt