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 74eb318d5f228bb30ba8ad7c79cd28b3eccecca7 Mon Sep 17 00:00:00 2001 From: Crystal Date: Wed, 9 Apr 2025 20:25:42 -0400 Subject: [PATCH 3/9] Add data file --- 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 2fbb9c81d..8f5507ddf 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -21,6 +21,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 55b7714f254623b6b7ffbdd668a4b8a63475c032 Mon Sep 17 00:00:00 2001 From: Crystal Date: Wed, 9 Apr 2025 21:02:02 -0400 Subject: [PATCH 4/9] All questions answerded --- 02_activities/assignments/assignment.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8f5507ddf..5f54513aa 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -24,20 +24,29 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw +mv ./rawdata directory ./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 # 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 +rm ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +mkdir ./data/processed/ +touch ./data/inventory.txt ########################################### echo "Project setup is complete!" +Project setup is complete! From f6593e5dbea62a1e8c60b8d00fa7c0a6efc65e70 Mon Sep 17 00:00:00 2001 From: Crystal Date: Sat, 12 Apr 2025 12:52:33 -0400 Subject: [PATCH 5/9] Update assignment.sh from correct version --- 02_activities/assignments/assignment.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 5f54513aa..24c3c42a6 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -24,7 +24,7 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw -mv ./rawdata directory ./data/raw +mv ./rawdata ./data/raw # 3. List the contents of the ./data/raw directory ls ./data/raw @@ -34,10 +34,11 @@ 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/*server* ./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* ./data/processed/server_logs +cp ./data/raw/*event* ./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 ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* From 488f788136c8428318af40991e0fb540fec1da83 Mon Sep 17 00:00:00 2001 From: Crystal Date: Sun, 13 Apr 2025 01:03:54 -0400 Subject: [PATCH 6/9] Update assignment.sh april 13 --- 02_activities/assignments/assignment.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 24c3c42a6..403ca058f 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -37,15 +37,14 @@ mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/e cp ./data/raw/*server* ./data/processed/server_logs # 6. Repeat the above step for user logs and event logs -cp ./data/raw/*user* ./data/processed/server_logs -cp ./data/raw/*event* ./data/processed/server_logs +cp ./data/raw/user.log ./data/processed/user_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 rm ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed -mkdir ./data/processed/ -touch ./data/inventory.txt +ls ./data/processed/* > ./data/inventory.txt ########################################### From 56e032a00f0935f51c77178426a7d8a90eeaa048 Mon Sep 17 00:00:00 2001 From: Crystal Date: Sun, 13 Apr 2025 01:07:05 -0400 Subject: [PATCH 7/9] changes on april13 0107 --- 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 403ca058f..179fb5239 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -38,7 +38,7 @@ cp ./data/raw/*server* ./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/server_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* ./data/processed/user_logs/*ipaddr* From 2e67a0ca03addf823536a1d0a1d7bd6f71912647 Mon Sep 17 00:00:00 2001 From: Crystal Date: Sun, 13 Apr 2025 12:26:16 -0400 Subject: [PATCH 8/9] updates apeil13 1226 --- 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 179fb5239..e9ab61dab 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -37,8 +37,8 @@ mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/e cp ./data/raw/*server* ./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/*user* ./data/processed/user_logs +cp ./data/raw/*event* ./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* ./data/processed/user_logs/*ipaddr* From e51df187b2c7b20bd94c15eacc4767aa5406eed2 Mon Sep 17 00:00:00 2001 From: Crystal Date: Fri, 18 Apr 2025 15:03:57 -0400 Subject: [PATCH 9/9] Final --- 02_activities/assignments/assignment.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 15ff9f791..ab3e1aeaa 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -42,14 +42,11 @@ cp ./data/raw/*user* ./data/processed/user_logs cp ./data/raw/*event* ./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* ./data/processed/user_logs/*ipaddr* -======= -rf -rf ./data ->>>>>>> ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 +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 -ls ./data/processed/* > ./data/inventory.txt +find ./data/processed -type f > ./data/inventory.txt ###########################################