{{ctrl.loadBalancer.name}}
-
page-location="details"
on-update="ctrl.application.loadBalancers.refresh()"
>
-
app="ctrl.application"
load-balancer="ctrl.loadBalancer"
load-balancer-from-params="ctrl.loadBalancerFromParams"
- >
-
+ >
+
Insight
@@ -62,7 +64,9 @@
Created
{{ctrl.loadBalancer.elb.createdTime | timestamp}}
In
- {{ctrl.loadBalancer.region}}
+
+ {{ctrl.loadBalancer.region}}
+
VPC
Subnet
@@ -80,32 +84,42 @@
-
+
-
+
- Target Groups
-
-
-
+ provider: 'aws'})"
+ >
{{targetGroup.name}}
@@ -115,11 +129,14 @@
- DNS Name
-
- {{ctrl.loadBalancer.elb.dnsname}}
+ {{ctrl.loadBalancer.elb.dnsname}}
+ class="copy-to-clipboard copy-to-clipboard-sm"
+ text="ctrl.loadBalancer.elb.dnsname"
+ tool-tip="'Copy DNS Name to clipboard'"
+ >
@@ -134,54 +151,60 @@
- Load Balancer → Instance
-
- {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}}
- →
+ {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} →
{{listener.listener.instanceProtocol}}:{{listener.listener.instancePort}}
-
-
- {{listener.in}} →
-
-
-
-
-
-
-
- {{action.authenticateOidcConfig.clientId}}
-
-
- {{action.authenticateOidcConfig.clientId}}
-
+
+
+ {{listener.in}} →
+
+
+
+
+
+
+
+ {{action.authenticateOidcConfig.clientId}}
+
+
+ {{action.authenticateOidcConfig.clientId}}
-
-
-
-
+
+
- {{action.targetGroupName}}
-
-
-
-
+ provider: 'aws'})"
+ >
{{action.targetGroupName}}
-
-
+
+
+
+
+ {{action.targetGroupName}}
+
+
-
-
+
{{securityGroup.name}} ({{securityGroup.id}})
@@ -195,7 +218,7 @@ No subnets
{{subnet.id}}
- Purpose
- - {{subnet.purpose}}
+
- {{subnet.purpose}}
- State
- {{subnet.state}}
diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
index f848b5c812e..e9844af7e31 100644
--- a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
+++ b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
@@ -1,9 +1,7 @@
-
-
-
+
@@ -52,7 +56,6 @@
-
@@ -28,13 +25,25 @@
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
index 8cb800c0dfa..4d70d7e8d7d 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
@@ -6,34 +6,30 @@
-
-
+
+
@@ -41,8 +37,7 @@
@@ -51,81 +46,96 @@
-
-
+
+
-
+
-
- Key
- Value
- Actions
-
+
+ Key
+ Value
+ Actions
+
-
-
- {{key}}
-
-
-
-
-
- Remove
-
-
+
+
+ {{key}}
+
+
+
+
+
+ Remove
+
+
-
-
-
- Add Extended Attribute
-
-
-
+
+
+
+ Add Extended Attribute
+
+
+
-
-
+
+
-
- GB (minimum: {{viewState.minRootVolumeSize}})
+
+
+ GB (minimum: {{viewState.minRootVolumeSize}})
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
index 10fea9923dd..9fafcbf8b55 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
@@ -9,7 +9,8 @@
component="stage"
accounts="accounts"
single-region="true"
- cluster-field="targetCluster">
+ cluster-field="targetCluster"
+ >
@@ -14,8 +12,7 @@
@@ -21,18 +22,20 @@
Capacity
@@ -44,34 +47,48 @@
Desired
-
-
-
+
+
+
+
+
+
+
+
+
@@ -80,39 +97,43 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
index 13b423a946b..fc3707e6936 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
@@ -1,5 +1,3 @@
- Clone Server Group:
- {{step.context.source.serverGroupName}}
- ({{step.context.region}})
+ Clone Server Group: {{step.context.source.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
index 7311e69f3a8..59a063c4a45 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
@@ -1,9 +1,6 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
index c9bac9c56ec..0f172440730 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
@@ -1,5 +1,3 @@
- Destroy Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Destroy Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
index 15cb2ad2747..21fc7f72cdf 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
@@ -1,16 +1,11 @@
-
+
-
+
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
index bf9b915777b..d078cf0a813 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
@@ -1,5 +1,3 @@
- Disable Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Disable Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
index 9134f9aef72..0194889b9df 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
@@ -1,26 +1,26 @@
-
+
Keep the
-
-
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
index aa53b4a3653..80332daf007 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
@@ -1,16 +1,11 @@
-
+
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
index 9261272f7f8..5a77ae17c0f 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
@@ -1,5 +1,3 @@
- Enable Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Enable Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
index cd0377f8d2a..74fc717b901 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
@@ -3,7 +3,8 @@
application="application"
component="stage"
accounts="accounts"
- show-all-regions="true">
+ show-all-regions="true"
+ >
@@ -16,8 +17,7 @@
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
index c64edd29b0b..a21001b7bbb 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
@@ -1,7 +1,6 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
index bfacd8ac4e8..bcf6ca86944 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
@@ -1,21 +1,18 @@
-
-
+
-
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
index 7d1a7eb96c2..49aff42605c 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
@@ -4,52 +4,53 @@
-
-
+
-
-
+
-
+
-
+
- This is the percentage by which the target server group's capacity will be
- increased
+ This is the percentage by which the target server group's capacity will be increased
-
+
- This is the exact amount by which the target server group's capacity will be
- increased
+ This is the exact amount by which the target server group's capacity will be increased
@@ -70,13 +71,13 @@
-
+
-
+
-
+
@@ -84,8 +85,6 @@
This is the exact amount to which the target server group will be scaled
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
index e5367545a71..38f05963435 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
@@ -1,7 +1,5 @@
- Resize Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
{{step.name}}
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
index 686270fa1e0..cbd2cc8a890 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
@@ -1,33 +1,30 @@
-
+
-
+
Wait
-
seconds between regional rollbacks.
Consider rollback successful when
-
percent of instances are healthy.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
index c30ceb1a290..78aea4a840f 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
@@ -1,31 +1,33 @@
-
-
+
-
- Keep the
-
-
-
-
-
- {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size.
+
+ Keep the
+
+
+
+
+
+ {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size.
+
The remaining server groups will be scaled down to zero instances.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
index 77750d30024..41e79122ca1 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
@@ -1,21 +1,21 @@
-
-
+
-
Shrink to
-
+
{{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the
-
+
@@ -24,13 +24,11 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
index a7c2cac3df7..8a84fd37d3c 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
@@ -8,7 +8,7 @@
- Amazon
- Images
-
- {{target.imageName}}
+ {{target.imageName}}
{{target.regions.join(', ')}}
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
index 57473bf7691..d427709b616 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
@@ -8,10 +8,12 @@
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
index a8475ff64ab..3d3b19d1115 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
@@ -1,21 +1,34 @@
-
- {{$ctrl.rule.name || $ctrl.rule.id}}
+
+ {{ $ctrl.rule.name || $ctrl.rule.id }}
Account
-
+
VPC
-
-
+
+
@@ -25,27 +38,33 @@
Group
-
-
- {{$select.selected}}
-
+
+
+ {{ $select.selected }}
+
-
+
Select from a different account or VPC
diff --git a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
index 13954d5e3cb..456db1c5f99 100644
--- a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
+++ b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
@@ -5,8 +5,7 @@ Could not find {{group}}.
Could not find {{group}}.
{{securityGroup.name || '(not found)'}}
-
page-location="details"
on-update="ctrl.application.securityGroups.refresh()"
>
-
@@ -39,13 +36,19 @@
@@ -18,7 +17,6 @@
@@ -69,15 +72,19 @@
None
-
+
- IP Range
- {{ipRangeRule.address}}
- Port Ranges
-
All ports and protocols
- Additional port ranges are specified, but redundant:
+
+ Additional port ranges are specified, but redundant:
+
{{rule.protocol}}: {{rule.startPort}} → {{rule.endPort}}
@@ -85,15 +92,25 @@
-
+
None
-
+
-
-
-
+
+
{{rule.securityGroup.name}} ({{rule.securityGroup.id}})
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
index 5170a35bff8..c75ed3a1dad 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
@@ -8,9 +8,10 @@ Edit Advanced Settings for {{serverGroup.name}}
Cooldown
- seconds
+
+
+
+ seconds
@@ -18,56 +19,53 @@ Edit Advanced Settings for {{serverGroup.name}}
-
{{$item}}
-
+
-
Health Check Type
-
{{$select.selected}}
-
+
-
Health Check Grace Period
- seconds
+
+
+
+ seconds
Termination Policies
-
{{$item}}
-
+
-
-
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
index 573fafee6e2..f82c6485209 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
@@ -11,19 +11,21 @@ Rollback {{serverGroup.name}}
Restore to
-
+
{{ctrl.label($select.selected)}}
- {{ previousServerGroup.name }} (no longer deployed)
+ {{ previousServerGroup.name }} (no longer deployed)
Image: {{ previousServerGroup.imageName}}
- ({{ previousServerGroup.imageId }})
+ ({{ previousServerGroup.imageId }})
Build #{{ previousServerGroup.buildNumber }}
@@ -34,10 +36,12 @@ Rollback {{serverGroup.name}}
-
+
@@ -47,11 +51,13 @@ Rollback {{serverGroup.name}}
Wait
-
+
seconds before disabling {{ ctrl.label(serverGroup) }}.
@@ -59,11 +65,12 @@ Rollback {{serverGroup.name}}
Consider rollback successful when
-
percent of instances are healthy.
@@ -78,23 +85,26 @@ Rollback {{serverGroup.name}}
- Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
- - Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
- -
- Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
- instances to report as healthy
-
+ -
+ Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
+ min: {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max
+ }}, desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at
+ {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
+
+
+ -
+ Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to
+ report as healthy
-
Wait {{ command.rollbackContext.delayBeforeDisableSeconds }} seconds
- Disable {{ serverGroup.name }}
- - Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [
- min: {{ serverGroup.capacity.min }}
- ]
+ -
+ Restore minimum capacity of
+ {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [
+ min: {{ serverGroup.capacity.min }} ]
+
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}).
@@ -104,32 +114,34 @@
Rollback {{serverGroup.name}}
- - Deploy {{ previousServerGroup.imageId }} [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
- -
- Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
- instances to report as healthy
-
+ -
+ Deploy {{ previousServerGroup.imageId }} [ min:
+ {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max }},
+ desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at
+ {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
+
+ -
+ Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to
+ report as healthy
- Disable {{ serverGroup.name }}
- - Restore minimum capacity of new server group [
- min: {{ serverGroup.capacity.min }}
- ]
+ -
+ Restore minimum capacity of new server group [ min: {{ serverGroup.capacity.min
+ }} ]
+
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}).
-
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
index c284d626b1b..209a6a3ddd2 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
@@ -1,17 +1,19 @@
-{{$ctrl.policy.policyType | robotToHuman | uppercase }}
+{{ $ctrl.policy.policyType | robotToHuman | uppercase }}
-
+
Whenever
- {{alarm.statistic}} of {{alarm.metricName}}
- is {{alarm.threshold}}
+ {{ alarm.statistic }} of {{ alarm.metricName }} is
+ {{ alarm.threshold }}
for at least
- {{alarm.evaluationPeriods}} consecutive periods of {{alarm.period}} seconds
+ {{ alarm.evaluationPeriods }} consecutive periods of {{ alarm.period }} seconds
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
index f0bb13c1ab3..71c9c4187bc 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
index 3e5907372b9..04bb886f26d 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
@@ -6,6 +6,8 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
index 95374340d4f..1a89ec287c2 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
@@ -2,86 +2,98 @@
- Whenever
-
- {{$ctrl.alarm.statistic}} of {{$ctrl.alarm.metricName}} is
- {{$ctrl.alarm.threshold}}
+ {{ $ctrl.alarm.statistic }} of {{ $ctrl.alarm.metricName }} is
+ {{ $ctrl.alarm.threshold }}
- for at least
- -
- {{$ctrl.alarm.evaluationPeriods}} consecutive periods of {{$ctrl.alarm.period}} seconds
-
+ - {{ $ctrl.alarm.evaluationPeriods }} consecutive periods of {{ $ctrl.alarm.period }} seconds
- then
-
- if {{$ctrl.alarm.metricName}}
+ if {{ $ctrl.alarm.metricName }}
-
+
is between
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
and
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
- is greater than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ is greater than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
-
+
is between
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
and
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
- is less than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
-
- ,
+ is less than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
+ ,
- set capacity
- to {{stepAdjustment.scalingAdjustment}} instances
+ set capacity to {{ stepAdjustment.scalingAdjustment }} instances
-
- {{stepAdjustment.operator}} capacity
+
+ {{ stepAdjustment.operator }} capacity
- by {{stepAdjustment.absAdjustment}}%
+ by {{ stepAdjustment.absAdjustment }}%
- by {{stepAdjustment.absAdjustment}} instances
+ by {{ stepAdjustment.absAdjustment }} instances
-
- set capacity
- to {{$ctrl.policy.scalingAdjustment}} instances
+ set capacity to {{ $ctrl.policy.scalingAdjustment }} instances
-
- {{$ctrl.policy.operator}} capacity
+
+ {{ $ctrl.policy.operator }} capacity
- by {{$ctrl.policy.absAdjustment}}%
+ by {{ $ctrl.policy.absAdjustment }}%
- by {{$ctrl.policy.absAdjustment}} instances
+ by {{ $ctrl.policy.absAdjustment }} instances
- in
-
- increments of at least {{$ctrl.policy.minAdjustmentMagnitude}} instances
+ increments of at least {{ $ctrl.policy.minAdjustmentMagnitude }} instances
- wait
- -
- {{$ctrl.policy.cooldown}} seconds before allowing another scaling activity.
-
+ - {{ $ctrl.policy.cooldown }} seconds before allowing another scaling activity.
-
- {{$ctrl.policy.estimatedInstanceWarmup}} seconds to warm up after each step.
+ {{ $ctrl.policy.estimatedInstanceWarmup }} seconds to warm up after each step.
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
index 35ffa5f11cd..869a8219fbc 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
index bd64cd17cc1..6cc07f2083d 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
index ceefcc8cce0..aba18b33b22 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
@@ -8,16 +8,20 @@ {{$ctrl.policy.policyName ? "Update" : "Create"}} scaling policy
@@ -18,11 +21,8 @@
Region
-
+
+
@@ -30,11 +30,15 @@
Stack
-
+
+
+
@@ -91,17 +87,11 @@
-
+
@@ -110,9 +100,11 @@
-
+
@@ -120,22 +112,23 @@
+ expected-artifacts="command.backingData.expectedArtifacts"
+ selected="gcsArtifactDelegate.getSelectedExpectedArtifact()"
+ on-change="gcsArtifactController.onArtifactChange"
+ on-request-create="gcsArtifactController.onRequestCreate"
+ offered-artifact-types="gcsArtifactDelegate.getOfferedArtifactTypes()"
+ requesting-new="showCreateArtifactForm"
+ >
-
@@ -145,56 +138,56 @@
-
+
+
- Git Repository URL
+ Git Repository URL
+
-
+
+
- Git Credential Type
+ Git Credential Type
+
-
+
-
- Branch
-
+ Branch
-
+
-
+
@@ -204,13 +197,16 @@
-
-
- Resolve via trigger
-
-
- Click for text input
-
+
+
+ Resolve via trigger
+
+
+ Click for text input
+
@@ -220,17 +216,11 @@
-
+
@@ -238,22 +228,23 @@
+ expected-artifacts="command.backingData.expectedArtifacts"
+ selected="containerArtifactDelegate.getSelectedExpectedArtifact()"
+ on-change="containerArtifactController.onArtifactChange"
+ on-request-create="containerArtifactController.onRequestCreate"
+ offered-artifact-types="containerArtifactDelegate.getOfferedArtifactTypes()"
+ requesting-new="showCreateArtifactForm"
+ >
-
@@ -263,11 +254,14 @@
-
+ ng-model="command.containerImageUrl"
+ />
+
-
+
-
+
- Target Groups
-
-
-
+ provider: 'aws'})"
+ >
{{targetGroup.name}}
@@ -115,11 +129,14 @@
- DNS Name
-
- {{ctrl.loadBalancer.elb.dnsname}}
+ {{ctrl.loadBalancer.elb.dnsname}}
+ class="copy-to-clipboard copy-to-clipboard-sm"
+ text="ctrl.loadBalancer.elb.dnsname"
+ tool-tip="'Copy DNS Name to clipboard'"
+ >
@@ -134,54 +151,60 @@
- Load Balancer → Instance
-
- {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}}
- →
+ {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} →
{{listener.listener.instanceProtocol}}:{{listener.listener.instancePort}}
-
-
- {{listener.in}} →
-
-
-
-
-
-
-
- {{action.authenticateOidcConfig.clientId}}
-
-
- {{action.authenticateOidcConfig.clientId}}
-
+
+
+ {{listener.in}} →
+
+
+
+
+
+
+
+ {{action.authenticateOidcConfig.clientId}}
+
+
+ {{action.authenticateOidcConfig.clientId}}
-
-
-
-
+
+
- {{action.targetGroupName}}
-
-
-
-
+ provider: 'aws'})"
+ >
{{action.targetGroupName}}
-
-
+
+
+
+
+ {{action.targetGroupName}}
+
+
-
-
+
{{securityGroup.name}} ({{securityGroup.id}})
@@ -195,7 +218,7 @@ No subnets
{{subnet.id}}
- Purpose
- - {{subnet.purpose}}
+
- {{subnet.purpose}}
- State
- {{subnet.state}}
diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
index f848b5c812e..e9844af7e31 100644
--- a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
+++ b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html
@@ -1,9 +1,7 @@
-
-
-
+
@@ -52,7 +56,6 @@
-
@@ -28,13 +25,25 @@
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
index 8cb800c0dfa..4d70d7e8d7d 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html
@@ -6,34 +6,30 @@
-
-
+
+
@@ -41,8 +37,7 @@
@@ -51,81 +46,96 @@
-
-
+
+
-
+
-
- Key
- Value
- Actions
-
+
+ Key
+ Value
+ Actions
+
-
-
- {{key}}
-
-
-
-
-
- Remove
-
-
+
+
+ {{key}}
+
+
+
+
+
+ Remove
+
+
-
-
-
- Add Extended Attribute
-
-
-
+
+
+
+ Add Extended Attribute
+
+
+
-
-
+
+
-
- GB (minimum: {{viewState.minRootVolumeSize}})
+
+
+ GB (minimum: {{viewState.minRootVolumeSize}})
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
index 10fea9923dd..9fafcbf8b55 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html
@@ -9,7 +9,8 @@
component="stage"
accounts="accounts"
single-region="true"
- cluster-field="targetCluster">
+ cluster-field="targetCluster"
+ >
@@ -14,8 +12,7 @@
@@ -21,18 +22,20 @@
Capacity
@@ -44,34 +47,48 @@
Desired
-
-
-
+
+
+
+
+
+
+
+
+
@@ -80,39 +97,43 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
index 13b423a946b..fc3707e6936 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html
@@ -1,5 +1,3 @@
- Clone Server Group:
- {{step.context.source.serverGroupName}}
- ({{step.context.region}})
+ Clone Server Group: {{step.context.source.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
index 7311e69f3a8..59a063c4a45 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html
@@ -1,9 +1,6 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
index c9bac9c56ec..0f172440730 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html
@@ -1,5 +1,3 @@
- Destroy Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Destroy Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
index 15cb2ad2747..21fc7f72cdf 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html
@@ -1,16 +1,11 @@
-
+
-
+
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
index bf9b915777b..d078cf0a813 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html
@@ -1,5 +1,3 @@
- Disable Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Disable Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
index 9134f9aef72..0194889b9df 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html
@@ -1,26 +1,26 @@
-
+
Keep the
-
-
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
index aa53b4a3653..80332daf007 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html
@@ -1,16 +1,11 @@
-
+
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
index 9261272f7f8..5a77ae17c0f 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html
@@ -1,5 +1,3 @@
- Enable Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Enable Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
index cd0377f8d2a..74fc717b901 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html
@@ -3,7 +3,8 @@
application="application"
component="stage"
accounts="accounts"
- show-all-regions="true">
+ show-all-regions="true"
+ >
@@ -16,8 +17,7 @@
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
index c64edd29b0b..a21001b7bbb 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html
@@ -1,7 +1,6 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
index bfacd8ac4e8..bcf6ca86944 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html
@@ -1,21 +1,18 @@
-
-
+
-
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
index 7d1a7eb96c2..49aff42605c 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html
@@ -4,52 +4,53 @@
-
-
+
-
-
+
-
+
-
+
- This is the percentage by which the target server group's capacity will be
- increased
+ This is the percentage by which the target server group's capacity will be increased
-
+
- This is the exact amount by which the target server group's capacity will be
- increased
+ This is the exact amount by which the target server group's capacity will be increased
@@ -70,13 +71,13 @@
-
+
-
+
-
+
@@ -84,8 +85,6 @@
This is the exact amount to which the target server group will be scaled
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
index e5367545a71..38f05963435 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html
@@ -1,7 +1,5 @@
- Resize Server Group:
- {{step.context.serverGroupName}}
- ({{step.context.region}})
+ Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}})
{{step.name}}
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
index 686270fa1e0..cbd2cc8a890 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html
@@ -1,33 +1,30 @@
-
+
-
+
Wait
-
seconds between regional rollbacks.
Consider rollback successful when
-
percent of instances are healthy.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
index c30ceb1a290..78aea4a840f 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html
@@ -1,31 +1,33 @@
-
-
+
-
- Keep the
-
-
-
-
-
- {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size.
+
+ Keep the
+
+
+
+
+
+ {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size.
+
The remaining server groups will be scaled down to zero instances.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
index 77750d30024..41e79122ca1 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html
@@ -1,21 +1,21 @@
-
-
+
-
Shrink to
-
+
{{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the
-
+
@@ -24,13 +24,11 @@
-
+
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
index a7c2cac3df7..8a84fd37d3c 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html
@@ -8,7 +8,7 @@
- Amazon
- Images
-
- {{target.imageName}}
+ {{target.imageName}}
{{target.regions.join(', ')}}
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
index 57473bf7691..d427709b616 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
@@ -8,10 +8,12 @@
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
index a8475ff64ab..3d3b19d1115 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
@@ -1,21 +1,34 @@
-
- {{$ctrl.rule.name || $ctrl.rule.id}}
+
+ {{ $ctrl.rule.name || $ctrl.rule.id }}
Account
-
+
VPC
-
-
+
+
@@ -25,27 +38,33 @@
Group
-
-
- {{$select.selected}}
-
+
+
+ {{ $select.selected }}
+
-
+
Select from a different account or VPC
diff --git a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
index 13954d5e3cb..456db1c5f99 100644
--- a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
+++ b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html
@@ -5,8 +5,7 @@ Could not find {{group}}.
Could not find {{group}}.
{{securityGroup.name || '(not found)'}}
-
page-location="details"
on-update="ctrl.application.securityGroups.refresh()"
>
-
@@ -39,13 +36,19 @@
@@ -18,7 +17,6 @@
@@ -69,15 +72,19 @@
None
-
+
- IP Range
- {{ipRangeRule.address}}
- Port Ranges
-
All ports and protocols
- Additional port ranges are specified, but redundant:
+
+ Additional port ranges are specified, but redundant:
+
{{rule.protocol}}: {{rule.startPort}} → {{rule.endPort}}
@@ -85,15 +92,25 @@
-
+
None
-
+
-
-
-
+
+
{{rule.securityGroup.name}} ({{rule.securityGroup.id}})
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
index 5170a35bff8..c75ed3a1dad 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
@@ -8,9 +8,10 @@ Edit Advanced Settings for {{serverGroup.name}}
Cooldown
- seconds
+
+
+
+ seconds
@@ -18,56 +19,53 @@ Edit Advanced Settings for {{serverGroup.name}}
-
{{$item}}
-
+
-
Health Check Type
-
{{$select.selected}}
-
+
-
Health Check Grace Period
- seconds
+
+
+
+ seconds
Termination Policies
-
{{$item}}
-
+
-
-
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
index 573fafee6e2..f82c6485209 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
@@ -11,19 +11,21 @@ Rollback {{serverGroup.name}}
Restore to
-
+
{{ctrl.label($select.selected)}}
- {{ previousServerGroup.name }} (no longer deployed)
+ {{ previousServerGroup.name }} (no longer deployed)
Image: {{ previousServerGroup.imageName}}
- ({{ previousServerGroup.imageId }})
+ ({{ previousServerGroup.imageId }})
Build #{{ previousServerGroup.buildNumber }}
@@ -34,10 +36,12 @@ Rollback {{serverGroup.name}}
-
+
@@ -47,11 +51,13 @@ Rollback {{serverGroup.name}}
Wait
-
+
seconds before disabling {{ ctrl.label(serverGroup) }}.
@@ -59,11 +65,12 @@ Rollback {{serverGroup.name}}
Consider rollback successful when
-
percent of instances are healthy.
@@ -78,23 +85,26 @@ Rollback {{serverGroup.name}}
- Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
- - Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
- -
- Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
- instances to report as healthy
-
+ -
+ Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
+ min: {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max
+ }}, desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at
+ {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
+
+
+ -
+ Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to
+ report as healthy
-
Wait {{ command.rollbackContext.delayBeforeDisableSeconds }} seconds
- Disable {{ serverGroup.name }}
- - Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [
- min: {{ serverGroup.capacity.min }}
- ]
+ -
+ Restore minimum capacity of
+ {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [
+ min: {{ serverGroup.capacity.min }} ]
+
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}).
@@ -104,32 +114,34 @@
Rollback {{serverGroup.name}}
- - Deploy {{ previousServerGroup.imageId }} [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
- -
- Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
- instances to report as healthy
-
+ -
+ Deploy {{ previousServerGroup.imageId }} [ min:
+ {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max }},
+ desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at
+ {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
+
+ -
+ Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to
+ report as healthy
- Disable {{ serverGroup.name }}
- - Restore minimum capacity of new server group [
- min: {{ serverGroup.capacity.min }}
- ]
+ -
+ Restore minimum capacity of new server group [ min: {{ serverGroup.capacity.min
+ }} ]
+
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}).
-
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
index c284d626b1b..209a6a3ddd2 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html
@@ -1,17 +1,19 @@
-{{$ctrl.policy.policyType | robotToHuman | uppercase }}
+{{ $ctrl.policy.policyType | robotToHuman | uppercase }}
-
+
Whenever
- {{alarm.statistic}} of {{alarm.metricName}}
- is {{alarm.threshold}}
+ {{ alarm.statistic }} of {{ alarm.metricName }} is
+ {{ alarm.threshold }}
for at least
- {{alarm.evaluationPeriods}} consecutive periods of {{alarm.period}} seconds
+ {{ alarm.evaluationPeriods }} consecutive periods of {{ alarm.period }} seconds
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
index f0bb13c1ab3..71c9c4187bc 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
index 3e5907372b9..04bb886f26d 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html
@@ -6,6 +6,8 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
index 95374340d4f..1a89ec287c2 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html
@@ -2,86 +2,98 @@
- Whenever
-
- {{$ctrl.alarm.statistic}} of {{$ctrl.alarm.metricName}} is
- {{$ctrl.alarm.threshold}}
+ {{ $ctrl.alarm.statistic }} of {{ $ctrl.alarm.metricName }} is
+ {{ $ctrl.alarm.threshold }}
- for at least
- -
- {{$ctrl.alarm.evaluationPeriods}} consecutive periods of {{$ctrl.alarm.period}} seconds
-
+ - {{ $ctrl.alarm.evaluationPeriods }} consecutive periods of {{ $ctrl.alarm.period }} seconds
- then
-
- if {{$ctrl.alarm.metricName}}
+ if {{ $ctrl.alarm.metricName }}
-
+
is between
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
and
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
- is greater than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ is greater than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
-
+
is between
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
and
- {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
+ {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
- is less than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}}
-
- ,
+ is less than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
+ ,
- set capacity
- to {{stepAdjustment.scalingAdjustment}} instances
+ set capacity to {{ stepAdjustment.scalingAdjustment }} instances
-
- {{stepAdjustment.operator}} capacity
+
+ {{ stepAdjustment.operator }} capacity
- by {{stepAdjustment.absAdjustment}}%
+ by {{ stepAdjustment.absAdjustment }}%
- by {{stepAdjustment.absAdjustment}} instances
+ by {{ stepAdjustment.absAdjustment }} instances
-
- set capacity
- to {{$ctrl.policy.scalingAdjustment}} instances
+ set capacity to {{ $ctrl.policy.scalingAdjustment }} instances
-
- {{$ctrl.policy.operator}} capacity
+
+ {{ $ctrl.policy.operator }} capacity
- by {{$ctrl.policy.absAdjustment}}%
+ by {{ $ctrl.policy.absAdjustment }}%
- by {{$ctrl.policy.absAdjustment}} instances
+ by {{ $ctrl.policy.absAdjustment }} instances
- in
-
- increments of at least {{$ctrl.policy.minAdjustmentMagnitude}} instances
+ increments of at least {{ $ctrl.policy.minAdjustmentMagnitude }} instances
- wait
- -
- {{$ctrl.policy.cooldown}} seconds before allowing another scaling activity.
-
+ - {{ $ctrl.policy.cooldown }} seconds before allowing another scaling activity.
-
- {{$ctrl.policy.estimatedInstanceWarmup}} seconds to warm up after each step.
+ {{ $ctrl.policy.estimatedInstanceWarmup }} seconds to warm up after each step.
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
index 35ffa5f11cd..869a8219fbc 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
index bd64cd17cc1..6cc07f2083d 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html
@@ -1,3 +1,5 @@
-
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
index ceefcc8cce0..aba18b33b22 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html
@@ -8,16 +8,20 @@ {{$ctrl.policy.policyName ? "Update" : "Create"}} scaling policy
@@ -18,11 +21,8 @@
Region
-
+
+
@@ -30,11 +30,15 @@
Stack
-
+
+
+
@@ -91,17 +87,11 @@
-
+
@@ -110,9 +100,11 @@
-
+
@@ -120,22 +112,23 @@
+ expected-artifacts="command.backingData.expectedArtifacts"
+ selected="gcsArtifactDelegate.getSelectedExpectedArtifact()"
+ on-change="gcsArtifactController.onArtifactChange"
+ on-request-create="gcsArtifactController.onRequestCreate"
+ offered-artifact-types="gcsArtifactDelegate.getOfferedArtifactTypes()"
+ requesting-new="showCreateArtifactForm"
+ >
-
@@ -145,56 +138,56 @@
-
+
+
- Git Repository URL
+ Git Repository URL
+
-
+
+
- Git Credential Type
+ Git Credential Type
+
-
+
-
- Branch
-
+ Branch
-
+
-
+
@@ -204,13 +197,16 @@
-
-
- Resolve via trigger
-
-
- Click for text input
-
+
+
+ Resolve via trigger
+
+
+ Click for text input
+
@@ -220,17 +216,11 @@
-
+
@@ -238,22 +228,23 @@
+ expected-artifacts="command.backingData.expectedArtifacts"
+ selected="containerArtifactDelegate.getSelectedExpectedArtifact()"
+ on-change="containerArtifactController.onArtifactChange"
+ on-request-create="containerArtifactController.onRequestCreate"
+ offered-artifact-types="containerArtifactDelegate.getOfferedArtifactTypes()"
+ requesting-new="showCreateArtifactForm"
+ >
-
@@ -263,11 +254,14 @@
-
+ ng-model="command.containerImageUrl"
+ />
+
-
+
- Target Groups
-
- - + provider: 'aws'})" + > {{targetGroup.name}} @@ -115,11 +129,14 @@
- DNS Name
-
- {{ctrl.loadBalancer.elb.dnsname}}
+ {{ctrl.loadBalancer.elb.dnsname}}
+ class="copy-to-clipboard copy-to-clipboard-sm" + text="ctrl.loadBalancer.elb.dnsname" + tool-tip="'Copy DNS Name to clipboard'" + > - Load Balancer → Instance
- - {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} - → + {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} → {{listener.listener.instanceProtocol}}:{{listener.listener.instancePort}}
- - + {{securityGroup.name}} ({{securityGroup.id}}) @@ -195,7 +218,7 @@
- Purpose -
- {{subnet.purpose}}
+
- {{subnet.purpose}}
- State
- {{subnet.state}} diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html index f848b5c812e..e9844af7e31 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html +++ b/app/scripts/modules/amazon/src/loadBalancer/details/targetGroupDetails.html @@ -1,9 +1,7 @@
- Amazon
- Images
-
- {{target.imageName}}
+ {{target.imageName}}
{{target.regions.join(', ')}}
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
index 57473bf7691..d427709b616 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html
@@ -8,10 +8,12 @@
diff --git a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
index a8475ff64ab..3d3b19d1115 100644
--- a/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
+++ b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html
@@ -1,21 +1,34 @@
- - IP Range
- {{ipRangeRule.address}}
- Port Ranges
-
All ports and protocols
- Additional port ranges are specified, but redundant:++ Additional port ranges are specified, but redundant: +{{rule.protocol}}: {{rule.startPort}} → {{rule.endPort}} @@ -85,15 +92,25 @@
-
-
-
+ + {{rule.securityGroup.name}} ({{rule.securityGroup.id}})
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
index 5170a35bff8..c75ed3a1dad 100644
--- a/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
+++ b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
@@ -8,9 +8,10 @@ - Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} -
- Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback) - - - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy - +
-
+ Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [
+ min: {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max
+ }}, desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at + {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback) +
+
+ - + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
- Wait {{ command.rollbackContext.delayBeforeDisableSeconds }} seconds
- Disable {{ serverGroup.name }} -
- Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ - min: {{ serverGroup.capacity.min }} - ] +
- + Restore minimum capacity of + {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ + min: {{ serverGroup.capacity.min }} ] +
- Deploy {{ previousServerGroup.imageId }} [
- min: {{serverGroup.capacity.desired}},
- max: {{ serverGroup.capacity.max }},
- desired: {{ serverGroup.capacity.desired }}
- ]
(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy) - - - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy - +
-
+ Deploy {{ previousServerGroup.imageId }} [ min:
+ {{serverGroup.capacity.desired}}, max: {{ serverGroup.capacity.max }},
+ desired: {{ serverGroup.capacity.desired }} ]
(minimum capacity pinned at + {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy) +
+ - + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
- Disable {{ serverGroup.name }} -
- Restore minimum capacity of new server group [ - min: {{ serverGroup.capacity.min }} - ] +
- + Restore minimum capacity of new server group [ min: {{ serverGroup.capacity.min + }} ] +
- Whenever
- - {{$ctrl.alarm.statistic}} of {{$ctrl.alarm.metricName}} is - {{$ctrl.alarm.threshold}} + {{ $ctrl.alarm.statistic }} of {{ $ctrl.alarm.metricName }} is + {{ $ctrl.alarm.threshold }}
- for at least -
- - {{$ctrl.alarm.evaluationPeriods}} consecutive periods of {{$ctrl.alarm.period}} seconds - +
- {{ $ctrl.alarm.evaluationPeriods }} consecutive periods of {{ $ctrl.alarm.period }} seconds
- then
-
- if {{$ctrl.alarm.metricName}} + if {{ $ctrl.alarm.metricName }} - + is between - {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}} + {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }} and - {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}} + {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }} - is greater than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}} + is greater than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }} - + is between - {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound}} + {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }} and - {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}} + {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }} - is less than {{$ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound}} - - , + is less than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }} + , - set capacity - to {{stepAdjustment.scalingAdjustment}} instances + set capacity to {{ stepAdjustment.scalingAdjustment }} instances - - {{stepAdjustment.operator}} capacity + + {{ stepAdjustment.operator }} capacity - by {{stepAdjustment.absAdjustment}}% + by {{ stepAdjustment.absAdjustment }}% - by {{stepAdjustment.absAdjustment}} instances + by {{ stepAdjustment.absAdjustment }} instances
- - set capacity - to {{$ctrl.policy.scalingAdjustment}} instances + set capacity to {{ $ctrl.policy.scalingAdjustment }} instances - - {{$ctrl.policy.operator}} capacity + + {{ $ctrl.policy.operator }} capacity - by {{$ctrl.policy.absAdjustment}}% + by {{ $ctrl.policy.absAdjustment }}% - by {{$ctrl.policy.absAdjustment}} instances + by {{ $ctrl.policy.absAdjustment }} instances
- in
- - increments of at least {{$ctrl.policy.minAdjustmentMagnitude}} instances + increments of at least {{ $ctrl.policy.minAdjustmentMagnitude }} instances
- wait -
- - {{$ctrl.policy.cooldown}} seconds before allowing another scaling activity. - +
- {{ $ctrl.policy.cooldown }} seconds before allowing another scaling activity.
- - {{$ctrl.policy.estimatedInstanceWarmup}} seconds to warm up after each step. + {{ $ctrl.policy.estimatedInstanceWarmup }} seconds to warm up after each step.
- -diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html index 13b423a946b..fc3707e6936 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html @@ -1,5 +1,3 @@ - Clone Server Group: - {{step.context.source.serverGroupName}} - ({{step.context.region}}) + Clone Server Group: {{step.context.source.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html index 7311e69f3a8..59a063c4a45 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,9 +1,6 @@- {{listener.in}} → ---- - - - - {{action.authenticateOidcConfig.clientId}} - - - {{action.authenticateOidcConfig.clientId}} - ++++ {{listener.in}} → ++++ + + + + {{action.authenticateOidcConfig.clientId}} + + + {{action.authenticateOidcConfig.clientId}} - - - - + + - {{action.targetGroupName}} - - - - + provider: 'aws'})" + > {{action.targetGroupName}} - -+ + + + + {{action.targetGroupName}} +No subnets
{{subnet.id}}
-@@ -21,18 +22,20 @@-+ @@ -52,7 +56,6 @@diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html index 8cb800c0dfa..4d70d7e8d7d 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html @@ -6,34 +6,30 @@- + + -- + + -+ -
- +Key -Value -Actions -+ -Key +Value +Actions +- +- {{key}} - -- - -- Remove - -+ -+ {{key}} + ++ + ++ Remove + +- +- -- Add Extended Attribute - -+ + ++ Add Extended Attribute + +- + + -- GB (minimum: {{viewState.minRootVolumeSize}}) + + + GB (minimum: {{viewState.minRootVolumeSize}}) - + -- + + -- + + -- + + Capacity@@ -44,34 +47,48 @@Desired- - - ++ +++ +++ ++ -+ diff --git a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html @@ -1,5 +1,3 @@ - Destroy Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Destroy Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html index 15cb2ad2747..21fc7f72cdf 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,16 +1,11 @@ - +diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index e5367545a71..38f05963435 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,7 +1,5 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) {{step.name}} diff --git a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html index 686270fa1e0..cbd2cc8a890 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html @@ -1,33 +1,30 @@-+ + -+ Keep the - -+ -+ + @@ -16,8 +17,7 @@ - + diff --git a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html index bfacd8ac4e8..bcf6ca86944 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html @@ -1,21 +1,18 @@ - -+ - diff --git a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html index 7d1a7eb96c2..49aff42605c 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -4,52 +4,53 @@+ - -+ - + - + - + - This is the percentage by which the target server group's capacity will be - increased + This is the percentage by which the target server group's capacity will be increased- + - This is the exact amount by which the target server group's capacity will be - increased + This is the exact amount by which the target server group's capacity will be increased- +- +- ++ --+ + Wait - seconds between regional rollbacks.Consider rollback successful when - percent of instances are healthy.diff --git a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index c30ceb1a290..78aea4a840f 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html @@ -1,31 +1,33 @@- -+ -Keep the - -
+- - - - {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size.+ Keep the + +
+ + + + {{scaleDownClusterStageCtrl.pluralize('server group', stage.remainingFullSizeServerGroups)}} at current size. +The remaining server groups will be scaled down to zero instances.
- -+ Shrink to - + {{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the -diff --git a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html index a7c2cac3df7..8a84fd37d3c 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html @@ -8,7 +8,7 @@+ + - {{$ctrl.rule.name || $ctrl.rule.id}} + + {{ $ctrl.rule.name || $ctrl.rule.id }} Account-+ VPC-- + + Group--- + Select from a different account or VPC diff --git a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html index 13954d5e3cb..456db1c5f99 100644 --- a/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html +++ b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html @@ -5,8 +5,7 @@- {{$select.selected}} -+ ++ {{ $select.selected }} +Could not find
{{group}}. Could not find
{{group}}. {{securityGroup.name || '(not found)'}}
- page-location="details" on-update="ctrl.application.securityGroups.refresh()" > -None--
+
+ None--
+
Edit Advanced Settings for {{serverGroup.name}}
Cooldown- seconds ++ ++ seconds@@ -18,56 +19,53 @@Edit Advanced Settings for {{serverGroup.name}}
-{{$item}} -+ Health Check Type-{{$select.selected}} -+ Health Check Grace Period- seconds ++ ++ secondsTermination Policies-{{$item}} -+ Rollback {{serverGroup.name}}
Restore to-+ {{ctrl.label($select.selected)}} - {{ previousServerGroup.name }} (no longer deployed)
+ {{ previousServerGroup.name }} (no longer deployed)
Image: {{ previousServerGroup.imageName}} - ({{ previousServerGroup.imageId }})
+ ({{ previousServerGroup.imageId }})
Build #{{ previousServerGroup.buildNumber }} @@ -34,10 +36,12 @@Rollback {{serverGroup.name}}
-+ Rollback {{serverGroup.name}}
Wait - + seconds before disabling {{ ctrl.label(serverGroup) }}.Rollback {{serverGroup.name}}
Consider rollback successful when - percent of instances are healthy.@@ -78,23 +85,26 @@Rollback {{serverGroup.name}}
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}). @@ -104,32 +114,34 @@
Rollback {{serverGroup.name}}
-
-
This rollback will affect server groups in {{ serverGroup.account }} ({{ serverGroup.region }}).
+ -@@ -18,11 +21,8 @@ Region+diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html index 35ffa5f11cd..869a8219fbc 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html @@ -1,3 +1,5 @@ -Whenever - {{alarm.statistic}} of {{alarm.metricName}} - is {{alarm.threshold}} + {{ alarm.statistic }} of {{ alarm.metricName }} is + {{ alarm.threshold }}for at least - {{alarm.evaluationPeriods}} consecutive periods of {{alarm.period}} seconds + {{ alarm.evaluationPeriods }} consecutive periods of {{ alarm.period }} secondsdiff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html index f0bb13c1ab3..71c9c4187bc 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html @@ -1,3 +1,5 @@ --+ diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html index 3e5907372b9..04bb886f26d 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html @@ -6,6 +6,8 @@ + diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html index 95374340d4f..1a89ec287c2 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html @@ -2,86 +2,98 @@ + + diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html index bd64cd17cc1..6cc07f2083d 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html @@ -1,3 +1,5 @@ - + diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html index ceefcc8cce0..aba18b33b22 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html @@ -8,16 +8,20 @@ {{$ctrl.policy.policyName ? "Update" : "Create"}} scaling policy
-+ +@@ -30,11 +30,15 @@ Stack- ++ +- +-@@ -120,22 +112,23 @@+ + expected-artifacts="command.backingData.expectedArtifacts" + selected="gcsArtifactDelegate.getSelectedExpectedArtifact()" + on-change="gcsArtifactController.onArtifactChange" + on-request-create="gcsArtifactController.onRequestCreate" + offered-artifact-types="gcsArtifactDelegate.getOfferedArtifactTypes()" + requesting-new="showCreateArtifactForm" + > -+ +- Git Repository URL+ Git Repository URL + -+ +- Git Credential Type+ Git Credential Type + -+ -@@ -220,17 +216,11 @@- Branch+- Branch- + --+ - - Resolve via trigger - - - Click for text input - ++ + Resolve via trigger + + + Click for text input +- ++ expected-artifacts="command.backingData.expectedArtifacts" + selected="containerArtifactDelegate.getSelectedExpectedArtifact()" + on-change="containerArtifactController.onArtifactChange" + on-request-create="containerArtifactController.onRequestCreate" + offered-artifact-types="containerArtifactDelegate.getOfferedArtifactTypes()" + requesting-new="showCreateArtifactForm" + > -+ ng-model="command.containerImageUrl" + /> +