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 8cdd84c1115992f7df5075e1e5b87c8cba213dd7 Mon Sep 17 00:00:00 2001 From: Eliot Date: Wed, 9 Apr 2025 20:24:31 -0400 Subject: [PATCH 3/6] Finished question 1 on 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 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 fabde40d10195847143e07837dfda4ce998bd413 Mon Sep 17 00:00:00 2001 From: Eliot Date: Sat, 12 Apr 2025 00:08:01 -0400 Subject: [PATCH 4/6] Part 1 - finished remaining questions --- 02_activities/assignments/assignment.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8f5507ddf..9cc0f9f6a 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -24,19 +24,26 @@ 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 -1 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 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/*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 - +ls -1 data/processed/event_logs data/processed/server_logs data/processed/user_logs ########################################### From 8ae0a32a7d494bc01f6065cd6fe5d4a9cb21e48d Mon Sep 17 00:00:00 2001 From: Eliot Date: Sat, 12 Apr 2025 00:45:53 -0400 Subject: [PATCH 5/6] Attempt 1 to Fix Part 1 Q7, Q8 --- 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 8ba971ea5..07f754410 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -41,11 +41,7 @@ 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* 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 -1 data/processed/event_logs data/processed/server_logs data/processed/user_logs From 34a22d644b0baffe92b921b313d1f2d564d91913 Mon Sep 17 00:00:00 2001 From: Eliot Date: Sat, 12 Apr 2025 00:52:13 -0400 Subject: [PATCH 6/6] Attempt 2 - Fixing question 8 --- 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 07f754410..a555f83b0 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -41,10 +41,11 @@ 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* data/processed/user_logs/*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 -ls -1 data/processed/event_logs data/processed/server_logs data/processed/user_logs +ls -1 data/processed/* > data/inventory.txt ###########################################