From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/7] 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/7] 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 ccde4aec12d365f1e78944953013860694eef106 Mon Sep 17 00:00:00 2001 From: Adam Rahman Date: Mon, 10 Nov 2025 22:28:22 -0500 Subject: [PATCH 3/7] trying again --- 02_activities/assignments/assignment.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 67278a361..0f1982b4c 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -30,25 +30,15 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data # 2. Move the ./rawdata directory to ./data/raw -pwd -ls -cd data -mkdir raw -cd raw -pwd -mv C:/Users/AdamRahman/dsi3/shell/02_activities/assignments/newproject/rawdata C:/Users/AdamRahman/dsi3/shell/02_activities/assignments/newproject/data/raw +mv rawdata data/raw # 3. List the contents of the ./data/raw directory -pwd -ls +ls ./data/raw # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs -cd ../ -pwd -ls -mkdir processed -cd processed -mkdir server_logs user_logs event_logs -pwd -ls + +mkdir -p data/processed/server_logs +mkdir -p data/processed/user_logs +mkdir -p 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 ../raw/rawdata From 34f3032236abd329754432b0fd8eea9c62c8207b Mon Sep 17 00:00:00 2001 From: Adam Rahman Date: Mon, 10 Nov 2025 22:43:14 -0500 Subject: [PATCH 4/7] 3rd time is a charm eh --- 02_activities/assignments/assignment.sh | 36 ++++++++++--------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 0f1982b4c..5b0343f74 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -36,39 +36,31 @@ ls ./data/raw # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs mkdir -p data/processed/server_logs + mkdir -p data/processed/user_logs + mkdir -p 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 ../raw/rawdata -pwd -ls -cp server*.log /c/Users/AdamRahman/dsi3/shell/02_activities/assignments/newproject/data/processed/server_logs -pwd -cd ../../processed/server_logs -ls -pwd + +cp ./data/raw/*server*.log ./data/processed/server_logs + # 6. Repeat the above step for user logs and event logs -cd ../../raw/rawdata -pwd -ls -cp user*.log /c/Users/AdamRahman/dsi3/shell/02_activities/assignments/newproject/data/processed/user_logs -cp event*.log /c/Users/AdamRahman/dsi3/shell/02_activities/assignments/newproject/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 -pwd -rm *ipaddr* -ls -cd ../../processed/user_logs -pwd -ls -rm *ipaddr* -ls +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 -cd ../../ + touch inventory.txt ls processed/*logs* >>inventory.txt From 1271da11ffaaef8b6c7afc4882d783182995b6a7 Mon Sep 17 00:00:00 2001 From: Adam Rahman Date: Mon, 10 Nov 2025 22:51:37 -0500 Subject: [PATCH 5/7] so close! added the 8th step --- 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 5b0343f74..2679d9e09 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -63,7 +63,7 @@ rm ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* touch inventory.txt -ls processed/*logs* >>inventory.txt +ls ./data/processed/*logs* >>inventory.txt ########################################### From 22fa440c435a436f0ce0a692bec33440c79be56c Mon Sep 17 00:00:00 2001 From: Adam Rahman Date: Mon, 10 Nov 2025 22:54:11 -0500 Subject: [PATCH 6/7] oops --- 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 2679d9e09..375c08693 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -61,7 +61,7 @@ cp ./data/raw/*event*.log ./data/processed/event_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 -touch inventory.txt +touch ./data/inventory.txt ls ./data/processed/*logs* >>inventory.txt From 0b09256d9ca13dc5c95852d176a7acad53566e96 Mon Sep 17 00:00:00 2001 From: Adam Rahman Date: Mon, 10 Nov 2025 22:56:00 -0500 Subject: [PATCH 7/7] sigh --- 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 375c08693..ee58e37b2 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -63,7 +63,7 @@ rm ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* touch ./data/inventory.txt -ls ./data/processed/*logs* >>inventory.txt +ls ./data/processed/*logs* >>./data/inventory.txt ###########################################