From 5adee6151ee6c0a1d371ad1194edd56805e4c57a Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Sun, 12 May 2024 15:33:35 +0300 Subject: [PATCH 1/6] Update README.md change sort order of "AWS Examples" section: move deployments that include all DSF components to appear first. --- README.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e4eb8e315..a54cacf34 100644 --- a/README.md +++ b/README.md @@ -551,6 +551,26 @@ For more details about each example, click on the example name. Download + + + DSF Deployment + + Lab/POC + + A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. + + dsf_deployment_1_7_13.zip + + + + DSF Single Account Deployment + + PS/Customer + + A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). + + dsf_single_account_deployment_1_7_13.zip + Sonar Basic Deployment @@ -592,26 +612,6 @@ For more details about each example, click on the example name. sonar_multi_account_deployment_1_7_13.zip - - DSF Deployment - - Lab/POC - - A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - - dsf_deployment_1_7_13.zip - - - - DSF Single Account Deployment - - PS/Customer - - A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - - dsf_single_account_deployment_1_7_13.zip - - Sonar Upgrade (Alpha) From 9e7688dc2e277cdb58f1f8b127b2398470608645 Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Sun, 12 May 2024 18:40:15 +0300 Subject: [PATCH 2/6] Update README.md changes following code review --- README.md | 84 +++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index a54cacf34..27c99ca48 100644 --- a/README.md +++ b/README.md @@ -551,6 +551,16 @@ For more details about each example, click on the example name. Download + + + DSF Single Account Deployment + + PS/Customer + + A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). + + dsf_single_account_deployment_1_7_13.zip + DSF Deployment @@ -561,15 +571,25 @@ For more details about each example, click on the example name. dsf_deployment_1_7_13.zip + + + Sonar Single Account Deployment + + PS/Customer + + A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. + + sonar_single_account_deployment_1_7_13.zip + - DSF Single Account Deployment + Sonar Multi Account Deployment PS/Customer - A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). + A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - dsf_single_account_deployment_1_7_13.zip + sonar_multi_account_deployment_1_7_13.zip @@ -593,27 +613,7 @@ For more details about each example, click on the example name. - Sonar Single Account Deployment - - PS/Customer - - A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - - sonar_single_account_deployment_1_7_13.zip - - - - Sonar Multi Account Deployment - - PS/Customer - - A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - - sonar_multi_account_deployment_1_7_13.zip - - - - Sonar Upgrade (Alpha) + Sonar Upgrade All @@ -719,12 +719,12 @@ After you have [chosen the deployment mode](#choosing-the-deployment-mode), foll This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_single_account_deployment" example, you should download dsf_single_account_deployment.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: ```bash - unzip sonar_basic_deployment.zip + unzip dsf_single_account_deployment_1_7_13.zip >>>> Change this command depending on the example you chose ``` @@ -732,7 +732,7 @@ This mode makes use of the Terraform Command Line Interface (CLI) to deploy and 3. In CLI, navigate to the directory which contains the Terraform files. For example: ```bash - cd sonar_basic_deployment + cd dsf_single_account_deployment_1_7_13 >>>> Change this command depending on the example you chose ``` @@ -836,30 +836,30 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann For example: `chmode 400 a_key_pair.pem` -9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_single_account_deployment" example, you should download dsf_single_account_deployment.zip. Run: ```bash - wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_13.zip - + wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_13.zip + or - - wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_13.zip - + + wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_13.zip + or wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_13.zip - + or - wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_13.zip - + wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_13.zip + or - wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_13.zip - + wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_13.zip + or - - wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_13.zip + + wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_13.zip ``` 10. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. @@ -900,7 +900,7 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica * Click on the Advanced options button.
![Advanced options](https://user-images.githubusercontent.com/52969528/212977394-60f79882-008b-44ef-bb05-9af629b1a88a.png) - * Enter the path to the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section), e.g., “examples/aws/poc/sonar_basic_deployment”, into the Terraform working directory input field.![Terraform Working Directory](https://github-production-user-asset-6210df.s3.amazonaws.com/87799317/252918341-edfcf6a6-c782-4863-9c55-100f25e680ed.png) + * Enter the path to the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section), e.g., “examples/aws/installation/dsf_single_account_deployment”, into the Terraform working directory input field.![Terraform Working Directory](https://github-production-user-asset-6210df.s3.amazonaws.com/87799317/252918341-edfcf6a6-c782-4863-9c55-100f25e680ed.png) ``` >>>> Change the directory in the above screenshot depending on the example you chose ``` @@ -1044,7 +1044,7 @@ In case of failure, the Terraform may have deployed some resources before failin 1. Navigate to the directory which contains the Terraform files. For example: ```bash - cd sonar_basic_deployment + cd dsf_single_account_deployment_1_7_13 >>>> Change this command depending on the example you chose ``` From 94fd90791dafbca882eb3c7056cf08c31a7a8ed7 Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Sun, 12 May 2024 18:52:08 +0300 Subject: [PATCH 3/6] Update README.md apply changes from open PR for EDSF-495 --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 27c99ca48..ea0e66947 100644 --- a/README.md +++ b/README.md @@ -559,7 +559,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment_1_7_13.zip + dsf_single_account_deployment_1_7_13.zip @@ -569,7 +569,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment_1_7_13.zip + dsf_deployment_1_7_13.zip @@ -579,7 +579,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment_1_7_13.zip + sonar_single_account_deployment_1_7_13.zip @@ -589,7 +589,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment_1_7_13.zip + sonar_multi_account_deployment_1_7_13.zip @@ -599,7 +599,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment_1_7_13.zip + sonar_basic_deployment_1_7_13.zip @@ -609,7 +609,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment_1_7_13.zip + sonar_hadr_deployment_1_7_13.zip @@ -619,7 +619,7 @@ For more details about each example, click on the example name. Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). - sonar_upgrade_1_7_13.zip + sonar_upgrade_1_7_13.zip @@ -644,7 +644,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation and networking, DAM (MX and Agent Gateways), and Agent audit sources. - dsf_deployment_1_7_13.zip + dsf_deployment_1_7_13.zip @@ -1158,7 +1158,7 @@ After you have [chosen the upgrade mode](#choosing-the-upgrade-mode), follow the This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_13.zip. +1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_13.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: From bb6bd3d41b28c19f356b2c19b9cf7f9ef96b144f Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Sun, 12 May 2024 22:11:37 +0300 Subject: [PATCH 4/6] Update README.md revert previous commit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ea0e66947..e989e7436 100644 --- a/README.md +++ b/README.md @@ -1482,4 +1482,3 @@ Below is a list of possible issues and troubleshooting remediations. - From 81f3adafd64aada1a9a18d46296edd4866d243c3 Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Sun, 12 May 2024 22:17:48 +0300 Subject: [PATCH 5/6] Update README.md revert to commit 9e7688d --- README.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e989e7436..d7148f4bf 100644 --- a/README.md +++ b/README.md @@ -559,7 +559,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment_1_7_13.zip + dsf_single_account_deployment_1_7_13.zip @@ -569,7 +569,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment_1_7_13.zip + dsf_deployment_1_7_13.zip @@ -579,7 +579,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment_1_7_13.zip + sonar_single_account_deployment_1_7_13.zip @@ -589,7 +589,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment_1_7_13.zip + sonar_multi_account_deployment_1_7_13.zip @@ -599,7 +599,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment_1_7_13.zip + sonar_basic_deployment_1_7_13.zip @@ -609,7 +609,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment_1_7_13.zip + sonar_hadr_deployment_1_7_13.zip @@ -619,7 +619,7 @@ For more details about each example, click on the example name. Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). - sonar_upgrade_1_7_13.zip + sonar_upgrade_1_7_13.zip @@ -644,7 +644,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation and networking, DAM (MX and Agent Gateways), and Agent audit sources. - dsf_deployment_1_7_13.zip + dsf_deployment_1_7_13.zip @@ -1158,7 +1158,7 @@ After you have [chosen the upgrade mode](#choosing-the-upgrade-mode), follow the This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_13.zip. +1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_13.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -1481,4 +1481,3 @@ Below is a list of possible issues and troubleshooting remediations. - From e9055a662c1d5859f2d36a4fca2a85c3294230a9 Mon Sep 17 00:00:00 2001 From: Idan Nof <79643072+idannof-imperva@users.noreply.github.com> Date: Mon, 13 May 2024 23:07:04 +0300 Subject: [PATCH 6/6] Update README.md code review adjustments --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d7148f4bf..d6898b3e5 100644 --- a/README.md +++ b/README.md @@ -719,12 +719,12 @@ After you have [chosen the deployment mode](#choosing-the-deployment-mode), foll This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_single_account_deployment" example, you should download dsf_single_account_deployment.zip. +1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: ```bash - unzip dsf_single_account_deployment_1_7_13.zip + unzip dsf_deployment_1_7_13.zip >>>> Change this command depending on the example you chose ``` @@ -732,7 +732,7 @@ This mode makes use of the Terraform Command Line Interface (CLI) to deploy and 3. In CLI, navigate to the directory which contains the Terraform files. For example: ```bash - cd dsf_single_account_deployment_1_7_13 + cd dsf_deployment_1_7_13 >>>> Change this command depending on the example you chose ``` @@ -836,7 +836,7 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann For example: `chmode 400 a_key_pair.pem` -9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_single_account_deployment" example, you should download dsf_single_account_deployment.zip. +9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "dsf_deployment" example, you should download dsf_deployment.zip. Run: ```bash wget https://github.com/imperva/dsfkit/raw/1.7.13/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_13.zip @@ -900,7 +900,7 @@ If you want to use Imperva's Terraform Cloud account, contact Imperva's Technica * Click on the Advanced options button.
![Advanced options](https://user-images.githubusercontent.com/52969528/212977394-60f79882-008b-44ef-bb05-9af629b1a88a.png) - * Enter the path to the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section), e.g., “examples/aws/installation/dsf_single_account_deployment”, into the Terraform working directory input field.![Terraform Working Directory](https://github-production-user-asset-6210df.s3.amazonaws.com/87799317/252918341-edfcf6a6-c782-4863-9c55-100f25e680ed.png) + * Enter the path to the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section), e.g., “examples/aws/poc/sonar_basic_deployment”, into the Terraform working directory input field.![Terraform Working Directory](https://github-production-user-asset-6210df.s3.amazonaws.com/87799317/252918341-edfcf6a6-c782-4863-9c55-100f25e680ed.png) ``` >>>> Change the directory in the above screenshot depending on the example you chose ``` @@ -1044,7 +1044,7 @@ In case of failure, the Terraform may have deployed some resources before failin 1. Navigate to the directory which contains the Terraform files. For example: ```bash - cd dsf_single_account_deployment_1_7_13 + cd dsf_deployment_1_7_13 >>>> Change this command depending on the example you chose ```