From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 01/10] 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/10] 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 03a2b84fcb4a0c20ab7ce8ac3e9f7d713c733cd5 Mon Sep 17 00:00:00 2001 From: Ayshe Date: Wed, 9 Apr 2025 21:12:08 -0400 Subject: [PATCH 03/10] adjusting 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 2fbb9c81d..7c62dec20 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -21,7 +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 # 3. List the contents of the ./data/raw directory From 325c24e9d97b1cfb1c6dc0adc429c477e06c802c Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 17:36:42 -0400 Subject: [PATCH 04/10] changes in assignment --- 02_activities/assignments/assignment.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 7c62dec20..52339ebc7 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -23,19 +23,21 @@ unzip -q rawdata.zip # 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 - +mkdir ./data/processes/server_logs ./data/processes/user_logs ./data/processes/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/server*.log .data/processed/user_logs/ +cp ./data/raw/server*.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/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 ########################################### From 3d7e43ec44838775de34bd39f12550054f3ce635 Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 17:49:18 -0400 Subject: [PATCH 05/10] changes in 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 52339ebc7..505b22dee 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -27,7 +27,7 @@ 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 -mkdir ./data/processes/server_logs ./data/processes/user_logs ./data/processes/event_logs +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 From 66195af1f028afd8574d6010fa95430bda02dafb Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 18:19:14 -0400 Subject: [PATCH 06/10] changes in assignment --- 02_activities/assignments/assignment.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 505b22dee..e60bc2cfb 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -27,12 +27,12 @@ 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 -mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs +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*.log .data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs -cp ./data/raw/server*.log .data/processed/user_logs/ -cp ./data/raw/server*.log .data/processed/event_logs/ +cp ./data/raw/*server*.log .data/processed/user_logs/ +cp ./data/raw/*server*.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/processed/user_logs/*ipaddr* From 1ff2e795612df5a8fb3db5ebb27c997768f08130 Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 18:38:58 -0400 Subject: [PATCH 07/10] changes in 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 e60bc2cfb..5ddb99fd6 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -27,7 +27,7 @@ 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 -mkdir data/processed/server_logs data/processed/user_logs data/processed/event_logs +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 From 3120641a4ad9bd89e05a49d188f184d2339570ef Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 20:44:12 -0400 Subject: [PATCH 08/10] changes in assignment --- 02_activities/assignments/assignment.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 5ddb99fd6..ecebcc287 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -23,22 +23,22 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data # 2. Move the ./rawdata directory to ./data/raw -mv ./rawdata ./data/raw +mv rawdata data/raw # 3. List the contents of the ./data/raw directory -ls ./data/raw directory +ls data/raw # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs -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 data/raw/*server*.log data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs -cp ./data/raw/*server*.log .data/processed/user_logs/ -cp ./data/raw/*server*.log .data/processed/event_logs/ +cp data/raw/*server*.log data/processed/user_logs/ +cp data/raw/*server*.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/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 -touch ./data/inventory.txt - +touch data/inventory.txt +ls data/processed/* >> data/inventory.txt ########################################### echo "Project setup is complete!" From ea56ac2d7e901df8ec98990ee778f13e00ddcdf0 Mon Sep 17 00:00:00 2001 From: Ayshe Date: Thu, 10 Apr 2025 22:03:20 -0400 Subject: [PATCH 09/10] changes in the assignment --- 02_activities/assignments/assignment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index ecebcc287..7657108fb 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,14 +31,14 @@ mkdir data/processed data/processed/server_logs data/processed/user_logs data/pr # 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/*server*.log data/processed/user_logs/ -cp data/raw/*server*.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/*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 -ls data/processed/* >> data/inventory.txt +ls data/processed/*/ > data/inventory.txt ########################################### echo "Project setup is complete!" From b22fd93e4f38928305b66f79f3b70568c6ad101c Mon Sep 17 00:00:00 2001 From: Ayshe Date: Fri, 11 Apr 2025 10:44:36 -0400 Subject: [PATCH 10/10] Changes in 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 7657108fb..bfb05bc47 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -38,7 +38,7 @@ 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 touch data/inventory.txt -ls data/processed/*/ > data/inventory.txt +ls data/processed/*/* > data/inventory.txt ########################################### echo "Project setup is complete!"