From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 01/11] 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/11] 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 7dbf0e13a408d508d4a52619ed838e4052ffeb45 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Thu, 6 Nov 2025 18:41:12 -0500 Subject: [PATCH 03/11] Attempted question 1 of the assignment --- 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 4b2baa7ae..810214873 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,6 +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 From cbd8a07b79f7da4cd535bb7aa5b032bd8c8f0d19 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Thu, 6 Nov 2025 19:22:59 -0500 Subject: [PATCH 04/11] Part 2 of the assignment --- 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 810214873..747682f4c 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 # 3. List the contents of the ./data/raw directory - +ls # 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 From 51fb5973dc603e5473745f27311269b334e09d69 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sat, 8 Nov 2025 16:02:09 -0500 Subject: [PATCH 05/11] Attempted all parts of the assignment --- 02_activities/assignments/assignment.sh | 25 ++++++++++++++++++------- 02_activities/inventory.txt | 0 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 02_activities/inventory.txt diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 747682f4c..c16d45a03 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,19 +31,30 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw - +cp ./rawdata/* ./data/raw # 3. List the contents of the ./data/raw directory -ls +cd ./data/raw +ls # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs - +cd .. +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 - +cd.. +cp *server*.log ./data/processed/server_logs # 6. Repeat the above step for user logs and event logs - +cp *user*.log ./data/processed/user_logs +cp *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 - +cd ./data/raw +rm *ipaddr* +cd ./data/processed/user_logs +rm *ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +cd ../ +touch ./data/inventory.txt +find ./data/processed -type f > inventory.txt +cat inventory.txt ########################################### diff --git a/02_activities/inventory.txt b/02_activities/inventory.txt new file mode 100644 index 000000000..e69de29bb From a0bd2389bb6f809e1d1d409a9cdbd3f27616dda5 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sat, 8 Nov 2025 16:11:27 -0500 Subject: [PATCH 06/11] Attempt 2: All parts submitted --- 02_activities/assignments/assignment.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index c16d45a03..63b09940d 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,7 +31,8 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw -cp ./rawdata/* ./data/raw +mkdir raw +mv ./rawdata/* ./data/raw # 3. List the contents of the ./data/raw directory cd ./data/raw ls From 9d880baa81b6fd252b790d26a96cb129820656ee Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sat, 8 Nov 2025 16:46:50 -0500 Subject: [PATCH 07/11] Final Submission --- 02_activities/assignments/assignment.sh | 29 ++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 63b09940d..c2a0c8b4a 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,31 +31,26 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw -mkdir raw +mkdir ./data/raw mv ./rawdata/* ./data/raw # 3. List the contents of the ./data/raw directory -cd ./data/raw -ls +ls ./data/raw # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs -cd .. -cd processed -mkdir server_logs user_logs event_logs +mkdir ./data/processed +mkdir ./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 -cd.. -cp *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 *user*.log ./data/processed/user_logs -cp *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 -cd ./data/raw -rm *ipaddr* -cd ./data/processed/user_logs -rm *ipaddr* +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 -cd ../ touch ./data/inventory.txt -find ./data/processed -type f > inventory.txt -cat inventory.txt +find ./data/processed -type f >> inventory.txt +cat ./data/inventory.txt ########################################### From 552b9249388d4c0de034ccb83d538b2436a7f486 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sun, 9 Nov 2025 16:10:56 -0500 Subject: [PATCH 08/11] Attempted all questions! --- 02_activities/assignments/assignment.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index c2a0c8b4a..07db14c1c 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -32,7 +32,7 @@ mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir ./data/raw -mv ./rawdata/* ./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 @@ -40,17 +40,16 @@ mkdir ./data/processed mkdir ./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/*server*.log ./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 ./data/raw/*user*.log ./data/processed/user_logs -cp ./data/raw/*event*.log ./data/processed/event_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 ./data/raw/*ipaddr* +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 -touch ./data/inventory.txt find ./data/processed -type f >> inventory.txt -cat ./data/inventory.txt +cat inventory.txt ########################################### From c9be641adcbe31e234c14b2b4b316ed55d2df365 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sun, 9 Nov 2025 16:27:42 -0500 Subject: [PATCH 09/11] Another attempt! --- 02_activities/assignments/assignment.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 07db14c1c..40b8d5f6b 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -32,7 +32,7 @@ mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir ./data/raw -mv ./rawdata ./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 @@ -40,16 +40,16 @@ mkdir ./data/processed mkdir ./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 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 -find ./data/processed -type f >> inventory.txt -cat inventory.txt +find ./data/processed -type f >> ./data/inventory.txt +cat ./data/inventory.txt ########################################### From 0d5a8e9c306f10638744bdcf65a6f45403ae9fc0 Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sun, 9 Nov 2025 16:49:22 -0500 Subject: [PATCH 10/11] All questions in Part 1 --- 02_activities/assignments/assignment.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 40b8d5f6b..cbe08c879 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,25 +31,24 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw -mkdir ./data/raw -mv ./rawdata/* ./data/raw/ +mkdir ./data/raw/ +mv -v ./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 ./data/processed -mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs +mkdir ./data/processed ./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/*server*.log ./data/processed/server_logs +cp -v ./data/raw/rawdata/*server*.log ./data/raw/ +cp -v ./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/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/rawdata/*ipaddr* +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 -find ./data/processed -type f >> ./data/inventory.txt -cat ./data/inventory.txt +ls -R ./data/processed > ./data/inventory.txt ########################################### From 966a579936db6fbc4d35a5b1bbfa4180a2a97b4c Mon Sep 17 00:00:00 2001 From: Junaid Ghani Date: Sun, 9 Nov 2025 16:54:26 -0500 Subject: [PATCH 11/11] All questions in Part 1 - Attempt 2 --- 02_activities/assignments/assignment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index cbe08c879..ef80fbc9b 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -32,14 +32,14 @@ mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir ./data/raw/ -mv -v ./rawdata/* ./data/raw/ +mv -v ./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 ./data/processed ./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 -v ./data/raw/rawdata/*server*.log ./data/raw/ +cp -v ./data/raw/rawdata/* ./data/raw/ cp -v ./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