Skip to content
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

Updates for javabuilder-demo to go live #393

Merged
merged 18 commits into from
May 24, 2023
Merged

Updates for javabuilder-demo to go live #393

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0796b9e
update limit and change alert description
molly-moen May 23, 2023
635e9d3
try using version 2.7.5
molly-moen May 23, 2023
d2ac1f8
try using version 2.7.8
molly-moen May 23, 2023
5274aaf
add dev config
molly-moen May 23, 2023
1a8f5b1
update alarm config
molly-moen May 23, 2023
2fce118
add whitespace
molly-moen May 23, 2023
afbef71
commas
molly-moen May 23, 2023
be0803b
try parens
molly-moen May 23, 2023
00f8514
hard-code limits
molly-moen May 23, 2023
1a61534
add period
molly-moen May 23, 2023
c02c2b4
temporarily change config for testing
molly-moen May 23, 2023
b831183
change back to demo config
molly-moen May 24, 2023
8f27db7
increase provisioned executions
molly-moen May 24, 2023
ecc280b
remove dev config
molly-moen May 24, 2023
d1f6bec
switch to parameters
molly-moen May 24, 2023
90215f0
fix linting errors
molly-moen May 24, 2023
a514164
add quotes
molly-moen May 24, 2023
a7be0d9
revert dev config change
molly-moen May 24, 2023
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
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
2.7.8
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was needed for the ci/cd pipeline to build correctly for a dev instance, so I think it will be needed for prod as well. We've done similar changes in the past to keep up the the AWS version of ruby.

4 changes: 2 additions & 2 deletions cicd/3-app/javabuilder/config/production-demo.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"BaseDomainName": "code.org",
"SubdomainName": "javabuilder-demo",
"BaseDomainNameHostedZonedID": "Z2LCOI49SCXUGU",
"ProvisionedConcurrentExecutions": "1",
"ReservedConcurrentExecutions": "5",
"ProvisionedConcurrentExecutions": "5",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went with 5 here somewhat arbitrarily, lmk if we have another number we want to go with.

"ReservedConcurrentExecutions": "50",
"LimitPerHour": "-1",
"LimitPerDay": "50",
"SilenceAlerts": "false"
Expand Down
14 changes: 8 additions & 6 deletions cicd/3-app/javabuilder/template.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Globals:
Tracing: Active
Conditions:
IsDevCondition: !Equals [!Ref BaseDomainName, "dev-code.org"]
IsDemoCondition: !Equals [!Ref SubdomainName, "javabuilder-demo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you continued the existing pattern here, but we should try to keep this template environment-agnostic, and I would much rather refactor the design to allow us to eliminate the IsDevCondition rather than add a new IsEnvironmentCondition

You're using IsDemoCondition in two places, so I'll make comments directly there.

Copy link
Contributor

@cat5inthecradle cat5inthecradle May 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR to start eliminating IsDevCondition, definitely a non-school-year project ;)
#394

SilenceAlertsCondition: !Or [Condition: IsDevCondition, !Equals [!Ref SilenceAlerts, "true"]]
Resources:
# Note: We can't update the name of a DomainName resource once it has been created because the
Expand Down Expand Up @@ -857,18 +858,19 @@ Resources:
Properties:
AlarmName: !Sub "${SubdomainName}_<%=name.downcase%>_high_concurrent_executions"
AlarmDescription: !Sub |
Alarm if javabuilder usage exceeds 400 concurrent
executions for 10 minutes. Occasional spikes are expected, but
long-running high usage is an indication of an attack. Page the student learning
team for further investigation. See this doc for investigation steps
Alarm if javabuilder usage has high concurrent executions for 10 minutes.
Occasional spikes are expected, but long-running high usage is an indication
of an attack. If this is occuring on the demo environment, this is a non-urgent
issue as we expect occasional periods of high usage. If it is on production,
page the student learning team for further investigation. See this doc for investigation steps
https://docs.google.com/document/d/1bHvV6pvUcwxgZpw0YWBmxFggQL5KqYx9zwolwkZhjU8/edit#bookmark=id.xs1gcuxrw6ze
ActionsEnabled: true
AlarmActions:
- !If [SilenceAlertsCondition, !Ref AWS::NoValue, !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:CDO-Urgent"]
- !If [SilenceAlertsCondition, !Ref AWS::NoValue, !If [IsDemoCondition, !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:javabuilder-demo-high-concurrency", !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:CDO-Urgent"]]
cat5inthecradle marked this conversation as resolved.
Show resolved Hide resolved
EvaluationPeriods: 10
DatapointsToAlarm: 10
Period: 60
Threshold: 400
Threshold: !If [IsDemoCondition, 45, 400]
cat5inthecradle marked this conversation as resolved.
Show resolved Hide resolved
ComparisonOperator: GreaterThanThreshold
TreatMissingData: notBreaching
MetricName: ConcurrentExecutions
Expand Down