From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/9] 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/9] 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 c7f14d833ed15fa9d2ba8a56695c931b82abce89 Mon Sep 17 00:00:00 2001 From: anna-utm Date: Wed, 30 Jul 2025 19:49:17 -0400 Subject: [PATCH 3/9] Partially completed the assignement --- 02_activities/assignments/assignment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8af8dc092..8e76f163c 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,13 +28,17 @@ 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_directory # 4. In ./data/processed, create the following directories: 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 305ba98f1f677932e520cb66a750410b47799f98 Mon Sep 17 00:00:00 2001 From: anna-utm Date: Wed, 30 Jul 2025 19:56:25 -0400 Subject: [PATCH 4/9] Added mkdir command --- 02_activities/assignments/assignment.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8e76f163c..db7ba57b4 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,14 +31,11 @@ unzip -q rawdata.zip 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_directory # 4. In ./data/processed, create the following directories: 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 c0b22b0c4db94a40586524010250efc32c810c73 Mon Sep 17 00:00:00 2001 From: anna-utm Date: Thu, 31 Jul 2025 19:13:31 -0400 Subject: [PATCH 5/9] First Attempt to Complete the Assignment --- 02_activities/assignments/assignment.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index db7ba57b4..1528fdd48 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -29,21 +29,23 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data - # 2. Move the ./rawdata directory to ./data/raw - +mv -r ./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 - +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 - +cp *server*.log .data/raw .data/processed/server_logs # 6. Repeat the above step for user logs and event logs - +cp *user*.log .data/raw .data/processed/server_logs +cp *event*.log .data/raw .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 - +rm *ipaddr* ./data/raw +rm *ipaddr* ./data/processed/user_logs # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +ls ./data/processed/* > ./data/inventory.txt ########################################### From 98b47441def4d055ea39d442198a88f227fb653b Mon Sep 17 00:00:00 2001 From: anna-utm Date: Thu, 31 Jul 2025 22:07:42 -0400 Subject: [PATCH 6/9] completed the first part of the assignment --- 02_activities/assignments/assignment.sh | 29 ++++++++++++++++--------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 1528fdd48..9ede1cade 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -29,23 +29,32 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data + # 2. Move the ./rawdata directory to ./data/raw -mv -r ./rawdata .data/raw +mkdir -p ./data/raw +mv ./rawdata ./data/raw/ + + # 3. List the contents of the ./data/raw directory -ls .data/raw +ls data/raw + # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs -cd ./data/processed -mkdir server_logs user_logs event_logs +mkdir -p data/processed/server_logs data/processed/user_logs 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 -cp *server*.log .data/raw .data/processed/server_logs +cp ./data/raw/rawdata/*server*.log ./data/processed/server_logs/ + + # 6. Repeat the above step for user logs and event logs -cp *user*.log .data/raw .data/processed/server_logs -cp *event*.log .data/raw .data/processed/server_logs +cp ./data/raw/rawdata/*user*.log ./data/processed/user_logs/ +cp ./data/raw/rawdata/*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 *ipaddr* ./data/raw -rm *ipaddr* ./data/processed/user_logs +rm ./data/raw/rawdata/*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 -ls ./data/processed/* > ./data/inventory.txt +ls -r ./data/processed/*/* > ./data/inventory.txt ########################################### From b91596e042f92cdee7247432a1bf67052811638a Mon Sep 17 00:00:00 2001 From: anna-utm Date: Fri, 1 Aug 2025 11:32:55 -0400 Subject: [PATCH 7/9] made changes to to Q 2, 5, 6, 7 --- 02_activities/assignments/assignment.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index af7e97400..f5303f2ec 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -33,7 +33,7 @@ mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir -p ./data/raw -mv ./rawdata ./data/raw/ +mv ./rawdata/* ./data/raw/ # 3. List the contents of the ./data/raw directory @@ -43,20 +43,16 @@ ls data/raw mkdir -p data/processed/server_logs data/processed/user_logs 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 -cp ./data/raw/rawdata/*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/rawdata/*user*.log ./data/processed/user_logs/ -cp ./data/raw/rawdata/*event*.log ./data/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 -<<<<<<< HEAD -rm ./data/raw/rawdata/*ipaddr* +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 ls -r ./data/processed/*/* > ./data/inventory.txt From ac06c073e0c60966685c90e1ec776a481025904e Mon Sep 17 00:00:00 2001 From: anna-utm Date: Fri, 1 Aug 2025 11:43:25 -0400 Subject: [PATCH 8/9] Made additional changes to Q2 --- 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 f5303f2ec..2179b53b3 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -34,7 +34,7 @@ mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir -p ./data/raw mv ./rawdata/* ./data/raw/ - +mv ./rawdata .data/raw # 3. List the contents of the ./data/raw directory ls data/raw From 2d0273a94294588964f75c820063351ac1098f92 Mon Sep 17 00:00:00 2001 From: anna-utm Date: Fri, 1 Aug 2025 12:03:54 -0400 Subject: [PATCH 9/9] Final changes to Q2 --- 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 2179b53b3..607811c2c 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -32,9 +32,8 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw -mkdir -p ./data/raw -mv ./rawdata/* ./data/raw/ -mv ./rawdata .data/raw +#mkdir -p ./data/raw +mv ./rawdata/ ./data/raw # 3. List the contents of the ./data/raw directory ls data/raw