Skip to content

Commit

Permalink
Updated parameter defaults, ES IAM policy, Kinesis Application Names
Browse files Browse the repository at this point in the history
  • Loading branch information
dowen12 committed Jun 20, 2019
1 parent c13203a commit 6753360
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions templates/quickstart-ct-clickstream-analytics.template
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,9 @@ Parameters:
ESIndex:
Description: Index name of the amazon elasticsearch domain.
Type: String
Default: test
ESType:
Description: Name of the amazon elasticsearch type.
Type: String
Default: test
ESIndexRotation:
Description: Frequency at which the amazon elasticsearch index will be rotated.
Type: String
Expand Down Expand Up @@ -595,7 +593,6 @@ Parameters:
DatabaseName:
Description: The name of the first database to be created when the redshift cluster is created
Type: String
Default: dev
AllowedPattern: "([a-z]|[0-9])+"
ClusterType:
Description: The type of redshift cluster
Expand Down Expand Up @@ -624,19 +621,18 @@ Parameters:
Description: Master user password for redshift cluster
NoEcho: 'true'
Type: String
Default: Test!123
MasterUser:
Description: Name of the master user of the redshift cluster
Type: String
Default: test
Default: masteruser
RedshiftBufferInterval:
Description: Number of seconds to buffer data before delivering to S3 (60 to 900).
Type: Number
Default: 300
MinValue: 60
MaxValue: 900
RedshiftBufferSize:
Description: Number of MB of data to buffer before delivering to S3 (1 to 128).
Description: MB of data to buffer before delivering to S3 (1 to 128).
Type: Number
Default: 5
MinValue: 1
Expand All @@ -653,12 +649,12 @@ Parameters:
Type: String
Default: '5439'
isDemo:
Description: Set to NO if you do not want to ingest demo data into redshift.
Description: Set to 'yes' if you want to ingest demo data into redshift.
Type: String
AllowedValues:
- 'yes'
- 'no'
Default: 'yes'
Default: 'no'
Mappings:
InstanceType2Arch:
t1.micro:
Expand Down Expand Up @@ -2355,9 +2351,10 @@ Resources:
Properties:
LogGroupName: !Ref S3CloudwatchLogsGroup
LogStreamName: S3
BasicApplication1:
FirehoseToElasticSearchApp:
Type: AWS::KinesisAnalytics::Application
Properties:
ApplicationName: "FirehoseToElasticSearchApp"
ApplicationDescription: "ES-SampleApp"
ApplicationCode: "Example Application Code"
Inputs:
Expand All @@ -2377,19 +2374,20 @@ Resources:
RoleARN: !GetAtt ESAnalyticsRole.Arn
BasicApplicationOutputs:
Type: AWS::KinesisAnalytics::ApplicationOutput
DependsOn: BasicApplication1
DependsOn: FirehoseToElasticSearchApp
Properties:
ApplicationName: !Ref BasicApplication1
ApplicationName: !Ref FirehoseToElasticSearchApp
Output:
Name: "exampleOutput"
DestinationSchema:
RecordFormatType: "CSV"
KinesisFirehoseOutput:
ResourceARN: !GetAtt FIrehoseToElasticsearch.Arn
RoleARN: !GetAtt ESAnalyticsRole.Arn
BasicApplication2:
FirehoseToRedshiftApp:
Type: AWS::KinesisAnalytics::Application
Properties:
ApplicationName: "FirehoseToRedshiftApp"
ApplicationDescription: "RS-SampleApp"
ApplicationCode: "Example Application Code"
Inputs:
Expand All @@ -2409,19 +2407,20 @@ Resources:
RoleARN: !GetAtt RSAnalyticsRole.Arn
SecondBasicApplicationOutputs:
Type: AWS::KinesisAnalytics::ApplicationOutput
DependsOn: BasicApplication2
DependsOn: FirehoseToRedshiftApp
Properties:
ApplicationName: !Ref BasicApplication2
ApplicationName: !Ref FirehoseToRedshiftApp
Output:
Name: "exampleOutput"
DestinationSchema:
RecordFormatType: "CSV"
KinesisFirehoseOutput:
ResourceARN: !GetAtt FIrehoseToRedshift.Arn
RoleARN: !GetAtt RSAnalyticsRole.Arn
BasicApplication3:
FirehoseToS3App:
Type: AWS::KinesisAnalytics::Application
Properties:
ApplicationName: "FirehoseToS3App"
ApplicationDescription: "S3-SampleApp"
ApplicationCode: "Example Application Code"
Inputs:
Expand All @@ -2441,9 +2440,9 @@ Resources:
RoleARN: !GetAtt S3AnalyticsRole.Arn
ThirdBasicApplicationOutputs:
Type: AWS::KinesisAnalytics::ApplicationOutput
DependsOn: BasicApplication3
DependsOn: FirehoseToS3App
Properties:
ApplicationName: !Ref BasicApplication3
ApplicationName: !Ref FirehoseToS3App
Output:
Name: "exampleOutput"
DestinationSchema:
Expand Down Expand Up @@ -2477,6 +2476,8 @@ Outputs:
Value: !Ref ESDomainName
ElasticSearchDomainEndpoint:
Value: !GetAtt ESDomain.DomainEndpoint
ElasticSearchKibanaEndpoint:
Value: !Sub "https://${ESDomain.DomainEndpoint}/_plugin/kibana/"
ElasticSearchDeliveryStream:
Value: !Ref FIrehoseToElasticsearch
RedshiftCluster:
Expand All @@ -2492,8 +2493,8 @@ Outputs:
LoadBalancerDNSEndpoint:
Value: !Sub 'http://${PublicLoadBalancer.DNSName}'
KinesisAnalyticsApp1:
Value: !Ref BasicApplication1
Value: !Ref FirehoseToElasticSearchApp
KinesisAnalyticsApp2:
Value: !Ref BasicApplication2
Value: !Ref FirehoseToRedshiftApp
KinesisAnalyticsApp3:
Value: !Ref BasicApplication3
Value: !Ref FirehoseToS3App

0 comments on commit 6753360

Please sign in to comment.