From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 01/15] 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 02/15] 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 d09e09e6ab9204bf2431b03ca82aa2ff66300a71 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Fri, 6 Mar 2026 14:33:42 -0500 Subject: [PATCH 03/15] First question response --- 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 4b48cec8b..de5e5873b 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,7 +28,7 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data - +mkdir data # 2. Move the ./rawdata directory to ./data/raw (eg. move it into ./data and rename it to raw) # 3. List the contents of the ./data/raw directory From 209b6adc140c1eef04beb45aa4cfe7da1cb5e4fc Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Fri, 6 Mar 2026 15:26:11 -0500 Subject: [PATCH 04/15] The first 3 questions actually done --- 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 de5e5873b..0367d78fd 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -30,12 +30,12 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data # 2. Move the ./rawdata directory to ./data/raw (eg. move it into ./data and rename it to raw) - +mv rawdata data # 3. List the contents of the ./data/raw directory - +ls ./data/rawdata # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and 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 # 6. Repeat the above step for user logs and event logs From 31b5c810b5e40632924b725f60e4fb79c03b4817 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 15:45:39 -0500 Subject: [PATCH 05/15] The first 4 questions done --- 02_activities/assignments/assignment.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 0367d78fd..4998e258d 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,11 +31,15 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw (eg. move it into ./data and rename it to raw) mv rawdata data +mv rawdata raw # 3. List the contents of the ./data/raw directory -ls ./data/rawdata +ls ./data/raw # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs - +cd data +mkdir processed +cd ./data/processed +mkdir 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 # 6. Repeat the above step for user logs and event logs From 4850e881098890af79db93bdef3228cc492f230c Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 15:56:28 -0500 Subject: [PATCH 06/15] second and fourth answers changed --- 02_activities/assignments/assignment.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 4998e258d..5eec6c6c7 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -30,15 +30,14 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data # 2. Move the ./rawdata directory to ./data/raw (eg. move it into ./data and rename it to raw) -mv rawdata data -mv rawdata raw +mv rawdata data/raw # 3. List the contents of the ./data/raw directory ls ./data/raw # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs cd data mkdir processed -cd ./data/processed +cd processed mkdir 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 From 1520e560ec6a8e85fe675f795bb797a24ad0adfa Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:13:39 -0500 Subject: [PATCH 07/15] question 5 finished --- 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 5eec6c6c7..f5ca8318e 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -40,7 +40,7 @@ mkdir processed cd processed mkdir 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 # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs From 892340f79f57e07ae505e10399f5696314ce0faf Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:17:20 -0500 Subject: [PATCH 08/15] question 5 done again --- 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 f5ca8318e..8c6763eba 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -40,7 +40,7 @@ mkdir processed cd processed mkdir 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 # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs From 49e34892fc48f966bc705b8c72103c06bcde1d20 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:22:59 -0500 Subject: [PATCH 09/15] another change of q5 --- 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 8c6763eba..fd767163f 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -40,7 +40,7 @@ mkdir processed cd processed mkdir 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 # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs From 271815ddc772e2d398240c6213b5ccae79a8bd30 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:24:36 -0500 Subject: [PATCH 10/15] another another change of q5 --- 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 fd767163f..a7436b09d 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -40,7 +40,7 @@ mkdir processed cd processed mkdir 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 # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs From 1ae8b58b46fe744e92aa6ff9455d58f8d9cc948b Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:49:07 -0500 Subject: [PATCH 11/15] 6th question --- 02_activities/assignments/assignment.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index a7436b09d..fe7a58e85 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -40,9 +40,12 @@ mkdir processed cd processed mkdir 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/ +cd data +cp raw/*server*.log processed/server_logs/ # 6. Repeat the above step for user logs and event logs - +cd data +cp raw/*user*.log processed/user_logs/ +cp raw/*event*.log 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 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed From ee110eabd02d8a1f6c1863befbadb5e3b66dda78 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 16:58:27 -0500 Subject: [PATCH 12/15] 6 questions done --- 02_activities/assignments/assignment.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index fe7a58e85..5bf03e6e0 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -35,17 +35,15 @@ mv rawdata data/raw ls ./data/raw # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs -cd data -mkdir processed -cd processed -mkdir server_logs user_logs event_logs +mkdir data/processed +mkdir data/processed/server_logs +mkdir data/processed/user_logs +mkdir data/processed/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 -cd data -cp raw/*server*.log processed/server_logs/ +cp ./data/raw/*server*.log ./data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs -cd data -cp raw/*user*.log processed/user_logs/ -cp raw/*event*.log processed/event_logs/ +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 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed From f7789a813558cdd37b4b3194b4aa0297cc7f6150 Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 17:25:37 -0500 Subject: [PATCH 13/15] all done --- 02_activities/assignments/assignment.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 5bf03e6e0..c3775d5a7 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -45,9 +45,10 @@ cp ./data/raw/*server*.log ./data/processed/server_logs/ 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 - +rm ./data/raw/*ipaddr* +rm ./data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +touch ./data/inventory.txt ########################################### From 0698b5a18846e0964e0f87af759a0899a5d2869d Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 17:48:58 -0500 Subject: [PATCH 14/15] q8 done --- 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 c3775d5a7..1ab386d7c 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -49,6 +49,7 @@ rm ./data/raw/*ipaddr* rm ./data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed touch ./data/inventory.txt +ls -R ./data/processed > ./data/inventory.txt ########################################### From 98ec19cb564130e99ab13cfb001dd069d99e2ccd Mon Sep 17 00:00:00 2001 From: Silvia Margarian Date: Sat, 7 Mar 2026 19:27:01 -0500 Subject: [PATCH 15/15] resolved --- 02_activities/assignments/assignment.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index ab84d4d08..93791e2e9 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -46,13 +46,8 @@ cp ./data/raw/*server*.log ./data/processed/server_logs/ 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 rm ./data/raw/*ipaddr* rm ./data/processed/user_logs/*ipaddr* -======= -rf -rf ./data - ->>>>>>> ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed touch ./data/inventory.txt ls -R ./data/processed > ./data/inventory.txt