Merge pull request #15 from Rungutan/issue-14

Issue 14
Rungutan · Jan 24, 2021 · 28fde6d · 28fde6d
2 parents 44bdd0a + bcbf359
commit 28fde6d
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 3 deletions.
diff --git a/.github/workflows/release-add-cookbooks.yaml → .github/workflows/release-add-cookbooks.yml b/.github/workflows/release-add-cookbooks.yaml → .github/workflows/release-add-cookbooks.yml
diff --git a/.github/workflows/release-s3-push-template.yml b/.github/workflows/release-s3-push-template.yml
@@ -0,0 +1,41 @@
+name: release-s3-push-template
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  sentry-base:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+      - name: Upload template file to bucket with latest
+        uses: ItsKarma/[email protected]
+        with:
+          args: s3 cp cloudformation-template.yaml s3://sentry-performance-monitoring/cloudformation-template.yaml
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      - name: Upload template file to bucket with tag
+        uses: ItsKarma/[email protected]
+        with:
+          args: s3 cp cloudformation-template.yaml s3://sentry-performance-monitoring/${{ steps.get_version.outputs.VERSION }}/cloudformation-template.yaml
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+
diff --git a/cloudformation-template.yaml b/cloudformation-template.yaml
@@ -328,10 +328,14 @@ Parameters:
     Type: String
     Default: "10"
 
-  DesiredCountSentryWorkers:
+  MinCountSentryWorkers:
     Type: String
     Default: "1"
 
+  MaxCountSentryWorkers:
+    Type: String
+    Default: "10"
+
   SentrySystemSecretKey:
     Type: String
     NoEcho: true
@@ -500,7 +504,8 @@ Metadata:
           - MaxCountSnubaTransactionsConsumer
           - MinCountSnubaEventsReplacer
           - MaxCountSnubaEventsReplacer
-          - DesiredCountSentryWorkers
+          - MinCountSentryWorkers
+          - MaxCountSentryWorkers
           - SentrySystemSecretKey
 
       - Label:
@@ -4811,7 +4816,7 @@ Resources:
         MinimumHealthyPercent: 100
         MaximumPercent: 200
       DesiredCount:
-        Ref: DesiredCountSentryWorkers
+        Ref: MinCountSentryWorkers
       PropagateTags: SERVICE
       NetworkConfiguration: 
         AwsvpcConfiguration:
@@ -4823,6 +4828,52 @@ Resources:
           SecurityGroups:
             - Ref: Ec2SecurityGroup
 
+  AutoScalingTargetSentryWorkers:
+    Type: AWS::ApplicationAutoScaling::ScalableTarget
+    Properties:
+      MaxCapacity:
+        Ref: MaxCountSentryWorkers
+      MinCapacity:
+        Ref: MinCountSentryWorkers
+      ResourceId:
+        Fn::Sub: service/${ClusterWorkers}/${ServiceSentryWorkers.Name}
+      RoleARN:
+        Fn::GetAtt: ScalingRole.Arn
+      ScalableDimension: ecs:service:DesiredCount
+      ServiceNamespace: ecs
+
+  CpuAutoScalingPolicySentryWorkers:
+    Type: AWS::ApplicationAutoScaling::ScalingPolicy
+    Properties:
+      PolicyName:
+        Fn::Sub: ${AWS::StackName}-Cpu-SentryWorkers
+      PolicyType: TargetTrackingScaling
+      ScalingTargetId:
+        Ref: AutoScalingTargetSentryWorkers
+      TargetTrackingScalingPolicyConfiguration:
+        DisableScaleIn: false
+        TargetValue: 40
+        ScaleInCooldown: 600
+        ScaleOutCooldown: 60
+        PredefinedMetricSpecification: 
+          PredefinedMetricType: ECSServiceAverageCPUUtilization
+
+  RamAutoScalingPolicySentryWorkers:
+    Type: AWS::ApplicationAutoScaling::ScalingPolicy
+    Properties:
+      PolicyName:
+        Fn::Sub: ${AWS::StackName}-Ram-SentryWorkers
+      PolicyType: TargetTrackingScaling
+      ScalingTargetId:
+        Ref: AutoScalingTargetSentryWorkers
+      TargetTrackingScalingPolicyConfiguration:
+        DisableScaleIn: false
+        TargetValue: 40 
+        ScaleInCooldown: 600
+        ScaleOutCooldown: 60
+        PredefinedMetricSpecification: 
+          PredefinedMetricType: ECSServiceAverageMemoryUtilization
+
   TaskDefinitionClickHouseBootstrap:
     Type: AWS::ECS::TaskDefinition
     Properties: