Skip to content

Commit 12eee79

Browse files
authored
Merge pull request #1577 from guardian/ja-remove-scaling-policy
Remove scaling policy
2 parents e82ab1f + 7836f6e commit 12eee79

1 file changed

Lines changed: 0 additions & 61 deletions

File tree

report/conf/report.yaml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,9 @@ Mappings:
1010
StageVariables:
1111
CODE:
1212
NotificationAlarmPeriod: 1200
13-
ScalingUpPeriod: 300
14-
ScalingUpThreshold: 20
15-
ScalingDownPeriod: 300
16-
ScalingDownThreshold: 15
1713
InstanceType: "t4g.micro"
1814
PROD:
1915
NotificationAlarmPeriod: 1200
20-
ScalingUpPeriod: 300
21-
ScalingUpThreshold: 20
22-
ScalingDownPeriod: 300
23-
ScalingDownThreshold: 15
2416
InstanceType: "t4g.micro"
2517
Outputs:
2618
LoadBalancerUrl:
@@ -77,44 +69,6 @@ Resources:
7769
TTL: 60
7870
Type: CNAME
7971

80-
HighCpuAlarm:
81-
Type: AWS::CloudWatch::Alarm
82-
Properties:
83-
AlarmActions: [!Ref ScaleUpPolicy]
84-
AlarmDescription: !Sub
85-
- Scale-Up if cpu is greater than ${Threshold}% over last ${Period} seconds
86-
- Threshold: !FindInMap [ StageVariables, !Ref Stage, ScalingUpThreshold ]
87-
Period: !FindInMap [ StageVariables, !Ref Stage, ScalingUpPeriod ]
88-
ComparisonOperator: GreaterThanOrEqualToThreshold
89-
Dimensions:
90-
- Name: AutoScalingGroupName
91-
Value: !Ref PrivateReportAutoscalingGroup
92-
EvaluationPeriods: 1
93-
MetricName: CPUUtilization
94-
Namespace: AWS/EC2
95-
Period: !FindInMap [ StageVariables, !Ref Stage, ScalingUpPeriod ]
96-
Statistic: Average
97-
Threshold: !FindInMap [ StageVariables, !Ref Stage, ScalingUpThreshold ]
98-
99-
LowCpuAlarm:
100-
Type: AWS::CloudWatch::Alarm
101-
Properties:
102-
AlarmActions: [!Ref ScaleDownPolicy]
103-
AlarmDescription: !Sub
104-
- Scale-Down if cpu is lower than ${Threshold}% over last ${Period} seconds
105-
- Threshold: !FindInMap [ StageVariables, !Ref Stage, ScalingDownThreshold ]
106-
Period: !FindInMap [ StageVariables, !Ref Stage, ScalingDownPeriod ]
107-
ComparisonOperator: LessThanThreshold
108-
Dimensions:
109-
- Name: AutoScalingGroupName
110-
Value: !Ref PrivateReportAutoscalingGroup
111-
EvaluationPeriods: 1
112-
MetricName: CPUUtilization
113-
Namespace: AWS/EC2
114-
Period: !FindInMap [ StageVariables, !Ref Stage, ScalingDownPeriod ]
115-
Statistic: Average
116-
Threshold: !FindInMap [ StageVariables, !Ref Stage, ScalingDownThreshold ]
117-
11872
InstanceSecurityGroup:
11973
Type: AWS::EC2::SecurityGroup
12074
Properties:
@@ -281,18 +235,3 @@ Resources:
281235
/opt/aws-kinesis-agent/configure-aws-kinesis-agent ${AWS::Region} mobile-log-aggregation-${Stage} /var/log/${App}/application.log
282236
- Stack: !FindInMap [Constants, Stack, Value]
283237
App: !FindInMap [Constants, App, Value]
284-
ScaleDownPolicy:
285-
Type: AWS::AutoScaling::ScalingPolicy
286-
Properties:
287-
AdjustmentType: ChangeInCapacity
288-
AutoScalingGroupName: !Ref PrivateReportAutoscalingGroup
289-
Cooldown: 3600
290-
ScalingAdjustment: -1
291-
ScaleUpPolicy:
292-
Type: AWS::AutoScaling::ScalingPolicy
293-
Properties:
294-
AdjustmentType: PercentChangeInCapacity
295-
AutoScalingGroupName: !Ref PrivateReportAutoscalingGroup
296-
Cooldown: 300
297-
ScalingAdjustment: 100
298-

0 commit comments

Comments
 (0)