Updates for javabuilder-demo to go live #393
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.7.8 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,14 @@ Parameters: | |
| AllowedValues: [true, false] | ||
| Description: If alerts should be silenced on this instance | ||
| Default: false | ||
| HighConcurrentExecutionsTopic: | ||
| Type: String | ||
| Description: The name of the SNS topic to publish to for a high concurrent executions alarm. | ||
| Default: CDO-Urgent | ||
| HighConcurrentExecutionsAlarmThreshold: | ||
| Type: Number | ||
| Description: The threshold for the high concurrent executions alarm. | ||
| Default: 400 | ||
| <% | ||
| JAVALAB_APP_TYPES = %w( | ||
| Theater | ||
|
|
@@ -63,6 +71,7 @@ Globals: | |
| Tracing: Active | ||
| Conditions: | ||
| IsDevCondition: !Equals [!Ref BaseDomainName, "dev-code.org"] | ||
| IsDemoCondition: !Equals [!Ref SubdomainName, "javabuilder-demo"] | ||
|
There was a problem hiding this comment. 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 You're using There was a problem hiding this comment. PR to start eliminating |
||
| 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 | ||
|
|
@@ -857,18 +866,19 @@ Resources: | |
| Properties: | ||
| AlarmName: !Sub "${SubdomainName}_<%=name.downcase%>_high_concurrent_executions" | ||
| AlarmDescription: !Sub | | ||
| 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}:{HighConcurrentExecutionsTopic}"]] | ||
| EvaluationPeriods: 10 | ||
| DatapointsToAlarm: 10 | ||
| Period: 60 | ||
| Threshold: !Ref HighConcurrentExecutionsAlarmThreshold | ||
| ComparisonOperator: GreaterThanThreshold | ||
| TreatMissingData: notBreaching | ||
| MetricName: ConcurrentExecutions | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.