Merge pull request #118 from SumoLogic/hpal_ct_devops

Cloudtrail devops app added and sumoapputils version upgraded

Author: himanshu219

cloudtrailbenchmark/packaged.yaml

@@ -43,9 +43,9 @@ Metadata:
     - benchmark
     - cloudtrail
     Name: sumologic-aws-cloudtrail-benchmark
-    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.10/cac1a6df52c685e0f6ebe4ae72078c80
-    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.10/8a901bb4fbbe82f128fc502dd3077508
-    SemanticVersion: 1.0.10
+    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.11/cac1a6df52c685e0f6ebe4ae72078c80
+    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.11/8a901bb4fbbe82f128fc502dd3077508
+    SemanticVersion: 1.0.11
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudtrailbenchmark
 Parameters:
   CollectorName:
@@ -127,7 +127,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 1.0.24
+        SemanticVersion: 2.0.1
   SumoRole:
     Condition: SetupSumoResources
     Type: AWS::IAM::Role
@@ -363,10 +363,42 @@ Resources:
         Ref: SumoDeployment
     DependsOn:
     - SumoAppUtils
+  SumoGISCloudTrailDevOpsApp:
+    Type: Custom::App
+    Properties:
+      ServiceToken:
+        Fn::GetAtt:
+        - SumoAppUtils
+        - Outputs.SumoAppUtilsFunction
+      Region:
+        Ref: AWS::Region
+      AppName: Global Intelligence for CloudTrail DevOps
+      AppId: c7e195de-f169-460a-8e8b-7bb23af0ee5e
+      RemoveOnDeleteStack:
+        Ref: RemoveSumoResourcesOnDeleteStack
+      AppSources:
+        cloudtraillogsource:
+          Fn::Sub: _sourceCategory=${SourceCategoryName}
+        indexname: '%rnd%'
+        incrementalindex: '%rnd%'
+      SumoAccessID:
+        Ref: SumoAccessID
+      SumoAccessKey:
+        Ref: SumoAccessKey
+      SumoDeployment:
+        Ref: SumoDeployment
+    DependsOn:
+    - SumoAppUtils
 Outputs:
   CloudTrailBenchmarkAppFolder:
     Description: Folder Name
     Value:
       Fn::GetAtt:
       - SumoCloudTrailBenchmarkApp
       - APP_FOLDER_NAME
+  GISCloudTrailDevOpsAppFolder:
+    Description: Folder Name
+    Value:
+      Fn::GetAtt:
+      - SumoGISCloudTrailDevOpsApp
+      - APP_FOLDER_NAME

cloudtrailbenchmark/template.yaml

@@ -49,7 +49,7 @@ Metadata:
     Name: sumologic-aws-cloudtrail-benchmark
     LicenseUrl: ./LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.10
+    SemanticVersion: 1.0.11
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudtrailbenchmark
 
 
@@ -123,7 +123,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 1.0.24
+        SemanticVersion: 2.0.1
 
   SumoRole:
     Condition: SetupSumoResources
@@ -323,8 +323,31 @@ Resources:
     DependsOn:
       - SumoAppUtils
 
+
+  SumoGISCloudTrailDevOpsApp:
+    Type: Custom::App
+    Properties:
+      ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
+      Region: !Ref "AWS::Region"
+      AppName: "Global Intelligence for CloudTrail DevOps"
+      AppId: "c7e195de-f169-460a-8e8b-7bb23af0ee5e"
+      RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
+      AppSources:
+        cloudtraillogsource: !Sub "_sourceCategory=${SourceCategoryName}"
+        indexname: "%rnd%"
+        incrementalindex: "%rnd%"
+      SumoAccessID: !Ref SumoAccessID
+      SumoAccessKey: !Ref SumoAccessKey
+      SumoDeployment: !Ref SumoDeployment
+    DependsOn:
+      - SumoAppUtils
+
+
 Outputs:
     CloudTrailBenchmarkAppFolder:
       Description: "Folder Name"
       Value: !GetAtt SumoCloudTrailBenchmarkApp.APP_FOLDER_NAME
+    GISCloudTrailDevOpsAppFolder:
+      Description: "Folder Name"
+      Value: !GetAtt SumoGISCloudTrailDevOpsApp.APP_FOLDER_NAME
 

cloudtrailbenchmark/testdeploy.sh

@@ -10,7 +10,7 @@ else
 fi
 uid=$(cat /dev/random | LC_CTYPE=C tr -dc "[:lower:]" | head -c 6)
 
-version="1.0.10"
+version="1.0.11"
 
 sam package --template-file template.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "cloudtrailbenchmark/v$version"