Skip to content

Cloudtrail devops app added and sumoapputils version upgraded #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Cloudtrail devops app added and sumoapputils version upgraded #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions cloudtrailbenchmark/packaged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
27 changes: 25 additions & 2 deletions cloudtrailbenchmark/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

2 changes: 1 addition & 1 deletion cloudtrailbenchmark/testdeploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down