Merge branch 'develop' into master

JiaDe-Wu · Aug 14, 2019 · e8bbf2c · e8bbf2c
2 parents 771a1c2 + a329f21
commit e8bbf2c
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 35 deletions.
diff --git a/ci/clickstream-analytics-input-novpc.json b/ci/clickstream-analytics-input-novpc.json
@@ -1,47 +1,67 @@
 [
   {
       "ParameterKey": "OperatorEMail",
-      "ParameterValue": "user@example.com"
+      "ParameterValue": "operator@example.com"
   },
   {
       "ParameterKey": "AvailabilityZones",
       "ParameterValue": "$[taskcat_genaz_2]"
   },
-  {
-      "ParameterKey": "RedshiftColumns",
-      "ParameterValue": ""
-  },
   {
       "ParameterKey": "KeyPairName",
-      "ParameterValue": "your-key-pair"
+      "ParameterValue": "$[alfred_getkeypair]"
   },
   {
       "ParameterKey": "AppKeyPairName",
-      "ParameterValue": "your-key-pair"
+      "ParameterValue": "$[alfred_getkeypair]"
   },
   {
       "ParameterKey": "RemoteAccessCIDR",
-      "ParameterValue": "0.0.0.0/0"
+      "ParameterValue": "10.0.0.0/16"
   },
   {
       "ParameterKey": "VPC",
       "ParameterValue": "your-VPC-id"
   },
   {
       "ParameterKey": "PublicSubnetA",
-      "ParameterValue": "your-subnet-id"
+      "ParameterValue": "10.0.128.0/20"
   },
   {
       "ParameterKey": "PublicSubnetB",
-      "ParameterValue": "your-subnet-id"
+      "ParameterValue": "10.0.144.0/20"
   },
   {
       "ParameterKey": "PrivateSubnetA",
-      "ParameterValue": "your-subnet-id"
+      "ParameterValue": "10.0.0.0/19"
   },
   {
       "ParameterKey": "PrivateSubnetB",
-      "ParameterValue": "your-subnet-id"
+      "ParameterValue": "10.0.32.0/19"
+  },
+  {
+      "ParameterKey": "ESDomainName",
+      "ParameterValue": "$[taskcat_random-string]"
+  },
+  {
+      "ParameterKey": "ESIndex",
+      "ParameterValue": "test"
+  },
+  {
+      "ParameterKey": "ESType",
+      "ParameterValue": "doc"
+  },
+  {
+      "ParameterKey": "DatabaseName",
+      "ParameterValue": "dev"
+  },
+  {
+      "ParameterKey": "MasterUserPassword",
+      "ParameterValue": "$[taskcat_genpass_8A]"
+  },
+  {
+      "ParameterKey": "RedshiftColumns",
+      "ParameterValue": ""
   },
   {
     "ParameterKey": "QSS3BucketName",

diff --git a/ci/clickstream-analytics-input-withvpc.json b/ci/clickstream-analytics-input-withvpc.json
@@ -1,27 +1,47 @@
 [
   {
       "ParameterKey": "OperatorEMail",
-      "ParameterValue": "user@example.com"
+      "ParameterValue": "operator@example.com"
   },
   {
       "ParameterKey": "AvailabilityZones",
       "ParameterValue": "$[taskcat_genaz_2]"
   },
-  {
-      "ParameterKey": "RedshiftColumns",
-      "ParameterValue": ""
-  },
   {
       "ParameterKey": "KeyPairName",
-      "ParameterValue": "your-key-pair"
+      "ParameterValue": "$[alfred_getkeypair]"
   },
   {
       "ParameterKey": "AppKeyPairName",
-      "ParameterValue": "your-key-pair"
+      "ParameterValue": "$[alfred_getkeypair]"
   },
   {
       "ParameterKey": "RemoteAccessCIDR",
-      "ParameterValue": "0.0.0.0/0"
+      "ParameterValue": "10.0.0.0/16"
+  },
+  {
+      "ParameterKey": "ESDomainName",
+      "ParameterValue": "$[taskcat_random-string]"
+  },
+  {
+      "ParameterKey": "ESIndex",
+      "ParameterValue": "test"
+  },
+  {
+      "ParameterKey": "ESType",
+      "ParameterValue": "doc"
+  },
+  {
+      "ParameterKey": "DatabaseName",
+      "ParameterValue": "dev"
+  },
+  {
+      "ParameterKey": "MasterUserPassword",
+      "ParameterValue": "$[taskcat_genpass_8A]"
+  },
+  {
+      "ParameterKey": "RedshiftColumns",
+      "ParameterValue": ""
   },
   {
     "ParameterKey": "QSS3BucketName",

diff --git a/ci/taskcat.yml b/ci/taskcat.yml
@@ -1,20 +1,41 @@
 global:
   owner: [email protected]
   qsname: quickstart-ct-clickstream-analytics
-  #s3bucket: projectx-templates <- (Optional) Only needed if you want to use a specific bucket
   regions:
+    - us-east-1
+    - us-east-2
     - us-west-2
+    - eu-west-1
+    - eu-central-1
+    - ap-southeast-1
+    - ap-northeast-1
+    - ap-southeast-2
+    - ap-northeast-2
   reporting: true
 tests:
-  # The following test will test in us-west-2 using clickstream-analytics-input-novpc.json as inputs
   scenario-1:
     regions:
-      - us-west-2
+    #  - us-east-1
+      - us-east-2
+    #  - us-west-2
+    #  - eu-west-1
+    #  - eu-central-1
+    #  - ap-southeast-1
+    #  - ap-northeast-1
+    #  - ap-southeast-2
+    #  - ap-northeast-2
     template_file: quickstart-ct-clickstream-analytics.template
     parameter_input: clickstream-analytics-input-novpc.json
-  # The following test will test in us-west-2 using clickstream-analytics-input-withvpc.json as inputs
   scenario-2:
     regions:
-      - us-west-2
+    #  - us-east-1
+    #  - us-east-2
+    #  - us-west-2
+    #  - eu-west-1
+      - eu-central-1
+    #  - ap-southeast-1
+    #  - ap-northeast-1
+    #  - ap-southeast-2
+    #  - ap-northeast-2
     template_file: quickstart-ct-clickstream-analytics-master.template
     parameter_input: clickstream-analytics-input-withvpc.json
diff --git a/templates/quickstart-ct-clickstream-analytics-master.template b/templates/quickstart-ct-clickstream-analytics-master.template
@@ -342,7 +342,7 @@ Parameters:
     ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
       uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
       with forward slash (/) because they are automatically appended.
-    Default: quickstart-examples/
+    Default: quickstart-ct-clickstream-analytics/
     Description: S3 key prefix used to simulate a folder for your copy of Quick Start
       assets, if you decide to customize or extend the Quick Start for your own use.
       This prefix can include numbers, lowercase letters, uppercase letters, hyphens,
@@ -580,11 +580,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
@@ -612,7 +610,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
@@ -641,11 +638,10 @@ 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
@@ -670,7 +666,7 @@ Parameters:
     Type: String
     Default: '5439'
   isDemo:
-    Description: Set to YES if you want to ingest demo data into redshift.
+    Description: Set to 'yes' if you want to ingest demo data into redshift.
     Type: String
     AllowedValues:
       - 'yes'
@@ -1364,7 +1360,7 @@ Resources:
         Statement:
           - 
             Principal:
-              AWS: !Sub "arn:aws:iam::${AWS::AccountId}:root"
+              AWS: "*"
             Action:
             - "es:ESHttpGet"
             - "es:ESHttpPut"
@@ -2357,6 +2353,8 @@ Outputs:
     Value: !Ref ESDomainName
   ElasticSearchDomainEndpoint:
     Value: !GetAtt ESDomain.DomainEndpoint
+  ElasticSearchKibanaEndpoint:
+    Value: !Sub "https://${ESDomain.DomainEndpoint}/_plugin/kibana/"
   ElasticSearchDeliveryStream:
     Value: !Ref FIrehoseToElasticsearch
   RedshiftCluster:

diff --git a/templates/quickstart-ct-clickstream-analytics.template b/templates/quickstart-ct-clickstream-analytics.template
@@ -331,7 +331,7 @@ Parameters:
     ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
       uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
       with forward slash (/) because they are automatically appended.
-    Default: quickstart-examples/
+    Default: quickstart-ct-clickstream-analytics/
     Description: S3 key prefix used to simulate a folder for your copy of Quick Start
       assets, if you decide to customize or extend the Quick Start for your own use.
       This prefix can include numbers, lowercase letters, uppercase letters, hyphens,
@@ -663,7 +663,7 @@ Parameters:
     Default: 'no'
   WebsiteContent:
     Description: This is the S3 location where your custom website contents are uploaded. This QuickStart will deploy your website from this location. Leave blank if there is no site to deploy.
-    Type: String    
+    Type: String 
 Mappings:
   InstanceType2Arch:
     t1.micro: