Updated documentation

Author: pra1veenk

Diff for: Code/AWS/README.md

@@ -14,105 +14,3 @@ Before generating data, please complete the following steps
 [Kinesis data generator](https://awslabs.github.io/amazon-kinesis-data-generator/web/producer.html) can help simulate an output from Monitron. The template uses faker.js for variables. A [template file](./kinesisdatatemplate.json)
 to generate the output is available in the github repo. Please make further modifications as necessary.
 ![Data Generator](/kinesisdatagen.png)
-
-## SAP BTP integration pattern
-If the SAP ECC or S/4 HANA system is an API provider to BTP, please use the below architecture. The architecture uses an APIKey for authentication. The preflow policy contains snippets from here to pass the provider credentials and xcsrf token to the consumer.
-![architecture](/monitronarch.png)
-
-The API proxy and policy steps are taken from the [SAP documentation](https://blogs.sap.com/2020/08/10/consuming-sap-on-premise-data-through-sap-api-management/) to pass the APIKey and XCSRF token.  
-![API product](/APIproduct.png)
-![API](/API.png)
-![API](/APIPolicy.png)
-
-
-This project is intended to be sample code only. Not for use in production.
-
-This project will create the following in your AWS cloud environment specified:
-* Lambda Layers
-* Lambda for detecting Anomalies and creating notifications in SAP
-* Roles
-* DynamoDB
-* S3 Notifications
-
-## Deploying the CDK Project
-
-This project is set up like a standard Python project.  For an integrated development environment (IDE), use `AWS Cloud9 environment` to create python virtual environment for the project with required dependencies.  
-
-1. Launch your AWS Cloud9 environment.
-
-2.  Clone the github repository and navigate to the directory.
-
-```
-$ git clone https://github.com/aws-samples/aws-monitron-sap-integration.git
-
-$ cd aws-monitron-sap-integration
-```
-
-To manually create a virtualenv 
-
-```
-$ python3 -m venv .env
-```
-
-After the init process completes and the virtualenv is created, you can use the following
-step to activate your virtualenv.
-
-```
-$ source .env/bin/activate
-```
-
-Once the virtualenv is activated, you can install the required dependencies.
-
-```
-$ pip install -r requirements.txt
-```
-
-The `appConfig.json` file takes the input paramters for the stack. Maintain the following parameters in the `appConfig.json` before deploying the stack
-
-## AWS environment details
-* `account` Enter AWS account id of your AWS cloud environment
-* `region`  Enter Region information where the stack resources needs to be created
-* `vpcId`   Enter the VPC for Lambda execution from where Lambda can access SAP resources and look out for vision
-* `subnet`  Enter the subnet for Lambda exection
-## Resource Identifiers
-* `stackname` Enter an Identifier/Name for the CDK stack
-* `ddbtablename` Enter a name for Dynamo DB Table that would be created as part of the stack which would hold the metadata for creating Service notification in SAP
-## Bucket Structure
-* `bucketname` Enter the name of the bucketwhere the inferences are sent.
-* `inferencefolder` Enter the name of the folder(prefix)where the inferences are sent. Leave blank if no folder
-## SAP Environnment details
-* `SAP_AUTH_SECRET` Provide the arn where the credentials with keys `user` and `password` or `APIkey` if using SAP BTP  for accessing SAP services.
-* `SAP_HOST_NAME` Host name of the instance for accessing the SAP OData service e.g. hostname of load balancer/Web Dispatcher/SAP Gateway. If using BTP, please pass host alias
-* `SAP_PORT` provide the port on which the SAP service can be accesed e.g 443/50001
-* `SAP_PROTOCOL` Enter protocol ushing which the service will be accessed HTTPS/HTTP 
-
-
-Bootstrap your AWS account for CDK. Please check [here](https://docs.aws.amazon.com/cdk/latest/guide/tools.html) for more details on bootstraping for CDK. Bootstraping deploys a CDK toolkit stack to your account and creates a S3 bucket for storing various artifacts. You incur any charges for what the AWS CDK stores in the bucket. Because the AWS CDK does not remove any objects from the bucket, the bucket can accumulate objects as you use the AWS CDK. You can get rid of the bucket by deleting the CDKToolkit stack from your account.
-
-```
-$ cdk bootstrap aws://<YOUR ACCOUNT ID>/<YOUR AWS REGION>
-```
-
-Deploy the stack to your account. Make sure your CLI is setup for account ID and region provided in the appConfig.json file.
-
-```
-$ cdk deploy
-```
-
-## Cleanup
-
-In order to delete all resources created by this CDK app, run the following command
-
-```
-cdk destroy
-```
-
-## Useful commands
-
- * `cdk ls`          list all stacks in the app
- * `cdk synth`       emits the synthesized CloudFormation template
- * `cdk deploy`      deploy this stack to your default AWS account/region
- * `cdk diff`        compare deployed stack with current state
- * `cdk docs`        open CDK documentation
-
-Enjoy!

Diff for: Code/AWS/appConfig.json

@@ -10,9 +10,9 @@
         "SAP_AEM_CREDENTIALS":"arn:aws:secretsmanager:eu-west-1:782110148236:secret:sapaem-credentials-iNmFXa",
         "SAP_AEM_REST_URL": "https://mr-connection-giuyy7qx0z1.messaging.solace.cloud:9443/monitron/messages"
     },
-    "ddbtablename": "configm4s",
     "s3":{
-        "bucketname": "sapkendrapdfsearch"
+        "bucketname": "sapkendrapdfsearch",
+        "inferencefolder":"monitron"
        },
      "lambdaTimeout": 900
 }

Diff for: documentation/Step1-Setup-SAPBTP-Subaccount/README.md

@@ -71,5 +71,7 @@ If you already have an existing HANA Instance, you can map it to this SAP BTP su
 
 ### 4. Set Up SAP Business Application Studio
 
-Refer [Manage Authorizations and Roles](https://help.sap.com/docs/SAP%20Business%20Application%20Studio/9d1db9835307451daa8c930fbd9ab264/01e69c53003c4b0a8a64310a3f08867d.html) to assign permissions to users.
+1. Refer [Subscribe to SAP Business Application Studio](https://help.sap.com/docs/bas/sap-business-application-studio/subscribe-to-sap-business-application-studio) and subscribe to SAP Business Application Studio.
+
+2. Refer [Manage Authorizations and Roles](https://help.sap.com/docs/SAP%20Business%20Application%20Studio/9d1db9835307451daa8c930fbd9ab264/01e69c53003c4b0a8a64310a3f08867d.html) to assign permissions to users for accessing SAP Business Application Studio.
 

Diff for: documentation/Step2-SAPS4HANA-Readiness/README.md

@@ -1,5 +1,6 @@
 ## Check SAP S/4HANA Readiness
 In this section, you will activate the APIs related to plant maintenance notification for this scenario.
+API_MAINTNOTIFICATION API is supported from SAP S/4HANA 2022 onwards.
 
 ### Activate the API_MAINTNOTIFICATION Service
 

Diff for: documentation/Step4b-Advanced-Event-Mesh-Configuration/README.md

@@ -44,7 +44,7 @@
 
      ![plot](./images/aem-create-queue.png)
 
-     Enable both incoming and outgoing configuration
+     Enable both incoming and outgoing configuration and then click on **Apply** button.
 
      ![plot](./images/aem-queue2.png)    
 

Diff for: documentation/Step4b-Advanced-Event-Mesh-Configuration/images/aem-queue2.png

@@ -2,7 +2,7 @@
 
 This project is set up like a standard Python project.  For an integrated development environment (IDE), use `SAP Business Application Studio` to create python virtual environment for the project with required dependencies.  
 
-1.To access the SAP Business Application Studio, go to your subaccount, navigate to **Services** > and choose **Instances and Subscriptions**.
+1. To access the SAP Business Application Studio, go to your subaccount, navigate to **Services** > and choose **Instances and Subscriptions**.
    Choose the row for the SAP Business Application Studio subscription and choose **Go to Application**
 
    ![plot](./images/access-BAS.png)
@@ -20,7 +20,9 @@ This project is set up like a standard Python project.  For an integrated develo
 
    ```
    git clone https://github.com/SAP-samples/btp-aws-monitron
+   ```
 
+   ```
    cd Code/AWS
    ```
 
@@ -81,11 +83,13 @@ The following are the two SAP Environment variables:
 * `SAP_AEM_CREDENTIALS` (example: arn:aws:secretsmanager://region/account/secret:sapemauth-pnyaRN)
 * `SAP_AEM_REST_URL` (example: https://mr-connection-giuyy7qx0z1.messaging.solace.cloud:9443/topic)
 
+### For SAP_AEM_CREDENTIALS, follow the steps below.
+
 1. The values for these variables needs to be stored in the **AWS Secrets Manager**. Go to your **AWS account** and search for **secret**, choose **Secrets Manager**
 
  ![plot](./images/aws-secret.png)
 
-2. For Storing **SAP_AEM_CREDENTIALS** we need the Advanced Event Mesh UserName and Password. Open the Advanced Event Mesh Application from the BTP Cockpit. 
+2. For Storing **SAP_AEM_CREDENTIALS** we need the Advanced Event Mesh Username and Password. Open the Advanced Event Mesh Application from the BTP Cockpit. 
 
  ![plot](./images/access-aem.png)
 
@@ -101,18 +105,29 @@ The following are the two SAP Environment variables:
 
 ![plot](./images/create-secret-1.png)
 
-6. Choose **Other type of secret** option under **Secret type**. Add two key-value pairs as **UserName and Password** and Paste the values copied from **Advanced Event Mesh Application**. Click on **Next**
+6. Choose **Other type of secret** option under **Secret type**. Add two key-value pairs as **username and password** and Paste the values copied from **Advanced Event Mesh Application**. Click on **Next**
 
 ![plot](./images/secret-keys.png)
 
 7. Fill the **Secret name** as **sapaem-credentials** and Click on **Next**, Click on **Next** and then click on **Store** to store the secret.
 
 ![plot](./images/secret-store.png)
 
-8. Click on the created secret and copy the Secret ARN value.
+8. Click on the created secret and copy the Secret ARN value and use it in appConfig.json for **SAP_AEM_CREDENTIALS**.
 
 ![plot](./images/secret-arn.png)
 
+### For SAP_AEM_REST_URL, follow the steps below.
+ 
+1. Go to your Advanced Event Mesh Application, and from the **Connect** Tab, copy the **Secured REST Host**
+ 
+   ![plot](./images/aem-rest-url-1.png)
+ 
+2. You have previously created a topic subscription named `monitron/messages`
+ 
+   ![plot](./images/aem-rest-url-2.png)
+ 
+So, the **SAP_AEM_REST_URL** is `Secured_REST_Host`/monitron/messages
 
 So your `appConfig.json` file looks as shown below: Fill all the details by following the steps mentioned above. 
 
@@ -129,9 +144,8 @@ So your `appConfig.json` file looks as shown below: Fill all the details by foll
         "SAP_AEM_CREDENTIALS":"<your_secret_arn>",
         "SAP_AEM_REST_URL": "<your_aem_rest_url>"
     },
-    "ddbtablename": "myddb",
     "s3":{
-        "bucketname": "mybucket",
+        "bucketname": "<your_s3_bucket>",
         "inferencefolder":"monitron"
        },
      "lambdaTimeout": 900

Diff for: documentation/Step5-Setup-AWS/README.md

@@ -12,10 +12,8 @@
         "SAP_EM_OAUTH_CLIENT_ID": "sb-default-85d8f3d8-255c-4122-b170-17f93ee9db4e-clone!b156115|xbem-service-broker-!b2436",
         "SAP_EM_REST_URL": "https://enterprise-messaging-pubsub.cfapps.eu10.hana.ondemand.com/messagingrest/v1/topics/com%2Fsap%2Fpaa%2Findustry%2Fevent%2Fraised/messages"
     },
-    "ddbtablename": "configm4s",
     "s3":{
         "bucketname": "awspihe2ab",
-        "equipment": "CAM-01",
         "inferencefolder":"monitron"
     },
      "lambdaTimeout": 900