From 04bb4a01c2d988aab5b5b8ae6e3aadbc59214898 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 15:18:28 -0800 Subject: [PATCH 1/9] fix(html): Fix various invalid HTML (#6599) --- .../details/loadBalancerDetails.html | 2 +- .../details/rollback/rollbackServerGroup.html | 24 ++++++++++--------- .../loadBalancer/configure/wizard/ports.html | 1 + .../configure/wizard/resources.html | 1 + .../dcos/loadBalancer/details/details.html | 1 + .../src/instance/details/instanceDetails.html | 9 ++----- .../ecs/src/serverGroup/events/events.html | 10 ++++---- .../common/commonCreateLoadBalancer.html | 1 - .../backendService.component.html | 1 - .../http/backendService/backendServices.html | 6 ++--- .../http/healthCheck/healthChecks.html | 6 ++--- .../configure/wizard/advancedSettings.html | 2 +- .../loadBalancer/configure/wizard/ports.html | 2 +- .../configure/wizard/replicas.html | 2 +- .../configure/wizard/healthCheck.html | 2 -- .../configure/wizard/listeners.html | 3 +-- .../wizard/access/accessSettings.html | 3 +-- .../details/serverGroupDetails.html | 1 - .../src/instance/details/instanceDetails.html | 4 ++-- .../details/rollback/rollbackServerGroup.html | 9 ++++--- .../details/serverGroupDetails.html | 1 - 21 files changed, 40 insertions(+), 51 deletions(-) diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html index 4ea4d8fc4f5..c611413d3db 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html +++ b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html @@ -195,7 +195,7 @@
No subnets
{{subnet.id}}
Purpose
-
{{subnet.purpose}} +
{{subnet.purpose}}
State
{{subnet.state}}
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..4023b60ae73 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -82,11 +82,11 @@

Rollback {{serverGroup.name}}

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 -
    • + ] +
    (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 @@ -104,15 +104,17 @@

    Rollback {{serverGroup.name}}

      -
    1. Deploy {{ previousServerGroup.imageId }} [ +
    2. + 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) -
    3. - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy -
      4. + ] +
      (minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy) + +
    4. + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} + instances to report as healthy
    5. Disable {{ serverGroup.name }}
    6. Restore minimum capacity of new server group [ diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html index 9fcd793abf4..5476f188dd2 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html @@ -44,4 +44,5 @@
    + diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html index eab042a45a4..3ee41cc16b4 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html @@ -45,4 +45,5 @@ name="roles"/> + diff --git a/app/scripts/modules/dcos/loadBalancer/details/details.html b/app/scripts/modules/dcos/loadBalancer/details/details.html index c9a1239fdb6..a486024334f 100644 --- a/app/scripts/modules/dcos/loadBalancer/details/details.html +++ b/app/scripts/modules/dcos/loadBalancer/details/details.html @@ -63,5 +63,6 @@

    • + diff --git a/app/scripts/modules/ecs/src/instance/details/instanceDetails.html b/app/scripts/modules/ecs/src/instance/details/instanceDetails.html index 7dcd6220c35..c36bfe98741 100644 --- a/app/scripts/modules/ecs/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/ecs/src/instance/details/instanceDetails.html @@ -120,6 +120,7 @@

    text="instance.networkInterface.privateIpv4Address" tool-tip="'Copy to clipboard'"> +
    Private address (ENI): {{instance.networkInterface.ipv6Address}} text="instance.networkInterface.ipv6Address" tool-tip="'Copy to clipboard'"> +
    Private address (Bridge): {{instance.privateAddress}}
    - -
      -
    • - -
      • -
    -
    diff --git a/app/scripts/modules/ecs/src/serverGroup/events/events.html b/app/scripts/modules/ecs/src/serverGroup/events/events.html index 9b67a6c5776..0a8f33570c4 100644 --- a/app/scripts/modules/ecs/src/serverGroup/events/events.html +++ b/app/scripts/modules/ecs/src/serverGroup/events/events.html @@ -11,21 +11,19 @@

    Server Group Events for {{$ctrl.serverGroup.name}}

    There was an error loading events for {{$ctrl.serverGroup.name}}. Please try again later.

    - No scaling events found for {{$ctrl.serverGroup.name}}.

    +

    No scaling events found for {{$ctrl.serverGroup.name}}.

    -

    -

    +

    +
    {{event.status}}
    -
    +
    {{event.status}}
    {{event.createdAt | timestamp}} -

    -

     

    {{event.message}}
    diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html index 90795f10298..ae31875cee4 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html @@ -18,7 +18,6 @@ mark-complete-on-view="false"> - diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html index ae617d9d0f3..5e3d3a84308 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html @@ -149,6 +149,5 @@ class="form-control input-sm"/>
    -
    diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html index 676bd008613..42859d00a5a 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html @@ -4,10 +4,10 @@

    The following backend services have not been associated with a host or path rule, or set as this load balancer's default service: -

    +

    Remove backend services diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html index 7c2c5196912..0202b0bc1bc 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html @@ -3,10 +3,10 @@

    The following health checks have not been associated with a backend service: -

      -
    • -

    +
      +
    • +

    Remove health checks diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html index 49f0dc89913..5c5246fd3e6 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html @@ -45,7 +45,7 @@

    -
    +
    diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html index 96aacfe8a3d..1deb08e90c4 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html @@ -41,7 +41,7 @@
    + ng-disabled="!(loadBalancer.serviceType === 'NodePort' || loadBalancer.serviceType === 'LoadBalancer')"/>
    Protocol diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html index e54861798fb..4414dd00566 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html @@ -60,7 +60,7 @@
    -
    +
    CPU Target diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html index 7154b61c04a..cf753f0f572 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html @@ -8,7 +8,6 @@ -
    Interval @@ -46,7 +45,6 @@ -
    diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html index 52c2ba25b47..02ab6d5aad2 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html @@ -25,8 +25,7 @@ required/>
    + diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html index b8748405e79..c8394323e3b 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html @@ -51,6 +51,7 @@ +
    @@ -59,6 +60,4 @@ help-key="openstack.network.floatpool" filter="{ account: command.credentials }">
    - - diff --git a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html index 770e5baad01..3308e89557a 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html @@ -166,7 +166,6 @@

    {{value}}
    -
    • TBD
      • diff --git a/app/scripts/modules/titus/src/instance/details/instanceDetails.html b/app/scripts/modules/titus/src/instance/details/instanceDetails.html index be853723e4a..5d17bf22c97 100644 --- a/app/scripts/modules/titus/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/titus/src/instance/details/instanceDetails.html @@ -152,8 +152,8 @@

      {{instance.resources.networkMbps}} Mbps
      GPU(s)
      {{instance.resources.gpu}}
      - --> - + + -->
      • diff --git a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html index a41f67b27cc..be06f186ec2 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -84,7 +84,6 @@

        Rollback {{serverGroup.name}}

        Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to report as healthy
        • -
      • Disable {{ serverGroup.name }}
      • Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ min: {{ serverGroup.capacity.min }} @@ -103,10 +102,10 @@

        Rollback {{serverGroup.name}}

        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 -
        • + +
      • + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} + instances to report as healthy
      • Disable {{ serverGroup.name }}
      • Restore minimum capacity of new server group [ diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html index 771c7afc0e9..26489d4dd8e 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html @@ -89,7 +89,6 @@

        {{serverGroup.region}} -
        Job Id
        {{serverGroup.id}}
        From 7d5fc346bca54c5d53f9eb46d823cd993c102058 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:21:51 -0800 Subject: [PATCH 2/9] =?UTF-8?q?chore(prettier):=20Just=20Use=20Prettier?= =?UTF-8?q?=E2=84=A2=20(#6600)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationProviderFields/awsFields.html | 8 +- .../src/instance/details/instanceDetails.html | 155 +++++--- .../details/loadBalancerDetails.html | 129 ++++--- .../details/targetGroupDetails.html | 66 ++-- .../stages/bake/bakeExecutionDetails.html | 7 +- .../src/pipeline/stages/bake/bakeStage.html | 144 ++++---- .../cloneServerGroupStage.html | 111 +++--- .../cloneServerGroupStepLabel.html | 4 +- .../stages/destroyAsg/destroyAsgStage.html | 5 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 6 +- .../findImageFromTagsStage.html | 3 +- .../modifyScalingProcessStage.html | 17 +- .../stages/resizeAsg/resizeAsgStage.html | 55 ++- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../rollbackCluster/rollbackClusterStage.html | 29 +- .../scaleDownClusterStage.html | 34 +- .../shrinkCluster/shrinkClusterStage.html | 26 +- .../tagImage/tagImageExecutionDetails.html | 2 +- .../configure/createSecurityGroup.html | 12 +- .../ingressRuleGroupSelector.component.html | 61 ++-- .../details/securityGroupDetail.html | 53 ++- .../editAsgAdvancedSettings.modal.html | 38 +- .../details/rollback/rollbackServerGroup.html | 104 +++--- .../alarmBasedSummary.component.html | 18 +- .../alarmBasedSummary.template.html | 8 +- .../chart/metricAlarmChart.component.html | 8 +- .../scalingPolicyPopover.component.html | 86 +++-- .../targetTracking/targetTrackingPopover.html | 8 +- .../targetTracking/targetTrackingSummary.html | 8 +- .../upsertTargetTracking.modal.html | 108 +++--- .../alarm/alarmConfigurer.component.html | 103 +++--- .../alarm/dimensionsEditor.component.html | 43 ++- .../simple/simplePolicyAction.component.html | 41 ++- .../step/stepPolicyAction.component.html | 112 +++--- .../upsert/upsertScalingPolicy.modal.html | 74 ++-- .../modifyScalingProcesses.html | 14 +- .../editScheduledActions.modal.html | 101 ++++-- .../editSecurityGroups.modal.html | 30 +- .../common/loadBalancerMessage.component.html | 37 +- .../src/instance/details/details.html | 37 +- .../wizard/basicSettings.component.html | 34 +- ...eAllocationConfigurationRow.component.html | 63 +++- .../loadBalancer/configure/wizard/wizard.html | 39 +- .../src/loadBalancer/details/details.html | 33 +- .../stages/destroyAsg/destroyAsgStage.html | 6 +- .../destroyAsg/destroyAsgStepLabel.html | 6 +- .../stages/disableAsg/disableAsgStage.html | 9 +- .../disableAsg/disableAsgStepLabel.html | 6 +- .../editLoadBalancerExecutionDetails.html | 32 +- .../editLoadBalancerStage.html | 67 ++-- .../loadBalancerChoice.modal.html | 15 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../shrinkCluster/shrinkClusterStage.html | 22 +- .../startServerGroupStage.html | 9 +- .../startServerGroupStepLabel.html | 4 +- .../stopServerGroup/stopServerGroupStage.html | 9 +- .../stopServerGroupStepLabel.html | 4 +- .../configure/wizard/advancedSettings.html | 16 +- .../configure/wizard/basicSettings.html | 260 +++++++------- .../wizard/configFiles.component.html | 92 +++-- .../configure/wizard/serverGroupWizard.html | 22 +- .../src/serverGroup/details/details.html | 177 ++++++--- .../instance/details/instanceDetails.html | 13 +- .../configure/createLoadBalancer.html | 11 +- .../createLoadBalancerProperties.html | 122 ++++--- .../configure/editLoadBalancer.html | 30 +- .../loadBalancer/configure/healthCheck.html | 24 +- .../loadBalancer/configure/listeners.html | 23 +- .../details/loadBalancerDetail.html | 43 ++- .../stages/bake/bakeExecutionDetails.html | 1 - .../azure/pipeline/stages/bake/bakeStage.html | 92 ++--- .../stages/destroyAsg/destroyAsgStage.html | 6 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../clone/cloneSecurityGroup.html | 1 - .../configure/createSecurityGroup.html | 11 +- .../configure/createSecurityGroupIngress.html | 72 ++-- .../createSecurityGroupProperties.html | 35 +- .../configure/editSecurityGroup.html | 1 - .../details/securityGroupDetail.html | 25 +- .../advancedSettings/advancedSettings.html | 10 +- .../advancedSettingsSelector.directive.html | 21 +- .../wizard/basicSettings/basicSettings.html | 69 +++- .../configure/wizard/capacity/capacity.html | 9 +- .../capacity/capacitySelector.directive.html | 16 +- .../configure/wizard/instanceArchetype.html | 33 +- .../configure/wizard/instanceType.html | 33 +- ...rGroupLoadBalancersSelector.directive.html | 15 +- ...roupNetworkSettingsSelector.directive.html | 23 +- ...GroupSecurityGroupsSelector.directive.html | 22 +- .../configure/wizard/serverGroupWizard.html | 23 +- .../configure/wizard/templateSelection.html | 16 +- .../details/serverGroupDetails.html | 37 +- .../subnet/subnetSelectField.directive.html | 18 +- .../acaTask/acaTaskExecutionDetails.html | 156 ++++---- .../acaTask/acaTaskExecutionSummary.html | 91 +++-- .../modules/canary/acaTask/acaTaskStage.html | 117 +++--- .../canary/actions/endCanary.modal.html | 18 +- .../canary/actions/generateScore.modal.html | 27 +- .../canaryAnalysisNameSelector.component.html | 39 +- .../canaryDeploymentExecutionDetails.html | 84 +++-- .../canary/canary/canaryExecutionDetails.html | 125 ++++--- .../canary/canary/canaryExecutionSummary.html | 52 +-- .../modules/canary/canary/canaryStage.html | 292 ++++++++------- .../details/cloudFoundryInstanceDetails.html | 3 +- .../cloudFoundryLoadBalancerDetails.html | 3 +- .../cloudfoundryDestroyAsgStage.html | 7 +- .../cloudfoundryDisableAsgStage.html | 7 +- .../enableAsg/cloudfoundryEnableAsgStage.html | 7 +- .../cloudfoundryMapLoadBalancersStage.html | 8 +- .../resizeAsg/cloudfoundryResizeAsgStage.html | 7 +- .../cloudfoundryRollbackClusterStage.html | 7 +- .../cloudfoundryUnmapLoadBalancersStage.html | 8 +- .../applicationAttributes.directive.html | 7 +- .../applicationCacheManagement.directive.html | 27 +- .../config/applicationConfig.view.html | 5 +- .../applicationNotifications.directive.html | 6 +- .../applicationSnapshotSection.component.html | 10 +- ...applicationDataSourceEditor.component.html | 32 +- .../deleteApplicationSection.directive.html | 10 +- .../footer/configSectionFooter.component.html | 31 +- .../links/applicationLinks.component.html | 69 ++-- .../config/links/editLinks.modal.html | 11 +- .../trafficGuardConfig.component.html | 107 +++--- .../applicationProviderFields.component.html | 5 +- .../application/modal/editApplication.html | 150 ++++---- .../src/application/modal/newapplication.html | 168 +++++---- ...tformHealthOverrideCheckbox.directive.html | 4 +- .../userMenu/userMenu.directive.html | 17 +- .../chaosMonkeyConfig.component.html | 64 ++-- .../chaosMonkeyExceptions.component.html | 94 ++--- .../providerSelection/providerSelection.html | 15 +- .../providerSelection/providerSelector.html | 10 +- .../skinSelection/skinSelector.html | 11 +- .../modules/core/src/cluster/allClusters.html | 39 +- .../filter/clusterFilter.component.html | 135 ++++--- .../filter/collapsibleFilterSection.html | 14 +- .../onDemand/onDemandOptionTemplate.html | 4 +- .../core/src/confirmationModal/confirm.html | 44 ++- .../modules/core/src/diffs/changes.html | 13 +- .../src/entityTag/entitySource.popover.html | 6 +- .../forms/checklist/checklist.directive.html | 26 +- .../forms/checkmap/checkmap.directive.html | 7 +- .../forms/mapEditor/mapEditor.component.html | 82 +++-- .../core/src/help/helpField.popover.html | 8 +- .../src/insight/insightFilter.component.html | 20 +- .../src/insight/insightLayout.component.html | 7 +- .../src/insight/insightmenu.directive.html | 27 +- .../details/instanceLinks.component.html | 4 +- .../details/multipleInstances.view.html | 51 ++- .../modal/wizard/v2modalWizard.component.html | 26 +- .../modal/wizard/v2wizardPage.component.html | 10 +- .../notification/modal/editNotification.html | 24 +- .../notificationList.directive.html | 141 ++++---- .../selector/notificationSelector.html | 10 +- .../types/bearychat/additionalFields.html | 17 +- .../types/email/additionalFields.html | 34 +- .../types/googlechat/additionalFields.html | 14 +- .../types/hipchat/additionalFields.html | 20 +- .../types/pubsub/additionalFields.html | 17 +- .../types/slack/additionalFields.html | 17 +- .../types/sms/additionalFields.html | 17 +- .../src/pagerDuty/pageApplicationOwner.html | 14 +- .../actions/delete/deletePipelineModal.html | 16 +- .../actions/disable/disablePipelineModal.html | 7 +- .../actions/enable/enablePipelineModal.html | 3 +- .../actions/history/showHistory.modal.html | 33 +- .../actions/lock/lockPipelineModal.html | 14 +- .../config/actions/pipelineConfigActions.html | 20 +- .../actions/rename/renamePipelineModal.html | 28 +- .../actions/unlock/unlockPipelineModal.html | 3 +- .../config/copyStage/copyStage.modal.html | 18 +- ...tformHealthOverrideCheckbox.directive.html | 4 +- .../pipeline/config/parameters/parameter.html | 32 +- .../src/pipeline/config/pipelineConfig.html | 19 +- .../pipeline/config/pipelineConfigView.html | 22 +- .../pipeline/config/pipelineConfigurer.html | 178 +++++---- .../preconditions/modal/editPrecondition.html | 19 +- .../preconditionList.directive.html | 68 ++-- .../selector/preconditionSelector.html | 10 +- .../types/clusterSize/additionalFields.html | 57 +-- .../types/expression/additionalFields.html | 28 +- .../bake/bakeStageChooseOs.component.html | 7 +- .../bake/modal/addExtendedAttribute.html | 35 +- .../bakeManifest/bakeManifestConfig.html | 121 ++++--- .../baseProviderStage/baseProviderStage.html | 9 +- .../checkPreconditionsStage.html | 8 +- .../createLoadBalancerExecutionDetails.html | 62 ++-- .../createLoadBalancerStage.html | 64 ++-- .../stages/deploy/deployExecutionDetails.html | 49 +-- .../config/stages/deploy/deployStage.html | 156 ++++---- .../executionWindowDayPicker.component.html | 14 +- .../executionWindows/executionWindows.html | 150 ++++---- .../failOnFailedExpressions.directive.html | 8 +- .../findArtifactFromExecutionConfig.html | 34 +- .../config/stages/group/groupStage.html | 3 +- .../jenkins/jenkinsExecutionDetails.html | 26 +- .../config/stages/jenkins/jenkinsStage.html | 176 ++++++--- .../manualJudgment/manualJudgmentStage.html | 138 +++---- .../optionalStage.directive.html | 16 +- .../overrideFailure.component.html | 52 +-- .../overrideTimeout.directive.html | 85 +++-- .../config/stages/pipeline/pipelineStage.html | 66 ++-- .../resizeAsg/resizeAsgExecutionDetails.html | 5 +- .../config/stages/script/scriptStage.html | 32 +- .../src/pipeline/config/stages/stage.html | 74 ++-- .../stages/travis/modal/addParameter.html | 36 +- .../stages/travis/travisExecutionDetails.html | 25 +- .../config/stages/travis/travisStage.html | 114 +++--- .../unmatchedStageTypeStage.html | 17 +- .../stages/webhook/modal/addCustomHeader.html | 37 +- .../webhook/webhookExecutionDetails.html | 29 +- .../config/stages/webhook/webhookStage.html | 172 +++++---- .../stages/wercker/modal/addParameter.html | 36 +- .../wercker/werckerExecutionDetails.html | 26 +- .../config/stages/wercker/werckerStage.html | 143 +++++--- .../configurePipelineTemplateModal.html | 52 +-- .../config/triggers/cron/cronPicker.html | 339 ++++++++++-------- .../config/triggers/cron/cronTrigger.html | 14 +- .../config/triggers/git/gitTrigger.html | 37 +- .../triggers/jenkins/jenkinsTrigger.html | 112 +++--- .../triggers/pipeline/pipelineTrigger.html | 104 +++--- .../config/triggers/pubsub/pubsubTrigger.html | 25 +- .../config/triggers/travis/travisTrigger.html | 52 +-- .../src/pipeline/config/triggers/trigger.html | 26 +- .../triggers/webhook/webhookTrigger.html | 6 +- .../triggers/wercker/werckerTrigger.html | 147 ++++---- .../manualPipelineExecution.html | 126 ++++--- .../sortToggle/sorttoggle.directive.html | 17 +- .../src/presentation/standalone.view.html | 6 +- .../configure/configureProject.modal.html | 14 +- .../cluster/inconsistentBuilds.tooltip.html | 2 +- .../cluster/projectCluster.directive.html | 100 +++--- .../projectClusterRefresh.tooltip.html | 5 +- .../dashboard/clusterRefresh.tooltip.html | 6 +- .../src/projects/dashboard/dashboard.html | 32 +- .../dashboard/executionRefresh.tooltip.html | 6 +- .../regionFilter/regionFilter.component.html | 1 - .../modules/core/src/projects/projects.html | 75 ++-- .../search/infrastructure/infrastructure.html | 57 +-- .../modules/core/src/securityGroup/all.html | 12 +- .../securityGroup.filter.component.html | 51 ++- .../core/src/securityGroup/groupings.html | 14 +- .../core/src/securityGroup/securityGroup.html | 31 +- .../src/securityGroup/securityGroupPod.html | 9 +- .../configure/common/costFactor.html | 8 +- .../common/deployInitializer.component.html | 38 +- ...rtyInstanceTypeNotification.component.html | 14 +- .../common/instanceArchetypeDirective.html | 38 +- .../common/instanceTypeDirective.html | 65 ++-- ...etHealthyPercentageSelector.component.html | 13 +- .../common/v2instanceArchetype.directive.html | 43 ++- .../multipleServerGroup.component.html | 4 +- .../details/multipleServerGroups.view.html | 21 +- .../scalingActivities/scalingActivities.html | 28 +- .../src/serverGroup/pod/runningTasksTag.html | 9 +- .../src/snapshot/diff/snapshotDiff.modal.html | 24 +- .../core/src/task/modal/reason.directive.html | 8 +- .../core/src/task/monitor/taskMonitor.html | 4 +- .../task/platformHealthOverrideMessage.html | 11 +- app/scripts/modules/core/src/task/tasks.html | 108 +++--- .../userVerification.directive.html | 14 +- .../core/src/validation/validationError.html | 4 +- .../whatsNew/whatsNew.directive.modal.html | 5 +- ...untNamespaceClusterSelector.component.html | 9 +- ...ccountRegionClusterSelector.component.html | 27 +- .../actionIcons/actionIcons.component.html | 6 +- .../scopeClusterSelector.directive.html | 37 +- .../dcos/common/selectField.directive.html | 21 +- .../dcos/instance/details/details.html | 43 ++- .../modules/dcos/job/general.component.html | 26 +- .../modules/dcos/job/schedule.component.html | 18 +- .../configure/wizard/basicSettings.html | 76 ++-- .../configure/wizard/createWizard.html | 12 +- .../configure/wizard/editWizard.html | 12 +- .../loadBalancer/configure/wizard/ports.html | 46 ++- .../configure/wizard/resources.html | 26 +- .../dcos/loadBalancer/details/details.html | 21 +- .../stages/destroyAsg/destroyAsgStage.html | 5 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../pipeline/stages/findAmi/findAmiStage.html | 16 +- .../stages/resizeAsg/resizeAsgStage.html | 51 ++- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../dockerImageAndTagSelector.component.html | 94 ++--- .../stages/runJob/runJobExecutionDetails.html | 5 +- .../pipeline/stages/runJob/runJobStage.html | 58 +-- .../scaleDownClusterStage.html | 34 +- .../shrinkCluster/shrinkClusterStage.html | 26 +- .../configure/wizard/basicSettings.html | 110 ++++-- .../configure/wizard/containerSettings.html | 34 +- .../wizard/environmentVariables.html | 61 +++- .../configure/wizard/healthChecks.html | 73 +++- .../serverGroup/configure/wizard/network.html | 50 ++- .../configure/wizard/optional.html | 31 +- .../configure/wizard/templateSelection.html | 16 +- .../serverGroup/configure/wizard/volumes.html | 79 +++- .../serverGroup/configure/wizard/wizard.html | 17 +- .../dcos/serverGroup/details/details.html | 73 ++-- .../serverGroup/details/resize/resize.html | 48 +-- .../stages/bake/bakeExecutionDetails.html | 1 - .../src/pipeline/stages/bake/bakeStage.html | 31 +- .../src/instance/details/instanceDetails.html | 118 ++++-- .../cloneServerGroupStage.html | 81 +++-- .../cloneServerGroupStepLabel.html | 4 +- .../stages/destroyAsg/destroyAsgStage.html | 5 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../findImageFromTagsStage.html | 7 +- .../stages/resizeAsg/resizeAsgStage.html | 55 ++- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../scaleDownClusterStage.html | 34 +- .../shrinkCluster/shrinkClusterStage.html | 26 +- .../advancedSettings.component.html | 45 ++- .../advancedSettings/advancedSettings.html | 5 +- .../horizontalScaling.component.html | 37 +- .../horizontalScaling/horizontalScaling.html | 5 +- .../wizard/location/basicSettings.html | 211 ++++++----- .../wizard/logging/logging.component.html | 7 +- .../networkingSelector.component.html | 91 +++-- .../configure/wizard/serverGroupWizard.html | 14 +- .../templateSelection/templateSelection.html | 16 +- .../verticalScaling.component.html | 26 +- .../verticalScaling/verticalScaling.html | 5 +- .../resize/resizeCapacity.component.html | 100 +++--- .../details/resize/resizeServerGroup.html | 17 +- .../details/rollback/rollbackServerGroup.html | 41 ++- .../details/serverGroupDetails.html | 102 +++--- .../ecs/src/serverGroup/events/events.html | 25 +- .../applicationProviderFields/gceFields.html | 8 +- .../basicSettings.component.html | 111 +++--- .../metricSettings.component.html | 91 +++-- .../src/cache/cacheRefresh.component.html | 8 +- .../google/src/common/footer.directive.html | 8 +- .../src/instance/details/instanceDetails.html | 132 ++++--- .../choice/gceLoadBalancerChoice.modal.html | 6 +- .../common/commonAdvancedSettingsPage.html | 28 +- .../common/commonCreateLoadBalancer.html | 33 +- .../common/commonEditLoadBalancer.html | 33 +- .../common/commonHealthCheckPage.html | 18 +- .../common/healthCheck.component.html | 142 ++++---- .../backendService.component.html | 112 +++--- .../http/backendService/backendServices.html | 47 ++- .../basicSettings.component.html | 78 ++-- .../http/basicSettings/basicSettings.html | 6 +- .../http/createHttpLoadBalancer.html | 24 +- .../http/defaultService/defaultService.html | 14 +- .../configure/http/editHttpLoadBalancer.html | 23 +- .../healthCheck/healthCheck.component.html | 140 ++++---- .../http/healthCheck/healthChecks.html | 43 ++- .../http/hostRule/hostRule.component.html | 46 +-- .../configure/http/hostRule/hostRules.html | 15 +- .../http/listeners/listener.component.html | 141 +++++--- .../configure/http/listeners/listeners.html | 17 +- .../http/pathRule/pathRule.component.html | 41 ++- .../createLoadBalancerProperties.html | 101 +++--- .../configure/internal/listener.html | 38 +- .../configure/network/advancedSettings.html | 10 +- .../configure/network/createLoadBalancer.html | 13 +- .../network/createLoadBalancerProperties.html | 79 ++-- .../configure/network/editLoadBalancer.html | 28 +- .../configure/network/healthCheck.html | 43 ++- .../configure/network/listeners.html | 55 +-- .../configure/ssl/backendService.html | 18 +- .../ssl/createLoadBalancerProperties.html | 71 ++-- .../loadBalancer/configure/ssl/listener.html | 52 +-- .../configure/tcp/backendService.html | 18 +- .../tcp/createLoadBalancerProperties.html | 71 ++-- .../loadBalancer/configure/tcp/listener.html | 10 +- .../details/deleteModal/deleteModal.html | 24 +- .../healthCheck/healthCheck.component.html | 14 +- .../hostAndPathRules.modal.html | 14 +- .../details/loadBalancerDetails.html | 112 +++--- .../src/networkSelectField.directive.html | 12 +- .../stages/bake/bakeExecutionDetails.html | 1 - .../src/pipeline/stages/bake/bakeStage.html | 122 ++++--- .../cloneServerGroupStage.html | 81 +++-- .../cloneServerGroupStepLabel.html | 4 +- .../stages/destroyAsg/destroyAsgStage.html | 6 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../stages/enableAsg/enableAsgStage.html | 11 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 9 +- .../findImageFromTagsStage.html | 3 +- .../stages/resizeAsg/resizeAsgStage.html | 60 ++-- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../scaleDownClusterStage.html | 33 +- .../shrinkCluster/shrinkClusterStage.html | 24 +- .../stages/tagImage/tagImageStage.html | 7 +- .../src/regionSelectField.directive.html | 18 +- .../clone/cloneSecurityGroup.html | 12 +- .../configure/createSecurityGroup.html | 12 +- .../configure/createSecurityGroupIngress.html | 107 ++++-- .../createSecurityGroupProperties.html | 99 +++-- .../createSecurityGroupSourceFilters.html | 59 +-- .../configure/createSecurityGroupTargets.html | 45 +-- .../configure/editSecurityGroup.html | 20 +- .../details/securityGroupDetail.html | 89 +++-- .../advancedSettings.directive.html | 120 +++++-- .../advancedSettings/advancedSettings.html | 4 +- .../autoHealingPolicy/autoHealingPolicy.html | 16 +- .../autoHealingPolicySelector.component.html | 59 +-- .../advancedCapacitySelector.component.html | 46 ++- .../configure/wizard/capacity/capacity.html | 12 +- .../simpleCapacitySelector.component.html | 15 +- .../customInstance/customInstanceBuilder.html | 12 +- .../wizard/instanceType/instanceType.html | 11 +- .../backendServiceSelector.component.html | 18 +- .../loadBalancerSelector.directive.html | 40 ++- ...loadBalancingPolicySelector.component.html | 132 ++++--- .../wizard/location/basicSettings.html | 163 +++++---- .../securityGroupSelector.directive.html | 38 +- .../securityGroupsRemoved.directive.html | 5 +- .../securityGroups/tagSelector.component.html | 25 +- .../configure/wizard/serverGroupWizard.html | 14 +- .../templateSelection/templateSelection.html | 16 +- .../zones/regionalSelector.directive.html | 6 +- .../wizard/zones/zoneSelector.directive.html | 10 +- .../modal/upsertAutoHealingPolicy.modal.html | 26 +- .../autoscalingPolicy.directive.html | 17 +- .../modal/upsertAutoscalingPolicy.modal.html | 25 +- .../resizeAutoscalingPolicy.component.html | 55 +-- .../resize/resizeCapacity.component.html | 26 +- .../details/resize/resizeServerGroup.html | 41 ++- .../details/rollback/rollbackServerGroup.html | 22 +- .../details/serverGroupDetails.html | 147 +++++--- .../subnet/subnetSelectField.directive.html | 18 +- .../src/container/arguments.component.html | 28 +- .../src/container/commands.component.html | 27 +- .../src/container/configurer.directive.html | 203 +++++++---- .../container/environmentFrom.component.html | 128 +++---- .../environmentVariables.component.html | 198 +++++----- .../container/lifecycleHook.component.html | 63 +++- .../src/container/ports.component.html | 28 +- .../src/container/probe.directive.html | 163 ++++++--- .../src/container/resources.component.html | 34 +- .../capabilitiesSelector.component.html | 27 +- .../seLinuxOptionsSelector.component.html | 9 +- .../securityContextSelector.component.html | 8 +- .../src/container/volumes.component.html | 98 +++-- .../src/instance/details/details.html | 81 +++-- .../configure/wizard/advancedSettings.html | 85 +++-- .../configure/wizard/basicSettings.html | 74 ++-- .../configure/wizard/createWizard.html | 12 +- .../configure/wizard/editWizard.html | 12 +- .../loadBalancer/configure/wizard/ports.html | 61 +++- .../src/loadBalancer/details/details.html | 57 +-- .../namespace/multiSelectField.component.html | 17 +- .../namespace/multiSelectField.directive.html | 17 +- .../src/namespace/selectField.directive.html | 21 +- .../stages/destroyAsg/destroyAsgStage.html | 7 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 7 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableClusterExecutionDetails.html | 1 - .../disableCluster/disableClusterStage.html | 20 +- .../stages/enableAsg/enableAsgStage.html | 7 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 10 +- .../stages/resizeAsg/resizeStage.html | 50 +-- .../stages/resizeAsg/resizeStepLabel.html | 4 +- .../pipeline/stages/runJob/configureJob.html | 126 ++++--- .../pipeline/stages/runJob/runJobStage.html | 61 ++-- .../scaleDownClusterExecutionDetails.html | 87 ++--- .../scaleDownClusterStage.html | 35 +- .../shrinkClusterExecutionDetails.html | 87 ++--- .../shrinkCluster/shrinkClusterStage.html | 20 +- .../configure/wizard/advancedSettings.html | 14 +- .../configure/wizard/backend.html | 24 +- .../configure/wizard/basicSettings.html | 74 ++-- .../configure/wizard/createWizard.html | 12 +- .../configure/wizard/editWizard.html | 12 +- .../securityGroup/configure/wizard/rules.html | 59 +-- .../securityGroup/configure/wizard/tls.html | 20 +- .../src/securityGroup/details/details.html | 45 ++- .../configure/wizard/advancedSettings.html | 63 ++-- .../configure/wizard/basicSettings.html | 90 +++-- .../configure/wizard/deployment.html | 57 ++- .../configure/wizard/loadBalancers.html | 34 +- .../configure/wizard/replicas.html | 39 +- .../configure/wizard/templateSelection.html | 16 +- .../serverGroup/configure/wizard/volumes.html | 113 ++++-- .../serverGroup/configure/wizard/wizard.html | 38 +- .../src/serverGroup/details/details.html | 82 +++-- .../serverGroup/details/resize/resize.html | 110 +++--- .../details/rollback/rollback.html | 8 +- .../src/v2/instance/details/details.html | 24 +- .../src/v2/loadBalancer/details/details.html | 129 ++++--- .../src/v2/manifest/delete/delete.html | 19 +- .../src/v2/manifest/rollout/pause.html | 13 +- .../src/v2/manifest/rollout/resume.html | 13 +- .../src/v2/manifest/rollout/undo.html | 21 +- .../src/v2/manifest/scale/scale.html | 13 +- .../deleteManifest/deleteManifestConfig.html | 4 +- .../deployManifest/deployManifestConfig.html | 72 ++-- .../findArtifactsFromResourceConfig.html | 7 +- .../patchManifest/patchManifestConfig.html | 70 ++-- .../scaleManifest/scaleManifestConfig.html | 7 +- .../undoRolloutManifestConfig.html | 15 +- .../src/v2/securityGroup/details/details.html | 108 +++--- .../src/v2/serverGroup/details/details.html | 60 ++-- .../v2/serverGroup/details/resize/resize.html | 35 +- .../serverGroupManager/details/details.html | 35 +- .../cacheBackedMultiSelect.template.html | 10 +- .../cacheBackedSelectField.template.html | 22 +- .../src/common/cacheRefresh.tooltip.html | 4 +- .../src/common/footer.directive.html | 8 +- .../openstack/src/common/refresh.tooltip.html | 4 +- .../src/common/selectField.component.html | 34 +- .../src/instance/details/instanceDetails.html | 87 +++-- .../configure/wizard/createWizard.html | 12 +- .../configure/wizard/editWizard.html | 12 +- .../configure/wizard/healthCheck.html | 100 ++++-- .../configure/wizard/interface.html | 6 +- .../configure/wizard/listeners.html | 81 +++-- .../configure/wizard/location.html | 85 +++-- .../src/loadBalancer/details/details.html | 35 +- .../stages/bake/bakeExecutionDetails.html | 1 - .../src/pipeline/stages/bake/bakeStage.html | 76 ++-- .../cloneServerGroupStage.html | 81 +++-- .../cloneServerGroupStepLabel.html | 4 +- .../stages/destroyAsg/destroyAsgStage.html | 12 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 6 +- .../stages/resizeAsg/resizeAsgStage.html | 72 ++-- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../scaleDownClusterStage.html | 34 +- .../shrinkCluster/shrinkClusterStage.html | 26 +- .../region/regionSelectField.directive.html | 17 +- .../configure/wizard/basicSettings.html | 141 +++++--- .../configure/wizard/createWizard.html | 26 +- .../configure/wizard/editWizard.html | 38 +- .../securityGroup/configure/wizard/rules.html | 203 +++++++---- .../src/securityGroup/details/details.html | 64 ++-- .../wizard/access/accessSettings.html | 32 +- .../wizard/advanced/advancedSettings.html | 46 ++- .../configure/wizard/clusterSettings.html | 42 ++- .../wizard/instance/instanceSettings.html | 36 +- .../wizard/location/basicSettings.html | 174 +++++---- .../configure/wizard/serverGroupWizard.html | 56 ++- .../configure/wizard/templateSelection.html | 16 +- .../details/resize/resizeServerGroup.html | 87 +++-- .../details/rollback/rollbackServerGroup.html | 33 +- .../details/serverGroupDetails.html | 77 ++-- .../oracle/src/common/footer.component.html | 8 +- .../src/instance/details/instanceDetails.html | 3 +- .../loadBalancer/configure/backendSets.html | 38 +- .../loadBalancer/configure/certificates.html | 34 +- .../configure/createLoadBalancer.html | 11 +- .../createLoadBalancerProperties.html | 134 ++++--- .../configure/editLoadBalancer.html | 37 +- .../src/loadBalancer/configure/listeners.html | 41 ++- .../details/loadBalancerDetail.html | 30 +- .../pipeline/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../stages/bake/bakeExecutionDetails.html | 1 - .../src/pipeline/stages/bake/bakeStage.html | 126 ++++--- .../stages/destroyAsg/destroyAsgStage.html | 5 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 9 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 7 +- .../stages/resizeAsg/resizeAsgStage.html | 51 +-- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../scaleDownClusterStage.html | 32 +- .../shrinkCluster/shrinkClusterStage.html | 20 +- .../configure/createSecurityGroup.html | 13 +- .../advancedSettings/advancedSettings.html | 4 +- .../wizard/basicSettings/basicSettings.html | 70 +++- .../capacity/capacitySelector.component.html | 8 +- .../wizard/instanceType/instanceType.html | 12 +- .../wizard/loadBalancers/loadBalancers.html | 17 +- .../wizard/network/networkSettings.html | 22 +- .../configure/wizard/serverGroupWizard.html | 14 +- .../templateSelection/templateSelection.html | 16 +- .../resize/resizeCapacity.component.html | 26 +- .../details/resize/resizeServerGroup.html | 25 +- .../details/rollback/rollbackServerGroup.html | 22 +- .../details/serverGroupDetails.html | 13 +- .../src/instance/details/instanceDetails.html | 99 +++-- .../loadBalancerSelector.component.html | 40 ++- .../titusMigrationConfig.component.html | 76 ++-- .../titusMigrationConfigurer.component.html | 123 ++++--- .../stages/bake/bakeExecutionDetails.html | 1 - .../src/pipeline/stages/bake/bakeStage.html | 26 +- .../cloneServerGroupExecutionDetails.html | 13 +- .../cloneServerGroupStage.html | 81 +++-- .../cloneServerGroupStepLabel.html | 4 +- .../stages/destroyAsg/destroyAsgStage.html | 5 +- .../destroyAsg/destroyAsgStepLabel.html | 4 +- .../stages/disableAsg/disableAsgStage.html | 11 +- .../disableAsg/disableAsgStepLabel.html | 4 +- .../disableCluster/disableClusterStage.html | 22 +- .../stages/enableAsg/enableAsgStage.html | 9 +- .../stages/enableAsg/enableAsgStepLabel.html | 4 +- .../pipeline/stages/findAmi/findAmiStage.html | 6 +- .../stages/resizeAsg/resizeAsgStage.html | 55 ++- .../stages/resizeAsg/resizeAsgStepLabel.html | 4 +- .../scaleDownClusterStage.html | 34 +- .../shrinkCluster/shrinkClusterStage.html | 26 +- .../details/resize/resizeServerGroup.html | 81 +++-- .../details/rollback/rollbackServerGroup.html | 103 +++--- .../alarmBasedSummary.component.html | 20 +- .../alarmBasedSummary.template.html | 3 +- .../targetTracking/targetTrackingPopover.html | 3 +- .../targetTracking/targetTrackingSummary.html | 3 +- .../upsertTargetTracking.modal.html | 117 +++--- .../upsert/upsertScalingPolicy.modal.html | 59 +-- .../details/serverGroupDetails.html | 70 ++-- 633 files changed, 14938 insertions(+), 10261 deletions(-) diff --git a/app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html b/app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html index 609357acc42..10c2fad2d83 100644 --- a/app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html +++ b/app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html @@ -2,9 +2,11 @@
        AWS Settings
        diff --git a/app/scripts/modules/amazon/src/instance/details/instanceDetails.html b/app/scripts/modules/amazon/src/instance/details/instanceDetails.html index b9233e489dc..a470bfc71d2 100644 --- a/app/scripts/modules/amazon/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/amazon/src/instance/details/instanceDetails.html @@ -5,8 +5,7 @@

        Could not find instance {{instanceIdNotFound}}.

        - +
        @@ -17,8 +16,7 @@

        Could not find instance {{instanceIdNotFound}}.

        - +
        @@ -31,20 +29,54 @@

        -
        @@ -52,7 +84,9 @@

        Insight

        @@ -73,10 +107,13 @@

        {{instance.instanceType || '(Unknown)'}}
        Server Group
        - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
        VPC
        @@ -98,7 +135,10 @@

        {{metric.type | robotToHuman}}
        - + {{metric.state | robotToHuman}} @@ -108,10 +148,16 @@

        Status

        -
        +
        -
        +
        @@ -121,59 +167,70 @@

        Private DNS Name
        - {{instance.privateDnsName}} + {{instance.privateDnsName}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.privateDnsName" + tool-tip="'Copy to clipboard'" + >
        Public DNS Name
        - {{instance.publicDnsName}} + {{instance.publicDnsName}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.publicDnsName" + tool-tip="'Copy to clipboard'" + >
        Private IP Address
        - {{instance.privateIpAddress}} + {{instance.privateIpAddress}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.privateIpAddress" + tool-tip="'Copy to clipboard'" + >
        Permanent IP Address
        {{ip}} - +
        Public IP Address
        - {{instance.publicIpAddress}} + {{instance.publicIpAddress}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.publicIpAddress" + tool-tip="'Copy to clipboard'" + >
        - +
        No tags associated with this server
        @@ -189,7 +246,13 @@

      - +
      diff --git a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html index c611413d3db..a38a2f59245 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html +++ b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html @@ -1,9 +1,7 @@
      -
      - +
      @@ -14,8 +12,7 @@
      - +
      @@ -24,7 +21,6 @@

      {{ctrl.loadBalancer.name}} - page-location="details" on-update="ctrl.application.loadBalancers.refresh()" > -

      @@ -44,13 +39,20 @@

      app="ctrl.application" load-balancer="ctrl.loadBalancer" load-balancer-from-params="ctrl.loadBalancerFromParams" - > -
      + > +
      @@ -62,7 +64,9 @@

      Created
      {{ctrl.loadBalancer.elb.createdTime | timestamp}}
      In
      -
      {{ctrl.loadBalancer.region}}
      +
      + {{ctrl.loadBalancer.region}} +
      VPC
      Subnet
      @@ -80,32 +84,42 @@

    -
    +
    Server Groups
    -
    +
    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}})
        • 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 @@
        -
        - +
        @@ -14,8 +12,7 @@
        - +
        @@ -28,13 +25,25 @@

        - @@ -61,12 +70,14 @@

        @@ -75,24 +86,32 @@

        Load Balancer DNS Name
        - {{ctrl.loadBalancer.dnsname}} + {{ctrl.loadBalancer.dnsname}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="ctrl.loadBalancer.dnsname" + tool-tip="'Copy DNS Name to clipboard'" + >
        -
        +
        Server Groups
        @@ -105,7 +124,10 @@

        Target
        -
        {{ctrl.targetGroup.healthCheckProtocol}}:{{ctrl.targetGroup.healthCheckPort}} {{ctrl.targetGroup.healthCheckPath}}
        +
        + {{ctrl.targetGroup.healthCheckProtocol}}:{{ctrl.targetGroup.healthCheckPort}} + {{ctrl.targetGroup.healthCheckPath}} +
        Timeout
        {{ctrl.targetGroup.healthCheckTimeoutSeconds}} seconds
        Interval
        @@ -124,7 +146,9 @@

        {{ctrl.targetGroup.attributes['deregistration_delay.timeout_seconds']}} seconds
        Stickiness Enabled
        {{ctrl.targetGroup.attributes['stickiness.enabled']}}
        -
        Stickiness Load Balancer Cookie Duration
        +
        + Stickiness Load Balancer Cookie Duration +
        {{ctrl.targetGroup.attributes['stickiness.lb_cookie.duration_seconds']}} seconds
        Stickiness Type
        {{ctrl.targetGroup.attributes['stickiness.type']}}
        diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html index 70e493c0e97..b51aa5eefbe 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html @@ -35,7 +35,11 @@

        - +
        @@ -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 @@ - - + + @@ -41,8 +37,7 @@
        @@ -51,81 +46,96 @@
        - - + + - +

    -
    - - - - - + + + + + - - - - - + + + + + - - - + + +
    KeyValueActions
    KeyValueActions
    - {{key}} - - - - Remove -
    + {{key}} + + + + Remove +
    - -
    + +
    - - + + - - 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" + > @@ -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 - - + {{disableClusterStageCtrl.pluralize('server group', stage.remainingEnabledServerGroups)}} enabled.
    - +
    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 }}
    - + {{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}}

    1. Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
      2. -
    2. 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) +
    3. + 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) +
      4. +
    4. - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
    5. Wait {{ command.rollbackContext.delayBeforeDisableSeconds }} seconds
    6. Disable {{ serverGroup.name }}
      7. -
    7. Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ - min: {{ serverGroup.capacity.min }} - ]
      8. +
    8. + 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 }}). @@ -105,33 +115,33 @@

    Rollback {{serverGroup.name}}

    1. - 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) + 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)
    2. - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
    3. Disable {{ serverGroup.name }}
      4. -
    4. Restore minimum capacity of new server group [ - min: {{ serverGroup.capacity.min }} - ]
      5. +
    5. + 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

    Target Metric

    -

    With target tracking policies, Amazon will automatically adjust the size of your ASG to keep the selected - metric as close as possible to the selected value.

    +

    + With target tracking policies, Amazon will automatically adjust the size of your ASG to keep the selected + metric as close as possible to the selected value. +

    Metric
    -
    Select a custom metric @@ -25,14 +29,15 @@

    Target Metric

    -
    @@ -40,35 +45,42 @@

    Target Metric

    Target
    - of
    - +
    -
    - -
    Note: to zoom in, hold down the alt key and use your - mouse to select an area. Double-click to zoom back out.
    + +
    + Note: to zoom in, hold down the alt key and use your mouse to select an area. Double-click to + zoom back out. +
    @@ -86,11 +98,13 @@

    Additional Settings

    Warmup
    Instances need - + seconds to warm up @@ -102,13 +116,17 @@

    Additional Settings

    - This option disables scale-downs for the target tracking policy, while keeping the scale-ups. - This means that ASG will not scale down unless you explicitly set up a separate step policy to scale it + This option disables scale-downs for the target tracking policy, while keeping the scale-ups. This + means that ASG will not scale down unless you explicitly set up a separate step policy to scale it down.

    @@ -122,26 +140,26 @@

    Additional Settings

    - This policy will not scale down. Make sure you have another policy (either TT or Step) that - will scale down this ASG. + This policy will not scale down. Make sure you have another policy (either TT or Step) that will scale + down this ASG.
    - This policy will scale both up and down. Make sure you don't have other scaling policies, as they - will likely interfere with each other. + This policy will scale both up and down. Make sure you don't have other scaling policies, as they will + likely interfere with each other.
    -
    -
    - +
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html index ad4ea1d554c..faf70374cc2 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html @@ -1,8 +1,10 @@
    -

    - This scaling policy is configured with multiple alarms. You are only editing the first alarm.

    +

    + This scaling policy is configured with multiple alarms. You are only + editing the first alarm. +

    To edit or remove the additional alarms, you will need to use the AWS console.

    @@ -10,75 +12,88 @@
    -

    - This alarm is used in multiple scaling policies. Any changes here will affect those other scaling policies.

    +

    + This alarm is used in multiple scaling policies. Any changes here + will affect those other scaling policies. +

    -
    Whenever
    +
    Whenever
    - of - +
    -
    is
    +
    is
    - - +
    -
    for at least
    +
    for at least
    - + consecutive period(s) of - +
    - -
    Note: to zoom in, hold down the alt key and use your - mouse to select an area. Double-click to zoom back out.
    + +
    + Note: to zoom in, hold down the alt key and use your mouse to select an area. Double-click to zoom back + out. +
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html index c22e24c379b..f63628b33c6 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html @@ -5,23 +5,33 @@
    Dimensions
    - +
    - +
    @@ -31,8 +41,7 @@
    Dimensions
    - diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html index e510b93e1fe..7782a1dd1ba 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html @@ -1,22 +1,29 @@
    - - + + - +
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html index a30655baed5..b1076a088fb 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html @@ -1,35 +1,46 @@
    - - + + - + - - - - when - + + + when @@ -38,36 +49,40 @@ and - is greater than + is greater than or equal to - + is between - + and - is less than + is less than or equal to @@ -92,7 +107,10 @@
    - + Documentation diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html index 0e8651c9b87..89735e76bf5 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html @@ -8,17 +8,18 @@

    {{ctrl.action}} scaling policy

    Conditions

    - +

    Actions

    Select a metric

    -
    @@ -29,13 +30,14 @@

    Select a metric

    - +
    - +

    Additional Settings

    @@ -43,7 +45,11 @@

    Additional Settings

    Policy Name
    - +
    @@ -54,11 +60,13 @@

    Additional Settings

    instances in increments of at least - + instance(s) @@ -70,11 +78,13 @@

    Additional Settings

    Wait at least - + seconds before another scaling event @@ -84,11 +94,13 @@

    Additional Settings

    Warmup
    Instances need - + seconds to warm up after each step @@ -100,9 +112,11 @@

    Additional Settings

    - +
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html index d97c8fd93ed..0312394f0fe 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html @@ -10,7 +10,7 @@

    Modify Scaling Processes for {{serverGroup.name}}

    @@ -19,10 +19,12 @@

    Modify Scaling Processes for {{serverGroup.name}}

    - +
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html index 7ed6ac7ace7..810f5c9cc00 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html @@ -12,57 +12,80 @@

    Edit Scheduled Actions for {{serverGroup.name}}

    Note: CRON expressions are evaluated in UTC.

    - - - - - - - + + + + + + + - - + - - - - - + + + + + + - - - + + +
    Recurrence (CRON)Min SizeMax SizeDesired Capacity
    Recurrence (CRON)Min SizeMax SizeDesired Capacity
    - -
    -
    - {{cronErrors['action.recurrence.cronExpression']}} +
    + + +
    +
    + {{cronErrors['action.recurrence.cronExpression']}} +
    - -
    + + + + + + + +
    - -
    + +
    -
    -
    diff --git a/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html index 22b40dd3234..de610503469 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html @@ -8,14 +8,18 @@

    Edit for {{$ctrl.serverG
    - + {{$item.name}} ({{$item.id}}) - + () @@ -23,10 +27,12 @@

    Edit for {{$ctrl.serverG

    - +

    diff --git a/app/scripts/modules/appengine/src/common/loadBalancerMessage.component.html b/app/scripts/modules/appengine/src/common/loadBalancerMessage.component.html index ad7ce80c633..33a6586841b 100644 --- a/app/scripts/modules/appengine/src/common/loadBalancerMessage.component.html +++ b/app/scripts/modules/appengine/src/common/loadBalancerMessage.component.html @@ -1,28 +1,33 @@
    -
    +
    -

    - Spinnaker cannot create a load balancer for App Engine. - A Spinnaker load balancer maps to an App Engine service, which is specified in a version's app.yaml. -

    -

    - For example, the following app.yaml +

    + Spinnaker cannot create a load balancer for App Engine. + A Spinnaker load balancer maps to an App Engine service, which is specified in a version's + app.yaml.

    - 
    +      
    For example, the following app.yaml
    
+      
       			runtime: python27
   			api_version: 1
         …
   			service: mobile
         …
-  		
    
+
    +

    + deploys to the mobile service. If you do not specify a service, your version will be deployed to + the default service. +

    - deploys to the mobile service. If you do not specify a service, your version will be deployed - to the default service. -

    -

    - If a service does not exist when a version is deployed, it will be created. It will then be editable as a load balancer within Spinnaker. -

    -

    App Engine Documentation

    + If a service does not exist when a version is deployed, it will be created. It will then be editable as a load + balancer within Spinnaker. +

    +

    + App Engine Documentation +

    diff --git a/app/scripts/modules/appengine/src/instance/details/details.html b/app/scripts/modules/appengine/src/instance/details/details.html index abb900605c5..b0949a0c443 100644 --- a/app/scripts/modules/appengine/src/instance/details/details.html +++ b/app/scripts/modules/appengine/src/instance/details/details.html @@ -1,8 +1,7 @@
    - +
    @@ -13,8 +12,7 @@
    - +
    @@ -43,28 +41,35 @@

    Launched
    {{ctrl.instance.launchTime | timestamp}}
    In
    -
    - {{}} -
    +
    {{}}
    Server Group
    - {{ctrl.instance.serverGroup}} + provider: 'appengine'})" + >{{ctrl.instance.serverGroup}}
    Region
    {{ctrl.instance.region}}
    - +
    Load Balancer
    - + {{ctrl.instance.loadBalancers[0]}} @@ -92,7 +97,11 @@

    - +

    diff --git a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/basicSettings.component.html b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/basicSettings.component.html index 609f5d8f9e0..dfa8d0b1a2d 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/basicSettings.component.html +++ b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/basicSettings.component.html @@ -7,22 +7,26 @@
    - +
    - +
    - + - {{$select.selected}} + {{ $select.selected }} - +
    @@ -76,7 +97,11 @@ Cluster
    - +
    Target @@ -91,7 +116,7 @@
    - +
    diff --git a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.html b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.html index 1d12f6019ce..3423c8fefb0 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.html +++ b/app/scripts/modules/appengine/src/loadBalancer/configure/wizard/wizard.html @@ -2,26 +2,43 @@
    - +
    - + - +
    - +
    - +
    diff --git a/app/scripts/modules/appengine/src/loadBalancer/details/details.html b/app/scripts/modules/appengine/src/loadBalancer/details/details.html index 2d3cc8215a9..2e11546f8be 100644 --- a/app/scripts/modules/appengine/src/loadBalancer/details/details.html +++ b/app/scripts/modules/appengine/src/loadBalancer/details/details.html @@ -1,8 +1,7 @@ -
    +
    - +
    @@ -13,8 +12,7 @@
    - +
    @@ -35,9 +33,11 @@

  • Delete Load Balancer
    • -
  • +
  • Delete Load Balancer
    • @@ -57,10 +57,12 @@

    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStage.html index fa0df8ae30a..ceab6f279a2 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -6,11 +6,11 @@ disable-region-select="true" on-account-update="destroyAsgStageCtrl.setStageRegion()" component="stage" - accounts="accounts"> + accounts="accounts" + > -
    -
    \ No newline at end of file +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index 5da1856d8e7..0f172440730 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html @@ -1,5 +1,3 @@ - Destroy Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) - \ No newline at end of file + Destroy Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) + diff --git a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStage.html index c40bd7862e7..6f128ac78ab 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,21 +1,18 @@
    - + accounts="accounts" + > -
    - +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index fc4117e0348..d078cf0a813 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/disableAsg/disableAsgStepLabel.html @@ -1,5 +1,3 @@ - Disable Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) - \ No newline at end of file + Disable Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) + diff --git a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerExecutionDetails.html b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerExecutionDetails.html index 69203fe29a8..f3c4645e8f8 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerExecutionDetails.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerExecutionDetails.html @@ -5,24 +5,24 @@
    - - - - - + + + + + - - - - - + + + + +
    AccountNameRegion
    AccountNameRegion
    - - - {{ loadBalancer.name }} - - {{ loadBalancer.region }} -
    + + + {{ loadBalancer.name }} + + {{ loadBalancer.region }} +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerStage.html b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerStage.html index d70612e4eff..69d1f540185 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/editLoadBalancerStage.html @@ -8,41 +8,46 @@

    Load Balancers

    - - - - - - + + + + + + - - - - - - + + + + + + - - - + + +
    AccountNameRegionActions
    AccountNameRegionActions
    - - - {{ loadBalancer.name }} - - {{ loadBalancer.region }} - - - - - - -
    + + + {{ loadBalancer.name }} + + {{ loadBalancer.region }} + + + + + + +
    - -
    + +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html index bbdd2400e89..f0f4961f13f 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/editLoadBalancer/loadBalancerChoice.modal.html @@ -10,14 +10,19 @@

    Select Load Balancer

    This application has no App Engine load balancers.

    -
    +
    Load Balancer
    - + {{$select.selected.name}} @@ -33,9 +38,7 @@

    Select Load Balancer

    -
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStage.html index 6b7ad8acfd1..ada865f4678 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,21 +1,18 @@
    - + accounts="accounts" + > -
    - +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStepLabel.html index 9261272f7f8..5a77ae17c0f 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/appengine/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/appengine/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index 588e0b61474..3ca1c4ebc37 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html @@ -6,17 +6,23 @@ single-region="true" disable-region-select="true" on-account-update="shrinkClusterStageCtrl.setStageRegion()" - accounts="accounts"> + accounts="accounts" + >
    Shrink to - + {{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the - @@ -25,13 +31,11 @@
    - +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStage.html b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStage.html index 591c583ecb5..734d36790c7 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStage.html @@ -1,21 +1,18 @@
    - + accounts="accounts" + > -
    - +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStepLabel.html b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStepLabel.html index 042406b7692..d41e6c1c33d 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStepLabel.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/startServerGroup/startServerGroupStepLabel.html @@ -1,5 +1,3 @@ - Start Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Start Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStage.html b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStage.html index 58eded3d07e..e74f4d889dc 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStage.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStage.html @@ -1,21 +1,18 @@
    - + accounts="accounts" + > -
    - +
    diff --git a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStepLabel.html b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStepLabel.html index 1645c924a53..d04c9e1b323 100644 --- a/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStepLabel.html +++ b/app/scripts/modules/appengine/src/pipeline/stages/stopServerGroup/stopServerGroupStepLabel.html @@ -1,5 +1,3 @@ - Stop Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Stop Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html index b4a46be1af5..78981d8836f 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html @@ -1,11 +1,9 @@
    -
    - Promote -
    +
    Promote
    -
    + +
    @@ -13,17 +11,15 @@ Stop Previous Version
    -
    + +
    Task Completion
    - - +
    diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html index ac53ced7368..82da9b934f2 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html @@ -5,11 +5,14 @@ Account
    - +
    @@ -18,11 +21,8 @@ Region
    -
    + +
    @@ -30,11 +30,15 @@ Stack
    -
    +
    + +
    @@ -46,11 +50,15 @@ Detail
    -
    +
    + +
    @@ -63,25 +71,13 @@
    - +
    - +
    - +
    @@ -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" + /> + @@ -276,14 +270,22 @@
    Match branch from trigger on regex - +
    - +
    @@ -296,14 +298,16 @@
    (new cluster)

    -
    +

    There is already a server group in this cluster. Do you want to clone it?

    - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group.

    To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.html index 13f22a66253..f082f30abe1 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.html +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/configFiles.component.html @@ -5,10 +5,13 @@

    -
    + +
    @@ -16,9 +19,16 @@ Config Filepaths
    - - {{$item}} + + {{ $item }} @@ -36,14 +46,17 @@
    -
    +
    - +
    -
    +
    + expected-artifacts="artifact.delegate.expectedArtifacts" + selected="artifact.delegate.getSelectedExpectedArtifact()" + on-change="(artifact.controller.onArtifactChange)" + on-request-create="(artifact.controller.onRequestCreate)" + requesting-new="artifact.delegate.requestingNew" + > -
    - - -
    +
    + + +
    -
    diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/serverGroupWizard.html index 331ce7a749f..c18050ed9a2 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/serverGroupWizard.html @@ -3,7 +3,12 @@
    - + @@ -18,10 +23,17 @@
    - - + +
    diff --git a/app/scripts/modules/appengine/src/serverGroup/details/details.html b/app/scripts/modules/appengine/src/serverGroup/details/details.html index 0078c6121ae..3070a3f7a05 100644 --- a/app/scripts/modules/appengine/src/serverGroup/details/details.html +++ b/app/scripts/modules/appengine/src/serverGroup/details/details.html @@ -1,10 +1,7 @@ -
    - +
    - +
    @@ -15,8 +12,7 @@
    - +
    @@ -47,15 +43,17 @@

    Enable -
  • +
  • Disable
    • -
  • + class="disabled" + > Disable @@ -63,16 +61,20 @@

  • Destroy
    • -
  • - Destroy + class="disabled" + > + Destroy
    • -
  • + you to deploy into this server group's cluster." + > Clone
    • @@ -82,7 +84,10 @@

    Disabled
    - +
    Created
    @@ -91,20 +96,22 @@

    Region
    {{ctrl.serverGroup.region}}
    - +

    -
    +
    Min/Max
    {{ctrl.serverGroup.capacity.min}}
    Current
    {{ctrl.serverGroup.instances.length}}
    -
    +
    Min
    {{ctrl.serverGroup.capacity.min}}
    Max
    @@ -114,8 +121,7 @@

    -
    +
    Instances
    @@ -129,33 +135,106 @@

    - + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +

    diff --git a/app/scripts/modules/azure/instance/details/instanceDetails.html b/app/scripts/modules/azure/instance/details/instanceDetails.html index 41a3975ceae..4274470ff10 100644 --- a/app/scripts/modules/azure/instance/details/instanceDetails.html +++ b/app/scripts/modules/azure/instance/details/instanceDetails.html @@ -1,8 +1,7 @@
    - +
    @@ -13,8 +12,7 @@

    - +
    @@ -40,10 +38,13 @@

    {{instance.instanceType || '(Unknown)'}}
    Server Group
    - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
    diff --git a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html index ef8fe16e738..f1ca38472bf 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html +++ b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html @@ -11,9 +11,12 @@
    - - + +
    diff --git a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancerProperties.html b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancerProperties.html index 4bb36748da9..0f9d7820481 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancerProperties.html +++ b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancerProperties.html @@ -4,75 +4,113 @@

    -
    +
    Your load balancer will be named: {{ctrl.getName()}} - - - + + +
    Account
    - +
    - +
    Virtual Network
    - - {{$select.selected.name}} - - - - + + {{$select.selected.name}} + + + +
    Subnet
    - - {{$select.selected.name}} - - - - + + {{$select.selected.name}} + + + +
    Stack
    - +
    - - + +
    diff --git a/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html b/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html index d9f38cc131f..be89db0a499 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html +++ b/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html @@ -1,16 +1,22 @@
    - - - - - - - - + + + + + + + +
    - - + +
    diff --git a/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html b/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html index 0d0a15ff7dd..a1421fb3338 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html +++ b/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html @@ -12,18 +12,27 @@ - + - + -
    @@ -47,7 +56,12 @@

    Advanced Settings

    - +
    diff --git a/app/scripts/modules/azure/loadBalancer/configure/listeners.html b/app/scripts/modules/azure/loadBalancer/configure/listeners.html index 95eae207028..74fcad12bd0 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/listeners.html +++ b/app/scripts/modules/azure/loadBalancer/configure/listeners.html @@ -14,29 +14,36 @@ - + - + → - + + + + - - -

    -
    \ No newline at end of file +

    • diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html index ad2ac75edc4..26c119613f0 100644 --- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html +++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html @@ -1,9 +1,7 @@
    -
    - +
    @@ -14,8 +12,7 @@
    - +
    @@ -33,8 +30,14 @@

    @@ -48,7 +51,10 @@

    Created
    {{loadBalancer.elb.createdTime | timestamp}}
    In
    -
    {{loadBalancer.region}}
    +
    + + {{loadBalancer.region}} +
    VNet
    {{loadBalancer.elb.vnet}}
    Subnet
    @@ -59,11 +65,13 @@

    @@ -72,11 +80,12 @@

    DNS Name:
    - {{loadBalancer.elb.dnsName}} + {{loadBalancer.elb.dnsName}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="loadBalancer.elb.dnsName" + tool-tip="'Copy DNS Name to clipboard'" + >
    @@ -95,7 +104,9 @@

    • - + {{securityGroup.name}} ({{securityGroup.id}})
      • diff --git a/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html index f9b5c5bbb77..8778e9a890f 100644 --- a/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html @@ -43,7 +43,6 @@

    -
    diff --git a/app/scripts/modules/azure/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/azure/pipeline/stages/bake/bakeStage.html index 95a6239741f..4115ad1a53b 100644 --- a/app/scripts/modules/azure/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/azure/pipeline/stages/bake/bakeStage.html @@ -7,17 +7,14 @@ - + @@ -25,61 +22,70 @@
    - +
    - - + + - + - - - - - + + + + + - - - - - + + + + + - - - + + +
    KeyValueActions
    KeyValueActions
    - {{key}} - - - - Remove -
    + {{key}} + + + + Remove +
    - -
    + +
    - - + +
    diff --git a/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStage.html index cae8210eb7e..c33ec206602 100644 --- a/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,13 +1,9 @@
    - +
    - diff --git a/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/azure/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/azure/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/azure/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStage.html index eb8a9767659..f5481a7c2db 100644 --- a/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,16 +1,11 @@ -
    +
    - +
    - +
    diff --git a/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/azure/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/azure/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/azure/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStage.html index f60bb1a4453..718466d0b99 100644 --- a/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,16 +1,11 @@
    - +
    - +
    diff --git a/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStepLabel.html index 9261272f7f8..5a77ae17c0f 100644 --- a/app/scripts/modules/azure/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/azure/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/azure/securityGroup/clone/cloneSecurityGroup.html b/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.html index 290f5c5d207..215a65e1b9a 100644 --- a/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.html +++ b/app/scripts/modules/azure/securityGroup/clone/cloneSecurityGroup.html @@ -1,4 +1,3 @@ - diff --git a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroup.html index 71222056472..93cd5f72387 100644 --- a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroup.html +++ b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroup.html @@ -8,10 +8,13 @@
    - - + +
    diff --git a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html index 023928d92b7..d810ed5d2a1 100644 --- a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html +++ b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupIngress.html @@ -2,7 +2,8 @@

    - Source/Destination address prefixes can only be edited through the Azure Portal. + Source/Destination address prefixes can only be edited + through the Azure Portal.

    @@ -13,32 +14,53 @@ Protocol - Start Port + + Start Port + End Port - Actions + Actions - - - - + + + + + + + + + + - + - + @@ -46,11 +68,13 @@
    -
    -
    - +
    +
    + +
    diff --git a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html index 2471753fae3..fbc2fd121ec 100644 --- a/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html +++ b/app/scripts/modules/azure/securityGroup/configure/createSecurityGroupProperties.html @@ -1,6 +1,9 @@
    -
    +
    Your will be named:
    @@ -8,9 +11,13 @@
    Detail
    - +
    @@ -22,12 +29,28 @@
    Account
    - +
    - +
    diff --git a/app/scripts/modules/azure/securityGroup/configure/editSecurityGroup.html b/app/scripts/modules/azure/securityGroup/configure/editSecurityGroup.html index e970e0c5288..70a0224e9d8 100644 --- a/app/scripts/modules/azure/securityGroup/configure/editSecurityGroup.html +++ b/app/scripts/modules/azure/securityGroup/configure/editSecurityGroup.html @@ -1,4 +1,3 @@ - diff --git a/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.html index 57e8df76005..3a8ad8e9db7 100644 --- a/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.html +++ b/app/scripts/modules/azure/securityGroup/details/securityGroupDetail.html @@ -1,8 +1,7 @@
    - +
    @@ -21,9 +20,13 @@

    Actions

    @@ -41,10 +44,15 @@

    {{securityGroup.description}}
    - +
    None
    -
    +
    Name
    {{rule.name}}
    Priority
    @@ -63,9 +71,8 @@

    {{rule.destinationAddressPrefix}}
    Dest Port Range
    {{rule.destinationPortRange}}
    -
    +

    -

    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettings.html index 1f5f405b838..fb626d5010f 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettings.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettings.html @@ -1,5 +1,5 @@ -
    -
    - -
    -
    \ No newline at end of file +
    +
    + +
    +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html index 60fd4468301..1f029d00059 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html @@ -2,7 +2,16 @@
    Number of Instances
    -
    +
    + +
    @@ -10,7 +19,9 @@ Custom Data
    -
    +
    + +
    @@ -27,7 +38,11 @@
    - +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/basicSettings.html b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/basicSettings.html index 49757a78274..c51a21a5bed 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/basicSettings.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/basicSettings/basicSettings.html @@ -6,19 +6,39 @@ Account
    - +
    - +
    Stack
    -
    @@ -33,7 +53,13 @@
    -
    @@ -48,7 +74,12 @@
    - + {{$select.selected.imageName}} @@ -56,11 +87,16 @@
    - +
    -
    +

    Your server group will be in the cluster:

    @@ -69,17 +105,20 @@

    (new cluster)

    -
    +

    There is already a server group in this cluster. Do you want to clone it?

    - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. + Cloning copies the entire configuration from the selected server group, allowing you to modify + whichever fields (e.g. image) you need to change in the new server group.

    - To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the - server group. + To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of + the server group.

    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacity.html b/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacity.html index ee1d0758f55..69b4d426b7c 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacity.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacity.html @@ -1,6 +1,5 @@ -

    -
    - -
    +
    +
    +
    - \ No newline at end of file +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacitySelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacitySelector.directive.html index 95af29ac3d5..fb550849d0f 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacitySelector.directive.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/capacity/capacitySelector.directive.html @@ -6,11 +6,15 @@
    Number of Instances
    -
    +
    + +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/instanceArchetype.html b/app/scripts/modules/azure/serverGroup/configure/wizard/instanceArchetype.html index e60a3acca06..00898e359dc 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/instanceArchetype.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/instanceArchetype.html @@ -1,19 +1,32 @@ -
    +
    - - - - + +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/instanceType.html b/app/scripts/modules/azure/serverGroup/configure/wizard/instanceType.html index 6646548cfbf..97e012d28b1 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/instanceType.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/instanceType.html @@ -1,19 +1,32 @@ - +
    - - - - + +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.html index e768b4f7832..c7a5b0dfd6e 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.html @@ -1,9 +1,17 @@
    Please select an account and region.
    -
    +
    Load Balancers
    - + {{$select.selected}} @@ -19,7 +27,8 @@
    Pleas last refreshed {{ getLoadBalancerRefreshTime() | timestamp }} refreshing...

    -

    If you're not finding a load balancer that was recently added, +

    + If you're not finding a load balancer that was recently added, click here to refresh the list.

    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.html index 909e5213319..a637f848aa8 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.html @@ -1,9 +1,19 @@ -
    Please select an account, a region and a load balancer first.
    -
    +
    + Please select an account, a region and a load balancer first. +
    +
    Subnets
    - + {{$select.selected}} @@ -11,7 +21,7 @@
    Ple
    - +
    @@ -19,12 +29,11 @@

    Your server group will be using a subnet in virtual network:

    - {{networkSettingCtrl.getVnetName()}} + {{networkSettingCtrl.getVnetName()}}

    - -
    \ No newline at end of file +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.html index da5558ecbe1..9cbaff070b3 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.html @@ -1,11 +1,22 @@
    Please select an account and region.
    -
    +
    -
    +
    + +
    - + {{$select.selected.id}} - + @@ -20,7 +31,8 @@
    Plea last refreshed {{ getSecurityGroupRefreshTime() | timestamp }} refreshing...

    -

    If you're not finding a that was recently added, +

    + If you're not finding a that was recently added, click here to refresh the list.

    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/azure/serverGroup/configure/wizard/serverGroupWizard.html index 3fe88c42703..46b3bd6ff52 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/serverGroupWizard.html @@ -7,10 +7,12 @@
    - + @@ -28,9 +30,16 @@
    - - + +
    diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html index 468f99583e4..0132c9aed1c 100644 --- a/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/azure/serverGroup/configure/wizard/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.html index c2feadaf0dc..6b61e2a09a9 100644 --- a/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/azure/serverGroup/details/serverGroupDetails.html @@ -1,23 +1,18 @@ -
    - +
    -
    - - - -
    -
    - -
    +
    + + + +
    +
    + +
    -
    - +
    @@ -46,8 +41,10 @@

    -

    @@ -55,7 +52,10 @@

    [SERVER GROUP IS DISABLED]

    - +
    @@ -95,6 +95,5 @@

    [SERVER GROUP IS DISABLED
    {{serverGroup.securityGroupName}}

     -

    diff --git a/app/scripts/modules/azure/subnet/subnetSelectField.directive.html b/app/scripts/modules/azure/subnet/subnetSelectField.directive.html index dced2d7bcda..288cc39f9b9 100644 --- a/app/scripts/modules/azure/subnet/subnetSelectField.directive.html +++ b/app/scripts/modules/azure/subnet/subnetSelectField.directive.html @@ -5,13 +5,21 @@
    (Select an account)
    - - + - +

    {{component[field]}}

    diff --git a/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.html b/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.html index 1521ce44b6a..1f6056a14ec 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.html +++ b/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.html @@ -5,9 +5,11 @@
    - +
    @@ -16,41 +18,46 @@
    - - - - - - - - - - - - + + + + + + + + + + + +
    Canary ResultDurationReportLast Updated
    - - - - {{ canaryDeployment.canaryAnalysisResult.timeDuration.durationString }} - - - - - - - - Canary Report - - - - {{ canaryDeployment.canaryAnalysisResult.lastUpdated | timestamp}} - - - - - -
    Canary ResultDurationReportLast Updated
    + + + + {{ canaryDeployment.canaryAnalysisResult.timeDuration.durationString }} + + + - + + + + Canary Report + + + + {{ canaryDeployment.canaryAnalysisResult.lastUpdated | timestamp}} + + + - + +
    @@ -95,24 +102,34 @@
    Result
    -
    Canary result has been manually set
    +
    + Canary result has been manually set +
    -
    + style="margin-top: 6px;" + >
    Result
    -
    {{ canary.canaryResult.message }}
    +
    + {{ canary.canaryResult.message }} +
    - +
    @@ -131,7 +148,9 @@
    Account
    -
    +
    + +
    Duration
    @@ -164,7 +183,11 @@
    Analysis Config
    Config Name
    - + {{canaryConfig.canaryAnalysisConfig.name}} @@ -207,33 +230,36 @@
    Health Check

    Loading...

    - Canary analysis history could not be loaded.
    + Canary analysis history could not be loaded.
    Reload score history

    - - - - - - + + + + + + - - - - - - + + + + + +
    ScoreScore DurationGenerated OnReport
    ScoreScore DurationGenerated OnReport
    - - {{ scoreReport.timeDuration.durationString }}{{ scoreReport.lastUpdated | timestamp }}Canary Report
    + + {{ scoreReport.timeDuration.durationString }}{{ scoreReport.lastUpdated | timestamp }}Canary Report
    -

    No canary analysis history available

    - +

    + No canary analysis history available +

    diff --git a/app/scripts/modules/canary/acaTask/acaTaskExecutionSummary.html b/app/scripts/modules/canary/acaTask/acaTaskExecutionSummary.html index 005eb9561ab..87df0731ab8 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskExecutionSummary.html +++ b/app/scripts/modules/canary/acaTask/acaTaskExecutionSummary.html @@ -2,9 +2,13 @@
    {{stageSummary.name || stageSummary.type }} Details -
    + stageSummary.masterStage.context.canary.status.status === 'DISABLED'" + uib-dropdown + class="btn-group pull-right" + >
    -
    - -
    Duration: {{stageSummary.runningTimeInMs | duration}}
    - - - - - + + + + + - - - - - - + + + + + - - - - - + ng-click="ctrl.toggleDetails($index)" + > + + + +
    DeploymentStartedRunning Time
    DeploymentStartedRunning Time
    - - Canary Summary - {{stageSummary.startTime | timestamp}}{{stageSummary.runningTimeInMs | duration}}
    + + Canary Summary + {{stageSummary.startTime | timestamp}}{{stageSummary.runningTimeInMs | duration}}
    {{stage.name}}{{stage.startTime | timestamp}}{{stage.runningTimeInMs | duration}}
    {{stage.name}}{{stage.startTime | timestamp}}{{stage.runningTimeInMs | duration}}
    diff --git a/app/scripts/modules/canary/acaTask/acaTaskStage.html b/app/scripts/modules/canary/acaTask/acaTaskStage.html index 0889af3eda1..9cc9c378afa 100644 --- a/app/scripts/modules/canary/acaTask/acaTaskStage.html +++ b/app/scripts/modules/canary/acaTask/acaTaskStage.html @@ -1,18 +1,21 @@

    Canary Config

    - + - + hours - @@ -24,22 +27,30 @@

    Canary Config

    - +
    - +
    @@ -50,30 +61,45 @@
    Analysis Config
    + model="stage.canary.canaryConfig.canaryAnalysisConfig.name" + class-name="form-control input-sm" + > - + minutes before starting analysis - + - + minutes
    @@ -87,22 +113,24 @@
    Analysis Config
    type="number" required ng-model="stage.canary.canaryConfig.canaryAnalysisConfig.lookbackMins" - class="form-control input-sm" style="display: inline-block; width: 40%"/> + class="form-control input-sm" + style="display: inline-block; width: 40%" + /> minutes
    - NOTE: To provide enough data points for the Canary Analysis it is recommended to set the look-back time to at least 30 minutes. + ng-if="stage.canary.canaryConfig.canaryAnalysisConfig.lookbackMins > 0 && stage.canary.canaryConfig.canaryAnalysisConfig.lookbackMins < 30" + > + NOTE: To provide enough data points for the Canary Analysis it is recommended to set the look-back time to + at least 30 minutes.
    -
    Owner
    - +
    Watchers
    @@ -111,9 +139,9 @@
    Watchers
    help-key="pipeline.config.canary.watchers" ng-keyup="acaTaskStageCtrl.updateWatchersList()" ng-paste="acaTaskStageCtrl.updateWatchersList()" - label="Emails"> - + label="Emails" + > +
    Metric Scope
    @@ -125,26 +153,20 @@
    Metric Scope + required + > - @@ -155,7 +177,8 @@
    Metric Scope + ng-model="canaryDeployment.baseline" + > Metric Scope - + type="text" + /> - - Metric Scope - - + type="text" + />
    diff --git a/app/scripts/modules/canary/canary/actions/endCanary.modal.html b/app/scripts/modules/canary/canary/actions/endCanary.modal.html index 09b3892b6dd..81107985592 100644 --- a/app/scripts/modules/canary/canary/actions/endCanary.modal.html +++ b/app/scripts/modules/canary/canary/actions/endCanary.modal.html @@ -7,16 +7,14 @@

    End Canary

    -
    - +
    @@ -37,11 +35,13 @@

    End Canary

    Cancel Close - diff --git a/app/scripts/modules/canary/canary/actions/generateScore.modal.html b/app/scripts/modules/canary/canary/actions/generateScore.modal.html index 61741988c63..a190a6e1d70 100644 --- a/app/scripts/modules/canary/canary/actions/generateScore.modal.html +++ b/app/scripts/modules/canary/canary/actions/generateScore.modal.html @@ -9,12 +9,15 @@

    Generate Canary Analysis Result

    - - + @@ -38,11 +41,13 @@

    Generate Canary Analysis Result

    Cancel Close - diff --git a/app/scripts/modules/canary/canary/canaryAnalysisNameSelector.component.html b/app/scripts/modules/canary/canary/canaryAnalysisNameSelector.component.html index 7bacb511a9f..a2a706a2ede 100644 --- a/app/scripts/modules/canary/canary/canaryAnalysisNameSelector.component.html +++ b/app/scripts/modules/canary/canary/canaryAnalysisNameSelector.component.html @@ -1,24 +1,27 @@ -
    - - {{$select.selected}} +
    + + {{ $select.selected }} - {{name}} + {{ name }} - + - ACA Configurations   + ACA Configurations  
    diff --git a/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.html b/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.html index 4775d896a65..3759aa0620d 100644 --- a/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.html +++ b/app/scripts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.html @@ -5,9 +5,11 @@
    - +
    @@ -15,16 +17,18 @@ {{ deployment.canaryResult.lastUpdated | timestamp}} No canary result available -
    +
    Score duration :   {{ deployment.canaryResult.timeDuration.durationString }}
    - Canary Report + Canary Report -
    +
    Diff Report
    @@ -38,8 +42,12 @@
    Cluster
    - {{deployment.baselineCluster.name}}
    + {{deployment.baselineCluster.name}} +
    Image
    @@ -49,9 +57,12 @@
    Build
    n/a - #{{deployment.baselineCluster.build.number}} + #{{deployment.baselineCluster.build.number}}
    @@ -67,8 +78,11 @@
    Cluster
    - {{deployment.canaryCluster.name}} + {{deployment.canaryCluster.name}}
    @@ -79,9 +93,12 @@
    Build
    n/a - #{{deployment.canaryCluster.build.number}} + #{{deployment.canaryCluster.build.number}}
    @@ -98,24 +115,26 @@

    Loading...

    - Canary analysis history could not be loaded.
    + Canary analysis history could not be loaded.
    Reload score history

    - - - - - - + + + + + + @@ -123,14 +142,21 @@
    ScoreScore DurationGenerated OnReport
    ScoreScore DurationGenerated OnReport
    - + {{ scoreReport.timeDuration.durationString }} {{ scoreReport.lastUpdated | timestamp }}
    -

    No canary analysis history available

    - +

    + No canary analysis history available +

    - + + + + + + + diff --git a/app/scripts/modules/canary/canary/canaryExecutionDetails.html b/app/scripts/modules/canary/canary/canaryExecutionDetails.html index 74b84bd3625..8520ae29d45 100644 --- a/app/scripts/modules/canary/canary/canaryExecutionDetails.html +++ b/app/scripts/modules/canary/canary/canaryExecutionDetails.html @@ -5,9 +5,11 @@
    - +
    @@ -15,45 +17,50 @@
    #DateCommitMessageAuthor
    #DateCommitMessageAuthor
    {{$index+1}}   {{commit.timestamp | date:'MM/dd'}}  
    - - - - - - - - - - - - - - + + + + + + + + + + + + + +
    DeploymentCanary ResultDurationReportLast Updated
    - {{ canaryDeployment.canaryCluster.region }} - - - - - {{ canaryDeployment.canaryResult.timeDuration.durationString }} - - - - - - - - Canary Report - - - - {{ canaryDeployment.canaryResult.lastUpdated | timestamp}} - - - - - -
    DeploymentCanary ResultDurationReportLast Updated
    + {{ canaryDeployment.canaryCluster.region }} + + + + + {{ canaryDeployment.canaryResult.timeDuration.durationString }} + + + - + + + + Canary Report + + + + {{ canaryDeployment.canaryResult.lastUpdated | timestamp}} + + + - + +
    @@ -98,24 +105,34 @@
    Result
    -
    Canary result has been manually set
    +
    + Canary result has been manually set +
    -
    + style="margin-top: 6px;" + >
    Result
    -
    {{ canary.canaryResult.message }}
    +
    + {{ canary.canaryResult.message }} +
    - +
    @@ -134,7 +151,9 @@
    Baseline
    -
    {{baseline.cluster}}
    +
    + {{baseline.cluster}} +
    Duration
    @@ -155,7 +174,11 @@
    Analysis Config
    Config Name
    - + {{canaryConfig.canaryAnalysisConfig.name}} @@ -200,7 +223,7 @@
    Health Check
    after {{ canaryAction.delayBeforeActionInMins }} minutes -
    +
    diff --git a/app/scripts/modules/canary/canary/canaryExecutionSummary.html b/app/scripts/modules/canary/canary/canaryExecutionSummary.html index 1022750ead3..ff253a17352 100644 --- a/app/scripts/modules/canary/canary/canaryExecutionSummary.html +++ b/app/scripts/modules/canary/canary/canaryExecutionSummary.html @@ -2,9 +2,13 @@
    {{stageSummary.name || stageSummary.type }} Details -
    + stageSummary.masterStage.context.canary.status.status === 'DISABLED'" + uib-dropdown + class="btn-group pull-right" + > diff --git a/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.html b/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.html index b8f352681bb..84b8a70eebb 100644 --- a/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.html +++ b/app/scripts/modules/core/src/application/config/applicationCacheManagement.directive.html @@ -1,5 +1,4 @@ -

    We use local storage to speed up performance throughout the application. -

    +

    We use local storage to speed up performance throughout the application.

    If you're not seeing one of those in a dropdown, it may be because our cached versions are too old.

    @@ -13,8 +12,7 @@
    {{vm.getCacheInfo('instanceTypes').ageMax | timestamp}}
    - +
    @@ -23,8 +21,7 @@
    {{vm.getCacheInfo('loadBalancers').ageMax | timestamp}}
    - +
    @@ -33,8 +30,7 @@
    {{vm.getCacheInfo('securityGroups').ageMax | timestamp}}
    - +
    @@ -43,8 +39,7 @@
    {{vm.getCacheInfo('subnets').ageMax | timestamp}}
    - +
    @@ -53,18 +48,18 @@
    {{vm.getCacheInfo('networks').ageMax | timestamp}}
    - +
    - - +
    diff --git a/app/scripts/modules/core/src/application/config/applicationConfig.view.html b/app/scripts/modules/core/src/application/config/applicationConfig.view.html index 9b494fbcc16..f88dcd04b12 100644 --- a/app/scripts/modules/core/src/application/config/applicationConfig.view.html +++ b/app/scripts/modules/core/src/application/config/applicationConfig.view.html @@ -4,7 +4,10 @@ - + diff --git a/app/scripts/modules/core/src/application/config/applicationNotifications.directive.html b/app/scripts/modules/core/src/application/config/applicationNotifications.directive.html index 1acc8ab7530..114a50dddce 100644 --- a/app/scripts/modules/core/src/application/config/applicationNotifications.directive.html +++ b/app/scripts/modules/core/src/application/config/applicationNotifications.directive.html @@ -1,2 +1,6 @@

    You can edit notification settings for this application

    - + diff --git a/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.html b/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.html index 3f9744872dc..0ffd93dccb3 100644 --- a/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.html +++ b/app/scripts/modules/core/src/application/config/applicationSnapshotSection.component.html @@ -1,11 +1,11 @@

    - Taking an application snapshot will save the current state of the infrastructure to a storage bucket
    - using Terraform's config language. - Currently only GCE infrastructure and GCS or S3 storage are supported. + Taking an application snapshot will save the current state of the infrastructure to a storage bucket
    + using Terraform's config language. Currently only + GCE infrastructure and GCS or S3 storage are supported.

    - diff --git a/app/scripts/modules/core/src/application/config/dataSources/applicationDataSourceEditor.component.html b/app/scripts/modules/core/src/application/config/dataSources/applicationDataSourceEditor.component.html index 5cedaeaa2f2..a11ff31105f 100644 --- a/app/scripts/modules/core/src/application/config/dataSources/applicationDataSourceEditor.component.html +++ b/app/scripts/modules/core/src/application/config/dataSources/applicationDataSourceEditor.component.html @@ -1,30 +1,30 @@

    If you don't need or want certain features for your application, you can disable them here.

    Disabling a feature only changes the display in Spinnaker - it won't delete any actual data.

    - +

    -
    -
    There was an error saving your changes. Please try again.
    - In sync with server + In sync with server
    diff --git a/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.html b/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.html index 91a0ef55a1b..e678281636e 100644 --- a/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.html +++ b/app/scripts/modules/core/src/application/config/deleteApplicationSection.directive.html @@ -1,13 +1,13 @@

    - Deleting the application only removes the associated metadata around the application. - It will not delete any , load balancers, or pipeline configurations you - may have created. + Deleting the application only removes the associated metadata around the application. It will + not delete any , load balancers, or pipeline + configurations you may have created.

    You cannot delete this application because it has server groups.

    - diff --git a/app/scripts/modules/core/src/application/config/footer/configSectionFooter.component.html b/app/scripts/modules/core/src/application/config/footer/configSectionFooter.component.html index 4dce7eb1237..ec545b42731 100644 --- a/app/scripts/modules/core/src/application/config/footer/configSectionFooter.component.html +++ b/app/scripts/modules/core/src/application/config/footer/configSectionFooter.component.html @@ -1,21 +1,26 @@
    -
    - -
    There was an error saving your changes. Please try again.
    - In sync with server +
    + There was an error saving your changes. Please try again. +
    + In sync with server
    diff --git a/app/scripts/modules/core/src/application/config/links/applicationLinks.component.html b/app/scripts/modules/core/src/application/config/links/applicationLinks.component.html index 7a52afdbaef..73e366b2846 100644 --- a/app/scripts/modules/core/src/application/config/links/applicationLinks.component.html +++ b/app/scripts/modules/core/src/application/config/links/applicationLinks.component.html @@ -1,8 +1,7 @@

    - Links appear in the instance details panel and provide a shortcut to common features, - such as logs, health, etc. + Links appear in the instance details panel and provide a shortcut to common features, such as logs, health, etc.

    Links paths are templates - you can customize them using a number of field attributes available on the instance. @@ -28,16 +27,13 @@

    -
    - +
    Section Heading
    - +
    @@ -49,9 +45,17 @@
    Cloud Provider(s)
    - - {{$item}} - {{provider}} + + {{ $item }} + {{ provider }}
    @@ -66,25 +70,30 @@
    Links
    -
    +
    - + - + class="glyphicon glyphicon-resize-vertical" + style="visibility: hidden" + > +
    - +
    @@ -109,8 +118,10 @@
    - + diff --git a/app/scripts/modules/core/src/application/config/links/editLinks.modal.html b/app/scripts/modules/core/src/application/config/links/editLinks.modal.html index d08cd775f19..0f8c4503cd9 100644 --- a/app/scripts/modules/core/src/application/config/links/editLinks.modal.html +++ b/app/scripts/modules/core/src/application/config/links/editLinks.modal.html @@ -12,9 +12,9 @@

    Edit Application Links

    - Note: Clicking "Update" below will not save your changes to the server - it only - updates the configuration within the browser, so you'll want to verify your changes and click "Save Changes" - when you're ready. + Note: Clicking "Update" below will not save your changes to the server - it only updates the + configuration within the browser, so you'll want to verify your changes and click "Save Changes" when you're + ready.

    @@ -26,9 +26,6 @@

    Edit Application Links

    - +
    diff --git a/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.html b/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.html index aedb8270416..b9fb297e9b7 100644 --- a/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.html +++ b/app/scripts/modules/core/src/application/config/trafficGuard/trafficGuardConfig.component.html @@ -1,9 +1,11 @@
    -

    Traffic Guards allow you to specify critical clusters that should always have active instances. If a user - or process tries to delete, disable, or resize the server group, Spinnaker will verify the operation will not - leave the cluster with no active instances, and fail the operation if it would.

    +

    + Traffic Guards allow you to specify critical clusters that should always have active instances. If a user or + process tries to delete, disable, or resize the server group, Spinnaker will verify the operation will not leave + the cluster with no active instances, and fail the operation if it would. +

    @@ -26,43 +28,58 @@ - - - - - - - - - (select account) - - - - - - - - - - - - - + + + + + + + + + (select account) + + + + + + + + + + + + + + +
    - +
    diff --git a/app/scripts/modules/core/src/application/modal/applicationProviderFields.component.html b/app/scripts/modules/core/src/application/modal/applicationProviderFields.component.html index c437011514b..534524de353 100644 --- a/app/scripts/modules/core/src/application/modal/applicationProviderFields.component.html +++ b/app/scripts/modules/core/src/application/modal/applicationProviderFields.component.html @@ -1,4 +1 @@ - - + diff --git a/app/scripts/modules/core/src/application/modal/editApplication.html b/app/scripts/modules/core/src/application/modal/editApplication.html index 15f4b42d16c..08f4e17f4b5 100644 --- a/app/scripts/modules/core/src/application/modal/editApplication.html +++ b/app/scripts/modules/core/src/application/modal/editApplication.html @@ -13,22 +13,26 @@

    Edit Application

    -
    Owner Email *
    - -
    -
    - -
    + +
    +
    + +
    Please enter a valid email address
    @@ -36,16 +40,26 @@

    Edit Application

    - {{errorMsg}} + {{errorMsg}} +
    Alias(es)
    - +
    @@ -55,7 +69,8 @@

    Edit Application

    @@ -63,21 +78,25 @@

    Edit Application

    Repo Project
    - +
    Repo Name
    - +
    @@ -95,10 +114,11 @@

    Edit Application

    Description
    @@ -119,16 +139,19 @@

    Edit Application

    + application="editApp.applicationAttributes" + >
    Instance Health
    @@ -138,9 +161,11 @@

    Edit Application

    @@ -149,11 +174,14 @@

    Edit Application

    -

    +

    + {{editApp.data.showOverrideWarning}}

    - Okay + Okay

    @@ -164,12 +192,14 @@

    Edit Application

    - +
    @@ -177,8 +207,7 @@

    Edit Application

    Pipeline Behavior
    @@ -187,13 +216,13 @@

    Edit Application

    -
    - Permissions -
    +
    Permissions
    - +
    @@ -210,15 +239,16 @@

    Edit Application

    * Required
    -
    Cancel - +
    diff --git a/app/scripts/modules/core/src/application/modal/newapplication.html b/app/scripts/modules/core/src/application/modal/newapplication.html index d4efdc759ce..7a19f39fc73 100644 --- a/app/scripts/modules/core/src/application/modal/newapplication.html +++ b/app/scripts/modules/core/src/application/modal/newapplication.html @@ -7,36 +7,49 @@

    New Application

    -
    +
    - Error initializing dialog. Check that your gate endpoint is accessible. Further information on troubleshooting this - error is available here. + Error initializing dialog. Check that your gate endpoint is accessible. Further information on troubleshooting + this error is available here.
    -
    +
    Name *
    - +
    - +
    @@ -47,13 +60,15 @@

    New Application

    Owner Email *
    - +
    @@ -69,7 +84,8 @@

    New Application

    @@ -77,21 +93,25 @@

    New Application

    Repo Project
    - +
    Repo Name
    - +
    @@ -101,7 +121,9 @@

    New Application

    - + @@ -111,10 +133,11 @@

    New Application

    Description
    @@ -135,15 +158,15 @@

    New Application

    + application="newAppModal.application" + >
    Instance Health
    @@ -154,9 +177,11 @@

    New Application

    @@ -165,11 +190,17 @@

    New Application

    -

    +

    + {{newAppModal.data.showOverrideWarning}}

    - Okay + Okay

    @@ -180,12 +211,14 @@

    New Application

    - +
    @@ -193,8 +226,7 @@

    New Application

    Pipeline Behavior
    @@ -203,13 +235,13 @@

    New Application

    -
    - Permissions -
    +
    Permissions
    - +
    @@ -234,10 +266,12 @@

    New Application

    Cancel - +
    diff --git a/app/scripts/modules/core/src/application/modal/platformHealthOverrideCheckbox.directive.html b/app/scripts/modules/core/src/application/modal/platformHealthOverrideCheckbox.directive.html index 54c61067cf2..14416feacbd 100644 --- a/app/scripts/modules/core/src/application/modal/platformHealthOverrideCheckbox.directive.html +++ b/app/scripts/modules/core/src/application/modal/platformHealthOverrideCheckbox.directive.html @@ -1,8 +1,6 @@
    diff --git a/app/scripts/modules/core/src/authentication/userMenu/userMenu.directive.html b/app/scripts/modules/core/src/authentication/userMenu/userMenu.directive.html index 69bd2a6bb35..9a9055ed607 100644 --- a/app/scripts/modules/core/src/authentication/userMenu/userMenu.directive.html +++ b/app/scripts/modules/core/src/authentication/userMenu/userMenu.directive.html @@ -1,7 +1,15 @@
  • -
      @@ -17,7 +25,12 @@
      -
        diff --git a/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyConfig.component.html b/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyConfig.component.html index 9a330156a56..41b4a91c122 100644 --- a/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyConfig.component.html +++ b/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyConfig.component.html @@ -1,28 +1,32 @@
        - +
        Termination frequency
        - + days
        - + days
        @@ -30,19 +34,19 @@
        Termination frequency
        @@ -50,7 +54,11 @@
        Termination frequency
        - +
        Documentation
        @@ -58,8 +66,10 @@
        Documentation
        - +
        diff --git a/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyExceptions.component.html b/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyExceptions.component.html index 169726fabaa..e0ad41fbf2c 100644 --- a/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyExceptions.component.html +++ b/app/scripts/modules/core/src/chaosMonkey/chaosMonkeyExceptions.component.html @@ -3,52 +3,66 @@
        Exceptions
        - - - - - - - - + + + + + + + + - - - - - - - - + on-change="$ctrl.updateConfig()" + > + + + + + + +
        AccountRegionStackDetailMatched Clusters
        AccountRegionStackDetailMatched Clusters
        - + + - - (select account) - - - - - - - -
        + (select account) + + + + + + + + + +
        diff --git a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.html b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.html index 60292755f3e..7c31a63e880 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.html +++ b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelector.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html index 6bcdfdcf7e0..f069e286741 100644 --- a/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html @@ -6,12 +6,10 @@

        Select Your Provider's Version

        Version
        - +
        @@ -24,4 +22,3 @@

        Select Your Provider's Version

    - diff --git a/app/scripts/modules/core/src/cluster/allClusters.html b/app/scripts/modules/core/src/cluster/allClusters.html index 9216394fb19..a5668f72e82 100644 --- a/app/scripts/modules/core/src/cluster/allClusters.html +++ b/app/scripts/modules/core/src/cluster/allClusters.html @@ -2,9 +2,11 @@
    -
    - +
    diff --git a/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.html b/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.html index 90edf518d82..434341a32c4 100644 --- a/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.html +++ b/app/scripts/modules/core/src/cluster/filter/clusterFilter.component.html @@ -1,25 +1,32 @@
    - Clear All + Clear All
    - +
    -
    @@ -29,8 +36,11 @@
    @@ -38,7 +48,11 @@
    @@ -46,7 +60,11 @@
    @@ -54,7 +72,9 @@
    @@ -62,7 +82,11 @@
    @@ -71,49 +95,49 @@
    @@ -123,17 +147,24 @@
    -
    @@ -142,29 +173,33 @@
    Min: - +
    Max: - +
    - + + update-label-filters="$ctrl.onLabelFiltersChange" + > -
    diff --git a/app/scripts/modules/core/src/cluster/filter/collapsibleFilterSection.html b/app/scripts/modules/core/src/cluster/filter/collapsibleFilterSection.html index b2a80494545..117fb1e76e7 100644 --- a/app/scripts/modules/core/src/cluster/filter/collapsibleFilterSection.html +++ b/app/scripts/modules/core/src/cluster/filter/collapsibleFilterSection.html @@ -1,10 +1,10 @@
    - -

    - - {{heading}} - -

    -     + +

    + + {{heading}} + +

    +
    diff --git a/app/scripts/modules/core/src/cluster/onDemand/onDemandOptionTemplate.html b/app/scripts/modules/core/src/cluster/onDemand/onDemandOptionTemplate.html index 0a463635c0e..1cd70d0052d 100644 --- a/app/scripts/modules/core/src/cluster/onDemand/onDemandOptionTemplate.html +++ b/app/scripts/modules/core/src/cluster/onDemand/onDemandOptionTemplate.html @@ -1,3 +1 @@ - - - + diff --git a/app/scripts/modules/core/src/confirmationModal/confirm.html b/app/scripts/modules/core/src/confirmationModal/confirm.html index a9d102c9103..c0d9c6e1e4b 100644 --- a/app/scripts/modules/core/src/confirmationModal/confirm.html +++ b/app/scripts/modules/core/src/confirmationModal/confirm.html @@ -1,18 +1,28 @@
    - +

    {{params.header}}

    -
    +
    - +
    @@ -24,18 +34,22 @@

    An exception occurred:

    -
    -
    - +
    +
    - - - +
    diff --git a/app/scripts/modules/core/src/instance/details/instanceLinks.component.html b/app/scripts/modules/core/src/instance/details/instanceLinks.component.html index efd77363ef0..6eff6b938e3 100644 --- a/app/scripts/modules/core/src/instance/details/instanceLinks.component.html +++ b/app/scripts/modules/core/src/instance/details/instanceLinks.component.html @@ -1,7 +1,7 @@ - + diff --git a/app/scripts/modules/core/src/instance/details/multipleInstances.view.html b/app/scripts/modules/core/src/instance/details/multipleInstances.view.html index 15513956606..a5889e9e1c0 100644 --- a/app/scripts/modules/core/src/instance/details/multipleInstances.view.html +++ b/app/scripts/modules/core/src/instance/details/multipleInstances.view.html @@ -1,32 +1,57 @@
    - +
    -

    - {{vm.instancesCount}} Instances -

    +

    {{vm.instancesCount}} Instances

    - - +
    diff --git a/app/scripts/modules/core/src/modal/wizard/v2modalWizard.component.html b/app/scripts/modules/core/src/modal/wizard/v2modalWizard.component.html index 9341b53cac5..913637626de 100644 --- a/app/scripts/modules/core/src/modal/wizard/v2modalWizard.component.html +++ b/app/scripts/modules/core/src/modal/wizard/v2modalWizard.component.html @@ -2,30 +2,34 @@
    -

    {{$ctrl.wizard.heading}}

    +

    {{ $ctrl.wizard.heading }}

    -
    +
    diff --git a/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.html b/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.html index 1cf08828cf2..00abe59bb99 100644 --- a/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.html +++ b/app/scripts/modules/core/src/modal/wizard/v2wizardPage.component.html @@ -1,8 +1,10 @@ -
    +
    -

    {{$ctrl.label}}

    +

    + {{ $ctrl.label }} +

    diff --git a/app/scripts/modules/core/src/notification/modal/editNotification.html b/app/scripts/modules/core/src/notification/modal/editNotification.html index db0879c091e..a8029b2e645 100644 --- a/app/scripts/modules/core/src/notification/modal/editNotification.html +++ b/app/scripts/modules/core/src/notification/modal/editNotification.html @@ -18,16 +18,21 @@

    Edit Notification

    name="when" value="{{wo}}" ng-model="selectedWhenOptions[wo]" - ng-checked="editNotification.notification.when.includes(wo)"> + ng-checked="editNotification.notification.when.includes(wo)" + /> {{wo|notificationWhen:level:editNotification.stageType()}}
    -
    +
    + placeholder="enter a custom notification message (optional)" + >
    @@ -37,12 +42,13 @@

    Edit Notification

    Cancel -
    diff --git a/app/scripts/modules/core/src/notification/notificationList.directive.html b/app/scripts/modules/core/src/notification/notificationList.directive.html index da808ff274e..0c42bfc63a4 100644 --- a/app/scripts/modules/core/src/notification/notificationList.directive.html +++ b/app/scripts/modules/core/src/notification/notificationList.directive.html @@ -1,69 +1,84 @@ -
    -
    -
    - -
    +
    +
    +
    +
    +
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    TypeDetailsNotify WhenActions
    - {{notification.type|notificationType}} - - {{notification|notificationDetails}} - -
    {{when|notificationWhen:level:parent.type}}
    -     		- Edit - Remove -
    - -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    TypeDetailsNotify WhenActions
    + {{notification.type|notificationType}} + + {{notification|notificationDetails}} + +
    {{when|notificationWhen:level:parent.type}}
    +     		+ Edit + Remove +
    + +
    +
    -
    - -
    -
    - - In sync with server -
    +
    + +
    +
    + + In sync with server +
    diff --git a/app/scripts/modules/core/src/notification/selector/notificationSelector.html b/app/scripts/modules/core/src/notification/selector/notificationSelector.html index e1aeee696b1..28a7621d01e 100644 --- a/app/scripts/modules/core/src/notification/selector/notificationSelector.html +++ b/app/scripts/modules/core/src/notification/selector/notificationSelector.html @@ -1,10 +1,12 @@
    Notify via
    -
    diff --git a/app/scripts/modules/core/src/notification/types/bearychat/additionalFields.html b/app/scripts/modules/core/src/notification/types/bearychat/additionalFields.html index f662b869f8d..daa18a33c7f 100644 --- a/app/scripts/modules/core/src/notification/types/bearychat/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/bearychat/additionalFields.html @@ -2,16 +2,17 @@
    Email Address
    - +
    -
    +
    Please enter a valid email address
    diff --git a/app/scripts/modules/core/src/notification/types/email/additionalFields.html b/app/scripts/modules/core/src/notification/types/email/additionalFields.html index 18acc0f1c9f..94c90d47481 100644 --- a/app/scripts/modules/core/src/notification/types/email/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/email/additionalFields.html @@ -2,16 +2,17 @@
    Email Address
    - +
    -
    +
    Please enter a valid email address
    @@ -19,16 +20,17 @@
    CC Address
    - +
    -
    +
    Please enter a valid email address
    diff --git a/app/scripts/modules/core/src/notification/types/googlechat/additionalFields.html b/app/scripts/modules/core/src/notification/types/googlechat/additionalFields.html index 136f13afa1f..fa2d3060c93 100644 --- a/app/scripts/modules/core/src/notification/types/googlechat/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/googlechat/additionalFields.html @@ -1,11 +1,13 @@
    Chat Webhook URL
    - +
    diff --git a/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html b/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html index 6e7d60d5f80..dd844b8fed3 100644 --- a/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html @@ -1,15 +1,17 @@
    -
    - Please note: You need to invite the {{vm.notificationConfig.botName}} bot to - private rooms to receive HipChat notifications
    +
    + Please note: You need to invite the + {{vm.notificationConfig.botName}} bot to private rooms to + receive HipChat notifications
    HipChat Room
    - +
    diff --git a/app/scripts/modules/core/src/notification/types/pubsub/additionalFields.html b/app/scripts/modules/core/src/notification/types/pubsub/additionalFields.html index 61b2a5a2b8d..f7daa0ece54 100644 --- a/app/scripts/modules/core/src/notification/types/pubsub/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/pubsub/additionalFields.html @@ -2,16 +2,17 @@
    Publisher Name
    - +
    -
    +
    Please enter a valid pubsub topic
    diff --git a/app/scripts/modules/core/src/notification/types/slack/additionalFields.html b/app/scripts/modules/core/src/notification/types/slack/additionalFields.html index 4ca3d8f9e7b..897a0670b4f 100644 --- a/app/scripts/modules/core/src/notification/types/slack/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/slack/additionalFields.html @@ -2,16 +2,17 @@
    Slack Channel
    #
    - +
    -
    +
    Note: You will need to invite the {{vm.notificationConfig.botName}} - bot to this channel to receive Slack notifications
    + bot to this channel to receive Slack notifications
    diff --git a/app/scripts/modules/core/src/notification/types/sms/additionalFields.html b/app/scripts/modules/core/src/notification/types/sms/additionalFields.html index 1fe15a08d6f..6b0eb33eebc 100644 --- a/app/scripts/modules/core/src/notification/types/sms/additionalFields.html +++ b/app/scripts/modules/core/src/notification/types/sms/additionalFields.html @@ -2,16 +2,17 @@
    Phone Number
    - +
    -
    +
    Please enter a valid number
    diff --git a/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.html b/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.html index 144b925fefd..0a2333df4bd 100644 --- a/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.html +++ b/app/scripts/modules/core/src/pagerDuty/pageApplicationOwner.html @@ -7,22 +7,22 @@

    Page {{ctrl.application.name}} Owner

    -
    Reason
    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.html b/app/scripts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.html index df1ac9392da..e9d37e68993 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/delete/deletePipelineModal.html @@ -12,21 +12,19 @@

    Really Delete {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}}?

    -

    Are you sure you want to delete the {{pipeline.strategy === true ? 'strategy' : 'pipeline'}}: {{pipeline.name}}?

    +

    + Are you sure you want to delete the {{pipeline.strategy === true ? 'strategy' : 'pipeline'}}: + {{pipeline.name}}? +

    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/disable/disablePipelineModal.html b/app/scripts/modules/core/src/pipeline/config/actions/disable/disablePipelineModal.html index 8b174612b4d..8bdc2796acf 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/disable/disablePipelineModal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/disable/disablePipelineModal.html @@ -13,15 +13,16 @@

    Really Disable Pipeline?

    Are you sure you want to disable {{ctrl.pipelineName}}?

    -

    This will prevent any triggers from firing, and will also prevent users from running the pipeline manually.

    +

    + This will prevent any triggers from firing, and will also prevent users from running the pipeline manually. +

    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/enable/enablePipelineModal.html b/app/scripts/modules/core/src/pipeline/config/actions/enable/enablePipelineModal.html index f18a8374f81..6e5bc21cd6b 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/enable/enablePipelineModal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/enable/enablePipelineModal.html @@ -19,8 +19,7 @@

    Really Enable Pipeline?

    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.modal.html b/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.modal.html index bad783291ca..00b2eb99f3d 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.modal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/history/showHistory.modal.html @@ -15,23 +15,27 @@

    Sorry, we couldn't find any history for this pipeline. 1">
    - +
    - +
    - +
    @@ -41,8 +45,7 @@

    loading...

    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/lock/lockPipelineModal.html b/app/scripts/modules/core/src/pipeline/config/actions/lock/lockPipelineModal.html index 8146b7b2571..04bfe26dcf6 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/lock/lockPipelineModal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/lock/lockPipelineModal.html @@ -24,7 +24,7 @@

    Really Lock Pipeline?

    - +
    @@ -33,16 +33,20 @@

    Really Lock Pipeline?

    - +
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html b/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html index 9cb364ffbe2..c1547d1e52a 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html @@ -5,15 +5,25 @@
    diff --git a/app/scripts/modules/core/src/pipeline/config/actions/rename/renamePipelineModal.html b/app/scripts/modules/core/src/pipeline/config/actions/rename/renamePipelineModal.html index 1dbe8e9da4b..b4c176bd3e7 100644 --- a/app/scripts/modules/core/src/pipeline/config/actions/rename/renamePipelineModal.html +++ b/app/scripts/modules/core/src/pipeline/config/actions/rename/renamePipelineModal.html @@ -10,20 +10,24 @@

    Rename Pipeline

    {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}} Name
    - +
    - {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}} name cannot contain any of the following characters: + {{pipeline.strategy === true ? 'Strategy' : 'Pipeline'}} name cannot contain any of the following + characters:
    - / \ ? % # + / \ ? % #
    @@ -35,9 +39,11 @@

    Rename Pipeline

    -
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.html b/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.html index faa2ddb35db..fcc7d03bc88 100644 --- a/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.html +++ b/app/scripts/modules/core/src/pipeline/config/copyStage/copyStage.modal.html @@ -13,9 +13,11 @@

    Copy Stage

    From Application
    - + {{$select.selected.name}} @@ -30,8 +32,7 @@

    Copy Stage

    Copy Stage
    - + {{$select.selected.stage.name}} @@ -51,15 +52,16 @@

    Copy Stage

    -

    It is not possible to copy a deploy stage, and deploy stages will not be included in the list above.

    +

    + It is not possible to copy a deploy stage, and deploy stages will not be included in the list above. +

    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/health/stagePlatformHealthOverrideCheckbox.directive.html b/app/scripts/modules/core/src/pipeline/config/health/stagePlatformHealthOverrideCheckbox.directive.html index 2a95d051f8c..91c0e89d67b 100644 --- a/app/scripts/modules/core/src/pipeline/config/health/stagePlatformHealthOverrideCheckbox.directive.html +++ b/app/scripts/modules/core/src/pipeline/config/health/stagePlatformHealthOverrideCheckbox.directive.html @@ -1,5 +1,3 @@ - - + diff --git a/app/scripts/modules/core/src/pipeline/config/parameters/parameter.html b/app/scripts/modules/core/src/pipeline/config/parameters/parameter.html index 5236a7b7373..20a037fb3e9 100644 --- a/app/scripts/modules/core/src/pipeline/config/parameters/parameter.html +++ b/app/scripts/modules/core/src/pipeline/config/parameters/parameter.html @@ -1,10 +1,12 @@
    -
    - +
    - diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.html b/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.html index 0a51b0b409a..302a8e5e17d 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.html +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/modal/editPrecondition.html @@ -6,19 +6,24 @@

    Edit Precondition

    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.html b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.html index e95f6a4cf78..67b9392bc71 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.html +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/preconditionList.directive.html @@ -2,41 +2,47 @@ - - - - - + + + + + - - - - - + + + + + - - - + + +
    TypeDetailsActions
    TypeDetailsActions
    - {{precondition.type|preconditionType}} - -
    - {{key | robotToHuman}}: {{val}} -
    - Fail Pipeline: {{precondition.failPipeline}} -     		- - - - -
    + {{precondition.type|preconditionType}} + +
    {{key | robotToHuman}}: {{val}}
    + Fail Pipeline: {{precondition.failPipeline}} +     		+ + + + +
    - -
    + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.html b/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.html index e3f1323d723..f7cc246e722 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.html +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/selector/preconditionSelector.html @@ -1,10 +1,12 @@
    Check
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/additionalFields.html b/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/additionalFields.html index 167cbe3a656..776eae50872 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/additionalFields.html +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/types/clusterSize/additionalFields.html @@ -3,11 +3,14 @@
    Account
    - +
    @@ -15,11 +18,13 @@
    Regions

    (Select an Account)

    - +
    @@ -29,36 +34,44 @@ + on-change="preconditionCtrl.clusterChanged(clusterName)" + >
    -
    Expected Size +
    + Expected Size
    -
    - +
    -
    Fail Pipeline +
    + Fail Pipeline
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/additionalFields.html b/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/additionalFields.html index 8f14123fd5b..9ebf2b10ef1 100644 --- a/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/additionalFields.html +++ b/app/scripts/modules/core/src/pipeline/config/preconditions/types/expression/additionalFields.html @@ -1,19 +1,19 @@ -
    -
    Expression
    -
    - -
    +
    +
    + Expression
    +
    + +
    +
    -
    -
    Fail Pipeline
    -
    - -
    +
    +
    + Fail Pipeline +
    +
    +
    +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.html b/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.html index 1530dc7d34f..b9ac1d54b08 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.html @@ -9,8 +9,7 @@ diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.html b/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.html index ea3e66904f6..ca406a849d4 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/bake/modal/addExtendedAttribute.html @@ -9,32 +9,37 @@

    Add Extended Attribute

    Key
    - +
    Value
    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.html b/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.html index f4df278e167..235ac05305a 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.html @@ -1,90 +1,105 @@

    Template Renderer

    - - + - + - +

    Template Artifact

    - + + expected-artifacts="ctrl.templateArtifact().delegate.expectedArtifacts" + selected="ctrl.templateArtifact().delegate.getSelectedExpectedArtifact()" + on-change="ctrl.templateArtifact().controller.onArtifactChange" + on-request-create="ctrl.templateArtifact().controller.onRequestCreate" + requesting-new="ctrl.templateArtifact().delegate.requestingNew" + > - + + > -

    Overrides

    -
    +
    - + + expected-artifacts="artifact.delegate.expectedArtifacts" + selected="artifact.delegate.getSelectedExpectedArtifact()" + on-change="artifact.controller.onArtifactChange" + on-request-create="artifact.controller.onRequestCreate" + requesting-new="artifact.delegate.requestingNew" + > - + + > -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.html b/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.html index 53e4cd62198..0e9a9159ad8 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/baseProviderStage/baseProviderStage.html @@ -1,8 +1,11 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.html b/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.html index ab6b2b43a33..2e9af702101 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/checkPreconditions/checkPreconditionsStage.html @@ -1,3 +1,5 @@ - + diff --git a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.html index bfd4accc950..3fb27941046 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerExecutionDetails.html @@ -5,28 +5,28 @@
    - - - - - - + + + + + + - - - - - - + + + + + +
    AccountNameRegionSubnet
    AccountNameRegionSubnet
    - - - {{ loadBalancer.name }} - - {{ loadBalancer.region }} - - {{ loadBalancer.subnetType || '[none]' }} -
    + + + {{ loadBalancer.name }} + + {{ loadBalancer.region }} + + {{ loadBalancer.subnetType || '[none]' }} +
    @@ -37,20 +37,20 @@
    Created: - +
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.html b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.html index 29294fef5ee..6a762ba2156 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/createLoadBalancer/createLoadBalancerStage.html @@ -8,43 +8,43 @@

    Load Balancers

    - - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + +
    AccountNameRegionSubnet
    AccountNameRegionSubnet
    - - - {{ loadBalancer.name }} - - {{ loadBalancer.region }} - - {{ loadBalancer.subnetType || '[none]' }} -
    + + + {{ loadBalancer.name }} + + {{ loadBalancer.region }} + + {{ loadBalancer.subnetType || '[none]' }} + - Edit - Remove - Duplicate -
    + Edit + Remove + Duplicate +
    - -
    + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.html index 29f0b92bdca..89c4295ed36 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployExecutionDetails.html @@ -10,7 +10,9 @@
    Region
    -
    {{region}}
    ({{zones.join(', ')}})
    +
    + {{region}}
    ({{zones.join(', ')}}) +
    {{stage.context.namespace}}
    @@ -29,11 +31,12 @@ {{stage.context.targetSize}}
    Current Server Group
    -
    {{stage.context.capacity.max}}
    +
    + {{stage.context.capacity.max}} +
    - Min: {{stage.context.capacity.min}}, - Max: {{stage.context.capacity.max}}, - Desired: {{stage.context.capacity.desired}} + Min: {{stage.context.capacity.min}}, Max: {{stage.context.capacity.max}}, Desired: + {{stage.context.capacity.desired}}
    @@ -43,14 +46,18 @@

    - Waiting for {{stage.context.targetDesiredSize}} instances to appear healthy. + Waiting for {{stage.context.targetDesiredSize}} instances + to appear healthy. -
    +
    - (no instances found yet) + (no instances found yet) - ( current status: ) + ( current status: + )

    @@ -67,14 +74,14 @@

    - By default, Spinnaker does not consider cloud provider health (i.e. whether your instances have launched and are running) - as a reliable indicator of instance health. + By default, Spinnaker does not consider cloud provider health (i.e. whether your instances have launched and + are running) as a reliable indicator of instance health.

    - If your instances do not provide a health indicator known to Spinnaker - (e.g. a discovery service or load balancers), you should configure your application to - consider only cloud provider health when executing tasks. This option is available under Application Attributes - in the Config tab. + If your instances do not provide a health indicator known to Spinnaker (e.g. a discovery service or load + balancers), you should configure your application to consider only cloud provider health when executing tasks. + This option is available under Application Attributes in the + Config tab.

    @@ -83,9 +90,11 @@
    Deployed: - + {{serverGroup.serverGroup}}
    @@ -99,9 +108,7 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.html b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.html index e502fcd9e35..db459f4be59 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/deploy/deployStage.html @@ -2,85 +2,93 @@
    - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - - +
    + {{cluster.targetSize}} +
    +
    + N/A +
    + + + + - - - + + +
    ProviderAccountClusterRegionSubnetStrategyCapacityInstance TypeActions
    ProviderAccountClusterRegionSubnetStrategyCapacityInstance TypeActions
    - - - - - {{ deployStageCtrl.getClusterName(cluster) }} - - {{ deployStageCtrl.getRegion(cluster) }} - - {{deployStageCtrl.getSubnet(cluster)}} - - {{cluster.strategy || '[none]'}} - -
    Current Server Group
    -
    -
    {{cluster.capacity.max}}
    -
    - Min: {{cluster.capacity.min}}, - Max: {{cluster.capacity.max}}, - Desired: {{cluster.capacity.desired}} +
    + + + + + {{ deployStageCtrl.getClusterName(cluster) }} + + {{ deployStageCtrl.getRegion(cluster) }} + + {{deployStageCtrl.getSubnet(cluster)}} + + {{cluster.strategy || '[none]'}} + +
    Current Server Group
    +
    +
    + {{cluster.capacity.max}} +
    +
    + Min: {{cluster.capacity.min}}, Max: {{cluster.capacity.max}}, Desired: {{cluster.capacity.desired}} +
    - -
    - {{cluster.targetSize}} -
    -
    - N/A -
    -     		- {{ cluster.instanceType || '[none]' }} - - - - - - - - - -
    + {{ cluster.instanceType || '[none]' }} + + + + + + + + + +
    - -
    + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowDayPicker.component.html b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowDayPicker.component.html index 0da87513ee6..942d654404f 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowDayPicker.component.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindowDayPicker.component.html @@ -1,9 +1,13 @@
    - +
    All diff --git a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.html b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.html index 90f736258a5..bd2b650dca0 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/executionWindows/executionWindows.html @@ -2,18 +2,13 @@
    Restrict execution to specific time windows when this expression is true - - +
    @@ -25,7 +20,10 @@
    (No days selected implies execution on any day if triggered)

    - +

    @@ -40,17 +38,16 @@
    -
    -
    +
    -
    +
    {{divider.label}} @@ -66,42 +63,49 @@

    -
    -
    - - From - - - : - - - to - - - - : - +
    +
    + + From + + + : + + + to + - + + : + -
    +
    +
    - +
    @@ -73,5 +76,4 @@
    Property File
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html index f2f0c9f03e2..64453f9d382 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html @@ -2,11 +2,8 @@
    -

    {{stage.master}}

    - +

    {{stage.master}}

    + {{$select.selected}} @@ -14,29 +11,33 @@
    - - + +
    -

    (Select a master)

    -

    {{stage.job}}

    +

    (Select a master)

    +

    + {{stage.job}} +

    - + {{$select.selected}} - +
    @@ -44,22 +45,22 @@
    - - + +
    - +
    -

    Job Parameters

    +

    Job Parameters

    {{parameter.name}} @@ -68,19 +69,58 @@

    Job Parameters

    - +
    - - - + + +
    - - + +
    - + {{$select.selected}}
    @@ -88,7 +128,13 @@

    Job Parameters

         - + {{$select.selected}}
    @@ -98,22 +144,42 @@

    Job Parameters

    - - + +
    - +
    @@ -121,24 +187,28 @@

    Job Parameters

    -
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.html b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.html index 4a663ac0a9f..9e1f76a1e2f 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/manualJudgment/manualJudgmentStage.html @@ -1,17 +1,20 @@
    - +
    - +
    @@ -19,40 +22,47 @@ - - - - + + + + - - - - + + + + - - - + + +
    OptionActions
    OptionActions
    - - - Remove -
    + + + Remove +
    - -
    + +
    @@ -60,39 +70,45 @@ - - - - - - + + + + + + - - - - - - + + + + + + - - - + + +
    TypeDetailsNotify WhenActions
    TypeDetailsNotify WhenActions
    - {{notification.type|notificationType}} - - {{notification|notificationDetails}} - -
    {{when|notificationWhen:level:'manualJudgment'}}
    -     		- Edit - Remove -
    + {{notification.type|notificationType}} + + {{notification|notificationDetails}} + +
    {{when|notificationWhen:level:'manualJudgment'}}
    +     		+ Edit + Remove +
    - -
    + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.html b/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.html index 89bcacf55e5..27022dd8143 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/optionalStage/optionalStage.directive.html @@ -3,15 +3,21 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.html b/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.html index 8ff4bc0ec35..19ceecdbc08 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/overrideFailure/overrideFailure.component.html @@ -3,41 +3,53 @@
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.html b/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.html index 940d8c874e0..8acb743a513 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/overrideTimeout/overrideTimeout.directive.html @@ -1,42 +1,51 @@
    -
    -
    -
    - -
    -
    +
    +
    +
    + +
    -
    -
    -
    - Fail this stage if it takes longer than - - hours - - minutes to complete -
    -
    +
    +
    +
    +
    + Fail this stage if it takes longer than + + hours + + minutes to complete +
    +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html index 9ae5a1f5c78..f6eb24a60a8 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html @@ -7,19 +7,26 @@ + infinite-scroll-distance="2" + >
    - -
    - + +
    + {{$select.selected.name}} - +
    @@ -32,18 +39,31 @@

    Pipeline Parameters

    - - + + - - + + {{$select.selected.value}} @@ -55,14 +75,16 @@

    Pipeline Parameters

    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgExecutionDetails.html index 1dd76b234ca..40aa12c4764 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/resizeAsg/resizeAsgExecutionDetails.html @@ -11,7 +11,10 @@
    Server Group
    {{stage.context.serverGroupName}}
    Capacity
    -
    Min: {{stage.context.capacity.min}} / Desired: {{stage.context.capacity.desired}} / Max: {{stage.context.capacity.max}}
    +
    + Min: {{stage.context.capacity.min}} / Desired: {{stage.context.capacity.desired}} / Max: + {{stage.context.capacity.max}} +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html index 146b527b64f..419d923f4f1 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/script/scriptStage.html @@ -5,48 +5,38 @@
    - + - + - + - + - +
    - + - + - + - +
    - + - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/stage.html b/app/scripts/modules/core/src/pipeline/config/stages/stage.html index 442d9918124..64b436f505e 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/stage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/stage.html @@ -2,17 +2,22 @@

    -

    Stage type: {{label}}
    {{description}}

    +

    + Stage type: {{label}}
    + {{description}} +

    No stage type selected

    - + {{$select.selected.label}} @@ -21,9 +26,13 @@

    - +
    @@ -32,23 +41,37 @@

    - + - + {{$item.name}} - - + +
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.html b/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.html index 74b54214bd3..892a9a9f749 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/modal/addParameter.html @@ -9,32 +9,38 @@

    Add Parameter

    Key
    - +
    Value
    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html index ccc4dec874b..c67872dfa8e 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html @@ -12,9 +12,9 @@
    Travis Stage Configuration
    Build
    {{ctrl.stage.context.buildNumber}} - #{{ctrl.stage.context.buildInfo.number}} + #{{ctrl.stage.context.buildInfo.number}}
    @@ -31,8 +31,7 @@
    Test Results

    - {{result.totalCount - result.failCount - result.skipCount}} + {{result.totalCount - result.failCount - result.skipCount}} {{result.failCount}} @@ -47,14 +46,18 @@

    Test Results
    -
    Parameters
    -
    -
    {{key}}
    -
    {{val}}
    -
    +
    Parameters
    +
    +
    {{key}}
    +
    {{val}}
    +
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html index c0427ab2cff..e574d814310 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html @@ -2,11 +2,12 @@
    -

    {{$ctrl.stage.master}}

    - +

    {{$ctrl.stage.master}}

    + {{$select.selected}} @@ -14,51 +15,65 @@
    - - + +
    - +
    -

    (Select a master)

    -

    {{$ctrl.stage.job}}

    +

    (Select a master)

    +

    + {{$ctrl.stage.job}} +

    - - {{$select.selected}} - + + {{$select.selected}} +
    -
    - - +
    + +
    - + - @@ -74,8 +89,7 @@ {{key}} - + - + -
    - + @@ -96,28 +110,38 @@ - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.html b/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.html index 4e6f5fd9a2d..6076fa92370 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/unmatchedStageTypeStage/unmatchedStageTypeStage.html @@ -1,13 +1,15 @@
    - +
    @@ -17,4 +19,3 @@
    - diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.html b/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.html index 1adf7d12ea0..ca980e55324 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/modal/addCustomHeader.html @@ -9,33 +9,38 @@

    Add Custom Header

    Key
    - +
    Value
    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html index b011d93d759..767d936e7ea 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html @@ -8,9 +8,11 @@
    Webhook Stage Configuration
    Url
    {{ctrl.stage.context.url}}
    - + tool-tip="'Copy response to clipboard'" + > Payload
    @@ -18,8 +20,7 @@
    Webhook Stage Configuration
    {{ctrl.payload}}
    -
    +
    Status endpoint

    @@ -32,7 +33,11 @@
    Parameters
    - +

    Results

    @@ -41,16 +46,22 @@

    Results

    Info

    Code
    -
    {{ctrl.stage.context.webhook.monitor.statusCodeValue || ctrl.stage.context.webhook.statusCodeValue}}
    +
    + {{ctrl.stage.context.webhook.monitor.statusCodeValue || ctrl.stage.context.webhook.statusCodeValue}} +
    - + tool-tip="'Copy response to clipboard'" + > Response
    - 
    {{ctrl.body}}
    + 
    +{{ctrl.body}}
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.html b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.html index f14859d5c03..056501a9b71 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookStage.html @@ -1,9 +1,10 @@
    - Note: {{$ctrl.noUserConfigurableFields ? 'All' : 'Some'}} of the settings of this stage are preconfigured, and cannot be changed. + Note: {{$ctrl.noUserConfigurableFields ? 'All' : 'Some'}} of the settings of this stage are + preconfigured, and cannot be changed.
    - + @@ -14,35 +15,47 @@ - + - +
    {{ parameter.label }}
    - +
    - - + + -
    -
    - Error: {{$ctrl.command.errorMessage}} -
    +
    +
    + Error: {{$ctrl.command.errorMessage}}
    +
    - + @@ -57,8 +70,7 @@ {{key}} - - - - - + + + + - + + - + + +
    - + Remove @@ -78,97 +90,107 @@
    -
    +
    Status URL
    -
    +
    - +
    - - + + - - + + - - + + - - + + - - + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.html b/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.html index 74b54214bd3..892a9a9f749 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/modal/addParameter.html @@ -9,32 +9,38 @@

    Add Parameter

    Key
    - +
    Value
    - +
    Cancel -
    diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html index 0ef7713b537..38a7bfa3ea3 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html @@ -12,9 +12,9 @@
    Wercker Stage Configuration
    Build
    {{stage.context.buildNumber}} - #{{stage.context.buildInfo.number}} + #{{stage.context.buildInfo.number}}
    @@ -31,8 +31,7 @@
    Test Results

    - {{result.totalCount - result.failCount - result.skipCount}} + {{result.totalCount - result.failCount - result.skipCount}} {{result.failCount}} @@ -47,11 +46,11 @@

    Test Results
    -
    Parameters
    -
    -
    {{key}}
    -
    {{val}}
    -
    +
    Parameters
    +
    +
    {{key}}
    +
    {{val}}
    +
    @@ -65,7 +64,11 @@
    Property File
    - +
    @@ -73,5 +76,4 @@
    Property File
    - diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html index d9a9ffd2d68..d68aa45bb21 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html +++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html @@ -2,11 +2,12 @@
    -

    {{$ctrl.stage.master}}

    - +

    {{$ctrl.stage.master}}

    + {{$select.selected}} @@ -14,13 +15,13 @@
    - - + +
    @@ -28,30 +29,40 @@
    -

    (Select a master)

    -

    {{$ctrl.stage.app}}

    +

    (Select a master)

    +

    + {{$ctrl.stage.app}} +

    - + {{$select.selected}} - +
    -
    - - +
    + +
    @@ -59,38 +70,52 @@
    -

    (Select an Application)

    -

    {{stage.job}}

    +

    (Select an Application)

    +

    + {{stage.job}} +

    - + {{$select.selected}} - +
    -
    - - +
    + +
    - +
    @@ -98,24 +123,28 @@
    -
    -
    diff --git a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.html b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.html index be571b5b6a3..7ccfb2c1546 100644 --- a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.html +++ b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.html @@ -1,19 +1,25 @@
    - - - + + +

    Could not generate pipeline from provided template configuration.

    @@ -28,17 +34,21 @@
    Inherit the following configuration from the template -

    Expected Artifacts

    -

    Triggers

    -

    Parameters

    +

    Expected Artifacts

    +

    Triggers

    +

    Parameters

    - + - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronPicker.html b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronPicker.html index 7f25ea4cf96..a791bc35dd7 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronPicker.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronPicker.html @@ -1,10 +1,12 @@
    - +
    @@ -12,8 +14,13 @@
    Every - minutes
    @@ -23,78 +30,92 @@
    Every - + hours on minute - +
    - + Every - + days
    - + Every week day
    Start time - + - +
    @@ -104,26 +125,31 @@
    - +
    Start time - +
    @@ -132,88 +158,106 @@
    - + On the - of every - + months
    - - + - of every - + months
    Start time - + - +
    @@ -224,19 +268,26 @@
    Expression - +
    -

    More details about how to create these expressions can be found - here.

    +

    + More details about how to create these expressions can be found + here. +

    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.html index 7ac5a96912b..13339e51593 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/cron/cronTrigger.html @@ -4,17 +4,17 @@ Frequency
    - +
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/git/gitTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/git/gitTrigger.html index 40f9832b1e0..0977e1a83b6 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/git/gitTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/git/gitTrigger.html @@ -8,7 +8,8 @@
    @@ -20,11 +21,13 @@
    -
    @@ -34,12 +37,14 @@
    -
    @@ -49,7 +54,7 @@
    - +
    @@ -58,13 +63,11 @@
    - +
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.html index b8d25811365..f010a20c8f3 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/jenkinsTrigger.html @@ -1,64 +1,62 @@ -
    - -
    - - {{$select.selected}} - - - +
    + +
    + + {{$select.selected}} + + + + +
    +
    + + + +
    +
    +
    + +
    +

    (Select a master)

    +
    + + {{$select.selected}} +
    -
    - - - +
    +
    -
    - -
    -

    (Select a master)

    -
    - - {{$select.selected}} - - -
    -
    - -
    -
    -
    - - - -
    +
    + + +
    -
    -
    - Property File - -
    -
    - -
    +
    +
    +
    + Property File +
    - -
    - - +
    +
    +
    + +
    + + +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.html index 52ec834b54a..923fd9bac5e 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/pipelineTrigger.html @@ -1,54 +1,68 @@
    -
    - -
    - - {{$select.selected}} +
    + +
    + + {{$select.selected}} - -
    -     -     -
    + +
    +     +
    -
    - -
    -
    - - {{$select.selected.name}} - - -
    +
    +
    + +
    +
    + + {{$select.selected.name}} + +
    -
    -

    Pipeline Parameters

    +
    +
    +

    Pipeline Parameters

    -
    -
    - {{parameter.name}} - -
    -
    - - -
    -
    - -
    +
    +
    + {{parameter.name}} + +
    +
    + + +
    +
    +
    +
    @@ -57,9 +71,7 @@

    Pipeline Parameters

    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsubTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsubTrigger.html index 7c7f83ba49e..f828fb0dbfa 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsubTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/pubsubTrigger.html @@ -4,10 +4,12 @@ Pub/Sub System Type
    -
    @@ -18,15 +20,17 @@ Subscription Name
    -
    -
    +
    @@ -50,10 +54,7 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.html index 0bee2c6fc40..6efc3e2367e 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/travis/travisTrigger.html @@ -1,8 +1,7 @@
    - + {{$select.selected}} @@ -10,25 +9,31 @@
    - - + +
    - +

    (Select a master)

    - - {{$select.selected}} - + + {{$select.selected}} +
    @@ -36,12 +41,13 @@
    - - + +
    @@ -51,12 +57,10 @@
    - +
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/trigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/trigger.html index e3090837f70..18ebeb51ee5 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/trigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/trigger.html @@ -6,10 +6,12 @@
    - {{description}} @@ -32,12 +34,16 @@
    - +
    - + {{ $item.displayName }} {{ expected.displayName }} @@ -52,7 +58,7 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhookTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhookTrigger.html index 91aaaffb3d6..e120ad9abf2 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhookTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/webhook/webhookTrigger.html @@ -9,7 +9,7 @@
    - +
    @@ -23,9 +23,7 @@
    - +
    diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.html b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.html index aa624acf9b7..9073e4b69f2 100644 --- a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.html +++ b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/werckerTrigger.html @@ -1,83 +1,82 @@ -
    - -
    - - {{$select.selected}} - - - +
    + +
    + + {{$select.selected}} + + + + +
    +
    + + + +
    +
    + +
    + +
    +

    (Select a master)

    +
    + + {{$select.selected}} +
    -
    - - - +
    +
    - -
    - -
    -

    (Select a master)

    -
    - - {{$select.selected}} - - -
    -
    - -
    -
    -
    - - - -
    +
    + + +
    - -
    - -
    -

    (Select an application)

    -
    - - {{$select.selected}} - - -
    -
    - -
    +
    + +
    + +
    +

    (Select an application)

    +
    + + {{$select.selected}} + +
    -
    - - - +
    +
    +
    + + + +
    +
    -
    - - -
    \ No newline at end of file +
    + + +
    diff --git a/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.html b/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.html index d879d939ad6..654fa766b52 100644 --- a/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.html +++ b/app/scripts/modules/core/src/pipeline/manualExecution/manualPipelineExecution.html @@ -11,14 +11,18 @@

    Select Pipeline

    - + {{$select.selected.name}} - +
    {{pipeline.name}}
         @@ -31,12 +35,13 @@

    Select Pipeline

    -
    -

    - - This pipeline is currently executing! -

    +
    +

    + + + This pipeline is currently executing! + +

    Execution started: {{execution.startTime | timestamp }}
    @@ -48,9 +53,10 @@

    Select Pipeline

    - …and - {{vm.currentlyRunningExecutions.length - 1}} - other executions + …and {{vm.currentlyRunningExecutions.length - 1}} other executions
    @@ -59,13 +65,14 @@

    Select Pipeline

    -

    {{vm.triggers[0].description}}

    -
    @@ -73,8 +80,14 @@

    Select Pipeline

    -

    This pipeline is parameterized. Please enter values for the parameters below.

    -
    +

    + This pipeline is parameterized. Please enter values for the parameters below. +

    +
    {{parameter.label || parameter.name}} * @@ -82,7 +95,8 @@

    Select Pipeline

    - Select Pipeline close-text="Close" /> - +

    - +
    - + {{$select.selected.value}} @@ -126,21 +151,32 @@

    Select Pipeline

    - +
    - There is one notification configured for this pipeline + There is + one notification configured + for this pipeline
    - There are {{vm.notifications.length}} notifications configured for this pipeline
    + There are + {{vm.notifications.length}} notifications + configured for this pipeline +
    @@ -153,9 +189,7 @@

    Select Pipeline

    - +
    @@ -164,10 +198,12 @@

    Select Pipeline

    -
    diff --git a/app/scripts/modules/core/src/presentation/sortToggle/sorttoggle.directive.html b/app/scripts/modules/core/src/presentation/sortToggle/sorttoggle.directive.html index 9588646739a..52598e2fd15 100644 --- a/app/scripts/modules/core/src/presentation/sortToggle/sorttoggle.directive.html +++ b/app/scripts/modules/core/src/presentation/sortToggle/sorttoggle.directive.html @@ -1,10 +1,11 @@ - - {{ label }} - - + + {{ label }} + + + diff --git a/app/scripts/modules/core/src/presentation/standalone.view.html b/app/scripts/modules/core/src/presentation/standalone.view.html index 0cdc6dc9c38..e38446076f6 100644 --- a/app/scripts/modules/core/src/presentation/standalone.view.html +++ b/app/scripts/modules/core/src/presentation/standalone.view.html @@ -1,5 +1,5 @@
    -
    -
    -
    +
    +
    +
    diff --git a/app/scripts/modules/core/src/projects/configure/configureProject.modal.html b/app/scripts/modules/core/src/projects/configure/configureProject.modal.html index 7055e71ff74..a488a1adc69 100644 --- a/app/scripts/modules/core/src/projects/configure/configureProject.modal.html +++ b/app/scripts/modules/core/src/projects/configure/configureProject.modal.html @@ -14,9 +14,15 @@
    - - + +
    diff --git a/app/scripts/modules/core/src/projects/dashboard/cluster/inconsistentBuilds.tooltip.html b/app/scripts/modules/core/src/projects/dashboard/cluster/inconsistentBuilds.tooltip.html index f6ebe902ce4..35f339424bc 100644 --- a/app/scripts/modules/core/src/projects/dashboard/cluster/inconsistentBuilds.tooltip.html +++ b/app/scripts/modules/core/src/projects/dashboard/cluster/inconsistentBuilds.tooltip.html @@ -1,3 +1,3 @@ Build #{{build.buildNumber}}: deployed {{build.deployed | relativeTime }} - \ No newline at end of file + diff --git a/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.html b/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.html index d7c5d03dcac..ebb3a3436ab 100644 --- a/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.html +++ b/app/scripts/modules/core/src/projects/dashboard/cluster/projectCluster.directive.html @@ -9,10 +9,10 @@ {{vm.clusterLabel}}
    - {{vm.cluster.applications.length}} Applications + {{vm.cluster.applications.length}} Applications - {{vm.instanceCounts.total}} Instances + {{vm.instanceCounts.total}} Instances
    @@ -39,48 +39,64 @@
    - - {{application.application | uppercase}} - - - - #{{application.build.buildNumber}} - -
      -
    • {{ image }}
      • -
    - -     		- - - - - - {{application.lastPush | relativeTime }} - - - - - +
    + + {{application.application | uppercase}} - - + + + #{{application.build.buildNumber}} + +
      +
    • {{ image }}
      • +
    + +     		+ + - + + + {{application.lastPush | relativeTime }} + + + + + + + + + - - - - - -
    diff --git a/app/scripts/modules/core/src/projects/dashboard/cluster/projectClusterRefresh.tooltip.html b/app/scripts/modules/core/src/projects/dashboard/cluster/projectClusterRefresh.tooltip.html index d4e3076c0aa..ba4c579c6d9 100644 --- a/app/scripts/modules/core/src/projects/dashboard/cluster/projectClusterRefresh.tooltip.html +++ b/app/scripts/modules/core/src/projects/dashboard/cluster/projectClusterRefresh.tooltip.html @@ -1,4 +1,7 @@

    Cluster data is refreshing

    (click to refresh)

    -

    Last refresh: {{vm.state.lastRefresh | timestamp }}
    ({{vm.state.lastRefresh | relativeTime }})

    +

    + Last refresh: {{vm.state.lastRefresh | timestamp }}
    + ({{vm.state.lastRefresh | relativeTime }}) +

    Note: Due to caching, data may be delayed up to 2 minutes

    diff --git a/app/scripts/modules/core/src/projects/dashboard/clusterRefresh.tooltip.html b/app/scripts/modules/core/src/projects/dashboard/clusterRefresh.tooltip.html index 5e5fba96593..317f94054eb 100644 --- a/app/scripts/modules/core/src/projects/dashboard/clusterRefresh.tooltip.html +++ b/app/scripts/modules/core/src/projects/dashboard/clusterRefresh.tooltip.html @@ -1,3 +1,7 @@

    Cluster data is refreshing.

    (click to refresh)

    -

    Last refresh:
    {{vm.state.lastRefresh | timestamp }}
    ({{vm.state.lastRefresh | relativeTime }})

    +

    + Last refresh:
    + {{vm.state.lastRefresh | timestamp }}
    + ({{vm.state.lastRefresh | relativeTime }}) +

    diff --git a/app/scripts/modules/core/src/projects/dashboard/dashboard.html b/app/scripts/modules/core/src/projects/dashboard/dashboard.html index ed3394c163a..810aa8b6b9a 100644 --- a/app/scripts/modules/core/src/projects/dashboard/dashboard.html +++ b/app/scripts/modules/core/src/projects/dashboard/dashboard.html @@ -1,17 +1,16 @@
    -

    Application Status - +

    + Application Status +

    - +
    @@ -19,17 +18,18 @@

    No clusters configured

    There was a problem loading the clusters for this project.

    -

    Pipeline Status - +

    + Pipeline Status +

    - +

    No pipelines configured

    There was a problem loading the executions for this project.

    diff --git a/app/scripts/modules/core/src/projects/dashboard/executionRefresh.tooltip.html b/app/scripts/modules/core/src/projects/dashboard/executionRefresh.tooltip.html index 534ed30a00e..a02004dd591 100644 --- a/app/scripts/modules/core/src/projects/dashboard/executionRefresh.tooltip.html +++ b/app/scripts/modules/core/src/projects/dashboard/executionRefresh.tooltip.html @@ -1,3 +1,7 @@

    Pipeline data is refreshing.

    (click to refresh)

    -

    Last refresh:
    {{vm.state.lastRefresh | timestamp }}
    ({{vm.state.lastRefresh | relativeTime }})

    +

    + Last refresh:
    + {{vm.state.lastRefresh | timestamp }}
    + ({{vm.state.lastRefresh | relativeTime }}) +

    diff --git a/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.html b/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.html index 4dd02d741f1..f7ec98c4982 100644 --- a/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.html +++ b/app/scripts/modules/core/src/projects/dashboard/regionFilter/regionFilter.component.html @@ -15,4 +15,3 @@
    - diff --git a/app/scripts/modules/core/src/projects/projects.html b/app/scripts/modules/core/src/projects/projects.html index 88243004179..64d7f38630e 100644 --- a/app/scripts/modules/core/src/projects/projects.html +++ b/app/scripts/modules/core/src/projects/projects.html @@ -3,18 +3,17 @@

    Projects - +

    - - +
    @@ -25,14 +24,46 @@

    - - - - + + + + - +
    {{ project.name.toLowerCase() }} @@ -50,11 +81,13 @@

    -
      +

        diff --git a/app/scripts/modules/core/src/search/infrastructure/infrastructure.html b/app/scripts/modules/core/src/search/infrastructure/infrastructure.html index 45ec08d3e07..37db6ee94ff 100644 --- a/app/scripts/modules/core/src/search/infrastructure/infrastructure.html +++ b/app/scripts/modules/core/src/search/infrastructure/infrastructure.html @@ -4,15 +4,18 @@

        Search - +
        -

        Please enter at least {{viewState.minCharactersToSearch}} characters to begin - searching.

        +

        + Please enter at least {{viewState.minCharactersToSearch}} characters to begin searching. +

        @@ -22,12 +25,18 @@

        • - - + +

        @@ -50,12 +59,14 @@

        Projects

        - No projects found matching "{{query}}".
        + No projects found matching "{{query}}".
        Create a new project
        - +
        @@ -82,10 +93,12 @@

        No Infrastructure results found.

        {{ category.type.displayName }} ({{category.results.length}})
        - +
        diff --git a/app/scripts/modules/core/src/securityGroup/all.html b/app/scripts/modules/core/src/securityGroup/all.html index 4a7e690e278..0c3b47ec6bb 100644 --- a/app/scripts/modules/core/src/securityGroup/all.html +++ b/app/scripts/modules/core/src/securityGroup/all.html @@ -11,7 +11,7 @@
        @@ -22,14 +22,14 @@
        -
        +
        diff --git a/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.html b/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.html index 4f4fb2084b7..4d19664749d 100644 --- a/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.html +++ b/app/scripts/modules/core/src/securityGroup/filter/securityGroup.filter.component.html @@ -1,25 +1,32 @@
        - Clear All + Clear All
        - +
        -
        @@ -29,8 +36,11 @@
        @@ -38,7 +48,11 @@
        @@ -46,7 +60,11 @@
        @@ -54,10 +72,13 @@
        -
        diff --git a/app/scripts/modules/core/src/securityGroup/groupings.html b/app/scripts/modules/core/src/securityGroup/groupings.html index bd8d87a7e45..6971f6001f5 100644 --- a/app/scripts/modules/core/src/securityGroup/groupings.html +++ b/app/scripts/modules/core/src/securityGroup/groupings.html @@ -1,12 +1,16 @@
        - +
        -

        No match the filters you've selected.

        +

        + No match the filters you've selected. +

        -

        We couldn't find any tasks for {{tasks.application.name}}

        +

        + We couldn't find any tasks for {{tasks.application.name}} +

        We couldn't find any tasks matching the filters you've specified.

        -

        - Note that Spinnaker only tracks tasks for two weeks. -

        +

        Note that Spinnaker only tracks tasks for two weeks.

        @@ -83,20 +89,27 @@

        - + {{task.name}}
        - Deployed {{tasks.getFirstDeployServerGroupName(task)}} + Deployed + + {{tasks.getFirstDeployServerGroupName(task)}} Deployed {{tasks.getFirstDeployServerGroupName(task)}} -
        		@@ -104,7 +117,9 @@

        		{{task.getValueFor('region')}} - {{task.getValueFor('regions').join(', ')}} + {{task.getValueFor('regions').join(', ')}} @@ -127,14 +142,16 @@

        {{ task.getValueFor('user') || task.execution.authentication.user || '-' }}

        		- +
        {{step.name | robotToHuman }} @@ -155,41 +172,46 @@

        - Reason: - Reason:
        - Source | Permalink - + Source | + Permalink +
        -
          +
            -
            - Show - - per page +
            + Show + + per page
            diff --git a/app/scripts/modules/core/src/task/verification/userVerification.directive.html b/app/scripts/modules/core/src/task/verification/userVerification.directive.html index d8a69672253..d5ecf8ab4c3 100644 --- a/app/scripts/modules/core/src/task/verification/userVerification.directive.html +++ b/app/scripts/modules/core/src/task/verification/userVerification.directive.html @@ -4,12 +4,14 @@
            - +
            diff --git a/app/scripts/modules/core/src/validation/validationError.html b/app/scripts/modules/core/src/validation/validationError.html index c772d7f866c..16401d3e399 100644 --- a/app/scripts/modules/core/src/validation/validationError.html +++ b/app/scripts/modules/core/src/validation/validationError.html @@ -1,3 +1 @@ -
            - {{message}} -
            +
            {{message}}
            diff --git a/app/scripts/modules/core/src/whatsNew/whatsNew.directive.modal.html b/app/scripts/modules/core/src/whatsNew/whatsNew.directive.modal.html index 1c00c642719..81e5bb41cc3 100644 --- a/app/scripts/modules/core/src/whatsNew/whatsNew.directive.modal.html +++ b/app/scripts/modules/core/src/whatsNew/whatsNew.directive.modal.html @@ -1,6 +1,5 @@ -
            -
            +

            What's New

            @@ -11,7 +10,5 @@

            What's New

            -
            - diff --git a/app/scripts/modules/core/src/widgets/accountNamespaceClusterSelector.component.html b/app/scripts/modules/core/src/widgets/accountNamespaceClusterSelector.component.html index 8080f96eb4b..b44ac125e00 100644 --- a/app/scripts/modules/core/src/widgets/accountNamespaceClusterSelector.component.html +++ b/app/scripts/modules/core/src/widgets/accountNamespaceClusterSelector.component.html @@ -5,7 +5,8 @@ accounts="vm.accounts" provider="vm.provider" on-change="vm.accountUpdated()" - required> + required + > @@ -16,13 +17,15 @@ model="vm.component.namespaces" inline="true" on-change="vm.namespaceChanged()" - include-select-all-button="true"> + include-select-all-button="true" + > + toggled="vm.clusterSelectInputToggled(isToggled)" + > diff --git a/app/scripts/modules/core/src/widgets/accountRegionClusterSelector.component.html b/app/scripts/modules/core/src/widgets/accountRegionClusterSelector.component.html index f1af3a0266e..08d5969fa2b 100644 --- a/app/scripts/modules/core/src/widgets/accountRegionClusterSelector.component.html +++ b/app/scripts/modules/core/src/widgets/accountRegionClusterSelector.component.html @@ -5,18 +5,21 @@ accounts="vm.accounts" provider="'aws'" on-change="vm.accountUpdated()" - required> + required + > - +

            (Select an Account)

            - + include-select-all-button="true" + >
            @@ -33,7 +37,8 @@ clusters="vm.clusterList" model="vm.component[vm.clusterField]" toggled="vm.clusterSelectInputToggled(isToggled)" - on-change="vm.clusterChanged(clusterName)"> + on-change="vm.clusterChanged(clusterName)" + >
            diff --git a/app/scripts/modules/core/src/widgets/actionIcons/actionIcons.component.html b/app/scripts/modules/core/src/widgets/actionIcons/actionIcons.component.html index 4c19fce348b..e04eccdf2f5 100644 --- a/app/scripts/modules/core/src/widgets/actionIcons/actionIcons.component.html +++ b/app/scripts/modules/core/src/widgets/actionIcons/actionIcons.component.html @@ -1,11 +1,9 @@
            - - diff --git a/app/scripts/modules/core/src/widgets/scopeClusterSelector.directive.html b/app/scripts/modules/core/src/widgets/scopeClusterSelector.directive.html index bb6281ecfde..59201a7e066 100644 --- a/app/scripts/modules/core/src/widgets/scopeClusterSelector.directive.html +++ b/app/scripts/modules/core/src/widgets/scopeClusterSelector.directive.html @@ -1,33 +1,32 @@
            + type="text" + class="form-control input-sm" + ng-if="vm.freeFormClusterField" + ng-required="vm.required" + ng-model="vm.model" + ng-blur="vm.clusterChanged()" + />
            Toggle for text input - Toggle for list of existing clusters + Toggle for list of existing clusters +
            diff --git a/app/scripts/modules/dcos/common/selectField.directive.html b/app/scripts/modules/dcos/common/selectField.directive.html index 4c28136c067..6ed1a50680f 100644 --- a/app/scripts/modules/dcos/common/selectField.directive.html +++ b/app/scripts/modules/dcos/common/selectField.directive.html @@ -1,18 +1,21 @@
            -
            Region -
            +
            Region
            (Select an account)
            - - +

            {{component[field]}}

            -
            \ No newline at end of file +
            diff --git a/app/scripts/modules/dcos/instance/details/details.html b/app/scripts/modules/dcos/instance/details/details.html index 00ccd15e7c0..fc1a6788f5b 100644 --- a/app/scripts/modules/dcos/instance/details/details.html +++ b/app/scripts/modules/dcos/instance/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -27,12 +25,25 @@

            - @@ -42,7 +53,9 @@

            Insight

            @@ -60,22 +73,28 @@

            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            JSON
            Show JSON
            DC/OS UI
            -
            {{instance.taskId}}
            +
            {{instance.taskId}}
            {{metric.source | robotToHuman}}
            - + {{metric.state | robotToHuman}} diff --git a/app/scripts/modules/dcos/job/general.component.html b/app/scripts/modules/dcos/job/general.component.html index 2e9144fe409..be856ea1fdf 100644 --- a/app/scripts/modules/dcos/job/general.component.html +++ b/app/scripts/modules/dcos/job/general.component.html @@ -3,26 +3,36 @@
            ID
            -
            +
            + +

            Description
            -
            +
            + +
            CPUs
            - +
            GPUs
            - +
            @@ -30,19 +40,21 @@ Memory (MiB)
            - +
            Disk (MiB)
            - +

            Command
            -
            +
            + +
            diff --git a/app/scripts/modules/dcos/job/schedule.component.html b/app/scripts/modules/dcos/job/schedule.component.html index 7e4e6b59891..dd4c949ed6f 100644 --- a/app/scripts/modules/dcos/job/schedule.component.html +++ b/app/scripts/modules/dcos/job/schedule.component.html @@ -1,6 +1,6 @@
            -
            +
            Run on a schedule
            @@ -9,20 +9,30 @@
            CRON Schedule
            -
            +
            + +
            Time Zone
            -
            +
            + +
            Starting Deadline
            - +
            diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/basicSettings.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/basicSettings.html index 61226889226..fb8df51a499 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/basicSettings.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/basicSettings.html @@ -4,52 +4,78 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName()}} - - - + + +
            Account
            - +
            - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/createWizard.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/createWizard.html index d42413fe367..8cea88866bc 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/createWizard.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/createWizard.html @@ -10,9 +10,11 @@
            - - + +
            diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/editWizard.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/editWizard.html index 2c14dcd0689..4cef609079d 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/editWizard.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/editWizard.html @@ -10,9 +10,11 @@
            - - + +
            diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html index 5476f188dd2..94660b2d059 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html @@ -1,4 +1,8 @@ -
            +
            @@ -6,7 +10,7 @@
            - +
            @@ -16,8 +20,14 @@
            - +
            @@ -25,24 +35,32 @@
            - +
            -
            -
            +
            +
            Protocol
            - +
            -
            +
            diff --git a/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html b/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html index 3ee41cc16b4..3d4ca5b6238 100644 --- a/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html +++ b/app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html @@ -1,4 +1,8 @@ -
            +
            @@ -6,8 +10,13 @@
            - +
            @@ -17,8 +26,7 @@
            - +
            @@ -28,8 +36,7 @@
            - +
            @@ -39,10 +46,7 @@
            - +
            diff --git a/app/scripts/modules/dcos/loadBalancer/details/details.html b/app/scripts/modules/dcos/loadBalancer/details/details.html index a486024334f..cd6aa69909f 100644 --- a/app/scripts/modules/dcos/loadBalancer/details/details.html +++ b/app/scripts/modules/dcos/loadBalancer/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -32,8 +30,14 @@

            @@ -48,12 +52,13 @@

            {{loadBalancer.createdTime | timestamp}}
            In
            -
            Region
            +
            Region
            +
            {{loadBalancer.region}}
            JSON
            Show JSON
            DC/OS UI
            -
            {{loadBalancer.name}}
            +
            {{loadBalancer.name}}
            Server Groups
            diff --git a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStage.html index 3ede6a45f3d..7eca433d82f 100644 --- a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,9 +1,6 @@
            - +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/dcos/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/dcos/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/dcos/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStage.html index d13cdb5cc5c..cff4d11137c 100644 --- a/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,16 +1,11 @@ -
            +
            - +
            - +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/dcos/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/dcos/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/dcos/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/dcos/pipeline/stages/disableCluster/disableClusterStage.html index dbc585d5352..35c8c3483e3 100644 --- a/app/scripts/modules/dcos/pipeline/stages/disableCluster/disableClusterStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/disableCluster/disableClusterStage.html @@ -1,26 +1,26 @@
            - +
            Keep the - - + {{disableClusterStageCtrl.pluralize('server group', stage.remainingEnabledServerGroups)}} enabled.
            - +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/dcos/pipeline/stages/findAmi/findAmiStage.html index 70743b00bcd..ec136992cea 100644 --- a/app/scripts/modules/dcos/pipeline/stages/findAmi/findAmiStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/findAmi/findAmiStage.html @@ -1,10 +1,10 @@
            - + application="application" + component="stage" + accounts="accounts" + show-all-regions="true" + > @@ -18,13 +18,11 @@ - +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStage.html index 3e67a7660e5..80f86a00e82 100644 --- a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -4,34 +4,33 @@
            - - + -
            -
            - @@ -40,12 +39,13 @@
            - +
            - 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

            @@ -53,13 +53,14 @@
            - +
            - 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
            @@ -74,7 +75,7 @@
            - +
            @@ -83,8 +84,6 @@ This is the exact amount to which the target server group will be scaled
            - +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index 200fb6e41f7..0b337cdd876 100644 --- a/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/dcos/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/dcos/pipeline/stages/runJob/dockerImageAndTagSelector.component.html b/app/scripts/modules/dcos/pipeline/stages/runJob/dockerImageAndTagSelector.component.html index 8097d2cab83..a5ef04cff6d 100644 --- a/app/scripts/modules/dcos/pipeline/stages/runJob/dockerImageAndTagSelector.component.html +++ b/app/scripts/modules/dcos/pipeline/stages/runJob/dockerImageAndTagSelector.component.html @@ -3,23 +3,26 @@ Registry Name
            • - - {{$ctrl.account}} + + {{ $ctrl.account }}
            - - + +
            @@ -28,14 +31,15 @@ Organization
            - - - {{$ctrl.organization}} + + + {{ $ctrl.organization }} @@ -47,16 +51,16 @@ Image
            - - - {{$ctrl.repository}} + + + {{ $ctrl.repository }} @@ -69,11 +73,13 @@
            - +
            @@ -81,16 +87,16 @@ Tag
            - - - {{$ctrl.tag}} + + + {{ $ctrl.tag }} diff --git a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobExecutionDetails.html b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobExecutionDetails.html index 2901c0e4bcc..23276ef925f 100644 --- a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobExecutionDetails.html +++ b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobExecutionDetails.html @@ -9,7 +9,10 @@
            Namespace
            {{stage.context.region}}
            Image
            -
            {{[stage.context.imageDescription.registry, stage.context.imageDescription.repository, stage.context.imageDescription.tag].join(':')}}
            +
            + {{[stage.context.imageDescription.registry, stage.context.imageDescription.repository, + stage.context.imageDescription.tag].join(':')}} +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.html b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.html index 7ef4276f1e6..64d9950106a 100644 --- a/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.html +++ b/app/scripts/modules/dcos/pipeline/stages/runJob/runJobStage.html @@ -1,50 +1,52 @@
            - - + - + - - + - - + + + specify-tag-by-regex="false" + account="ctrl.stage.docker.image.account" + organization="ctrl.stage.docker.image.organization" + registry="ctrl.stage.docker.image.registry" + repository="ctrl.stage.docker.image.repository" + tag="ctrl.stage.docker.image.tag" + show-registry="true" + on-change="ctrl.onChange" + > - - +
            @@ -52,7 +54,9 @@
            Property File
            -
            +
            + +
            diff --git a/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index 9e45cf19b4a..3cc197370d3 100644 --- a/app/scripts/modules/dcos/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/dcos/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/dcos/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/shrinkClusterStage.html index 9fc0171f02d..ec7776e4c9c 100644 --- a/app/scripts/modules/dcos/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/dcos/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/dcos/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.html index 66ad642bd1f..bae6ee8088d 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/basicSettings.html @@ -1,32 +1,49 @@ -
            +
            Account
            - +
            -

            - The DC/OS cluster [{{command.viewState.dirty.dcosCluster}}] is not associated to the selected account and was removed. +

            + + The DC/OS cluster [{{command.viewState.dirty.dcosCluster}}] is not associated to the selected account and was + removed.

            - Okay + Okay

            - - + +
            @@ -34,7 +51,15 @@ Group
            -
            +
            + +
            @@ -47,8 +72,15 @@ Stack
            -
            +
            + +
            @@ -60,8 +92,15 @@ Detail
            -
            +
            + +
            @@ -74,7 +113,7 @@
            - +
            GPUs @@ -89,7 +128,7 @@ Memory (MiB)
            - +
            Disk (MiB) @@ -103,7 +142,13 @@ Instances
            - +
            @@ -113,11 +158,17 @@
            - +
            -
            +
            -
            +

            Your server group will be in the cluster:

            @@ -126,16 +177,19 @@

            (new cluster)

            -
            +

            There is already a server group in this cluster. Do you want to clone it?

            - Cloning copies the entire configuration from the selected server group, allowing you to modify whichever fields (e.g. image) - you need to change in the new server group. + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group.

            - To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the server group. + To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the + server group.

            diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.html index 2fcad2faf0f..000fc3c9e5e 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/containerSettings.html @@ -1,28 +1,37 @@ -

            - +
            -

            - The following image is not registered in the above account and was removed: {{command.viewState.dirty.imageId}} +

            + + The following image is not registered in the above account and was removed: + {{command.viewState.dirty.imageId}}

            - Okay + Okay

            -
            Container Image +
            + Container Image
            {{$select.selected.imageId}} - + @@ -50,7 +59,10 @@ - +
            diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.html index 9f82f62c9fd..614408c9488 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/environmentVariables.html @@ -1,22 +1,28 @@ -
            +
            Set variables for each task your service launches. You can also use variables to expose Secrets. - Learn more about variables. - + Learn more about variables. +
            -

            +

            + The following secrets are not valid for the selected account and were removed:

            • {{removed}}

            - Okay + Okay

            @@ -29,9 +35,18 @@
            Name
            - +
            Duplicate key
            -
            Name is required
            +
            + Name is required +
            @@ -39,11 +54,23 @@
            Value
            - +
            - + {{$select.selected}} @@ -54,13 +81,19 @@
            Secret
            - +
            - + Remove Environment Variable
            diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.html index c541b5f99b8..fd5c602cda5 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/healthChecks.html @@ -1,11 +1,17 @@ -
            +
            Perform health checks on running tasks to determine if they are operating as expected.
            - + +
            @@ -14,7 +20,9 @@
            {{$select.selected}} - +
            @@ -27,7 +35,13 @@
            Path
            - +
            @@ -43,7 +57,13 @@
            Command
            - +
            @@ -59,7 +79,12 @@
            -
            @@ -67,7 +92,12 @@
            -
            @@ -78,14 +108,25 @@
            - +
            Maximum Consecutive Failures
            - +
            @@ -96,7 +137,9 @@
            {{$select.selected}} - +
            @@ -106,7 +149,13 @@
            Port Index
            - +
            diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/network.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/network.html index 543d863d205..030893b849e 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/network.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/network.html @@ -1,21 +1,28 @@
            - Configure the networking for your service. We will automatically generate a Service Address to connect to for each of your - load balanced endpoints. + Configure the networking for your service. We will automatically generate a Service Address to connect to for each + of your load balanced endpoints. - Read more about load balancing. - + Read more about load balancing. +
            Network Type
            - + {{$select.selected.name}} - + @@ -26,11 +33,16 @@
            Network Name
            -
            -
            +
            @@ -39,7 +51,10 @@
            - + - + @@ -50,19 +66,31 @@ - + @@ -102,19 +132,36 @@ - + diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/wizard.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/wizard.html index 2c1a97881f2..32e27189369 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/wizard.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/wizard.html @@ -33,14 +33,17 @@
            - - +
            diff --git a/app/scripts/modules/dcos/serverGroup/details/details.html b/app/scripts/modules/dcos/serverGroup/details/details.html index 2b33460d9c6..0edba87acce 100644 --- a/app/scripts/modules/dcos/serverGroup/details/details.html +++ b/app/scripts/modules/dcos/serverGroup/details/details.html @@ -1,20 +1,18 @@ -
            +
            -
            - - - -
            -
            - -
            +
            + + + +
            +
            + +
            - +
            @@ -34,7 +32,14 @@

          • Resize
          • Disable
            • -
          • Enable
            • +
          • + Enable +
          • Destroy
          • Clone
            • @@ -49,29 +54,33 @@

            Created
            {{serverGroup.createdTime | timestamp }}
            In
            -
            -
            Region
            +
            +
            +
            Region
            +
            {{serverGroup.region}}
            -
            DC/OS Cluster
            +
            DC/OS Cluster
            +
            {{serverGroup.dcosCluster}}
            -
            Group
            +
            Group
            +
            {{serverGroup.group}}
            Kind
            {{serverGroup.kind}}
            JSON
            Show JSON
            DC/OS UI
            -
            {{serverGroup.name}}
            +
            {{serverGroup.name}}
            -
            -
            Current
            -
            {{serverGroup.capacity.desired}}
            -
            - +
            +
            Current
            +
            {{serverGroup.capacity.desired}}
            +
            +
            @@ -93,16 +102,14 @@

            {{serverGroup.disk}}

             - -
            - - -
            -             + +
            + +
            +
            - - +

            diff --git a/app/scripts/modules/dcos/serverGroup/details/resize/resize.html b/app/scripts/modules/dcos/serverGroup/details/resize/resize.html index ef1bdbe2883..9c1956bb8b2 100644 --- a/app/scripts/modules/dcos/serverGroup/details/resize/resize.html +++ b/app/scripts/modules/dcos/serverGroup/details/resize/resize.html @@ -19,11 +19,13 @@

            Current size:

            @@ -36,12 +38,14 @@

            Resize to:

            @@ -53,31 +57,29 @@

            Force Resize?
            - +

            - +
            - + + -
            diff --git a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.html index e325ede2a16..e6f3895d30e 100644 --- a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.html @@ -40,7 +40,6 @@
            -
            diff --git a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeStage.html index f3eaa7ff5d7..be9485088d7 100644 --- a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeStage.html @@ -1,19 +1,15 @@
            - + - + - + - + @@ -21,19 +17,16 @@ -
            - -
            -             +
            + +
            +
            diff --git a/app/scripts/modules/ecs/src/instance/details/instanceDetails.html b/app/scripts/modules/ecs/src/instance/details/instanceDetails.html index c36bfe98741..4c045f5bd2c 100644 --- a/app/scripts/modules/ecs/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/ecs/src/instance/details/instanceDetails.html @@ -5,8 +5,7 @@

            Could not find instance {{instanceIdNotFound}}.

            - +
            @@ -17,8 +16,7 @@

            - +
            @@ -29,21 +27,55 @@

            -
            +
            +
            -
            @@ -51,7 +83,9 @@

            Insight

            @@ -65,10 +99,13 @@

            (Unknown)
            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            Image ID
            {{instance.imageId}}
            @@ -86,7 +123,10 @@

            {{metric.type | robotToHuman}}
            - + {{metric.state | robotToHuman}} @@ -96,10 +136,16 @@

            Status

            -
            +
            -
            +
            @@ -114,32 +160,48 @@

            IP
            - Private address (ENI): {{instance.networkInterface.privateIpv4Address}} + Private address (ENI): + {{instance.networkInterface.privateIpv4Address}} + tool-tip="'Copy to clipboard'" + >
            - Private address (ENI): {{instance.networkInterface.ipv6Address}} + Private address (ENI): + {{instance.networkInterface.ipv6Address}} + tool-tip="'Copy to clipboard'" + >
            - Private address (Bridge): {{instance.privateAddress}} + Private address (Bridge): + {{instance.privateAddress}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.privateAddress" + tool-tip="'Copy to clipboard'" + >
            - +

            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html index 907451ce2d2..57cc414e9a7 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html @@ -11,7 +11,8 @@

            component="stage" accounts="accounts" single-region="true" - cluster-field="targetCluster"> + cluster-field="targetCluster" + >

            @@ -23,18 +24,20 @@

            Capacity
            @@ -46,41 +49,53 @@

            Desired

            -
            -
            -
            +
            + +
            +
            + +
            +
            + +

            - +

            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html index 13b423a946b..fc3707e6936 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html +++ b/app/scripts/modules/ecs/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/ecs/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStage.html index a92bfb7c6d4..34dad77b62c 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,9 +1,6 @@
            - +
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/ecs/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/ecs/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStage.html index a1fe90b7929..c873d7e8955 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,16 +1,11 @@ -
            +
            - +
            - +
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/ecs/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/ecs/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/disableClusterStage.html index e071b49a25d..aa2f6e62930 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/disableClusterStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/disableCluster/disableClusterStage.html @@ -1,26 +1,26 @@
            - +
            Keep the - - + {{disableClusterStageCtrl.pluralize('server group', stage.remainingEnabledServerGroups)}} enabled.
            - +
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStage.html index f4449612430..e4238e0e5b9 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,16 +1,11 @@
            - +
            - +
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStepLabel.html index 9261272f7f8..5a77ae17c0f 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/ecs/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/ecs/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html b/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html index 15cf78920bd..49fc8bc6c26 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html @@ -1,12 +1,9 @@
            - +
            -
            - Example value: 12345678901.dkr.ecr.us-west-2.amazonaws.com/continuous-delivery:latest -
            +
            Example value: 12345678901.dkr.ecr.us-west-2.amazonaws.com/continuous-delivery:latest
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStage.html index a0146b81b2a..86a8e22a62b 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -6,52 +6,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
            @@ -67,13 +68,13 @@

            - +
            - +
            - +
            @@ -81,8 +82,6 @@

            This is the exact amount to which the target server group will be scaled

            - +
            diff --git a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index 200fb6e41f7..0b337cdd876 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/ecs/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index ca5a8cf649d..1ca94320b6f 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/ecs/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/ecs/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/ecs/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index b54821af838..7fb0209161b 100644 --- a/app/scripts/modules/ecs/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/ecs/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/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html index 6871c84dffe..a7b05fbfbe8 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html @@ -1,18 +1,23 @@
            -
            Health Grace Period
            -
            +
            + +
            -
            ECS IAM Instance Profile
            +
            + ECS IAM Instance Profile +
            @@ -20,8 +25,13 @@
            - - {{$select.selected}} + + {{ $select.selected }} @@ -30,14 +40,21 @@
            -
            Docker Image Credentials
            +
            + Docker Image Credentials +
            No account or region was selected, or no AWS Secrets Manager secrets are available in this account and region.
            - - {{$select.selected}} + + {{ $select.selected }} @@ -51,8 +68,10 @@
            - {{$select.selected}} - + {{ $select.selected }} + diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html index f762ebdd6da..57377f26384 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html @@ -1,7 +1,10 @@
            - +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.component.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.component.html index f3513b051c2..727f988c4a8 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.component.html @@ -1,14 +1,12 @@
            -
            Launch Type
            - - {{$select.selected}} + + {{ $select.selected }} @@ -21,10 +19,14 @@ Desired capacity
            -
            +
            + +
            @@ -32,10 +34,9 @@ Minimum
            -
            +
            + +
            @@ -43,16 +44,15 @@ Maximum
            -
            +
            + +
            @@ -62,11 +62,10 @@
            -
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.html index 99c07829978..5a52e3f23bb 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/horizontalScaling/horizontalScaling.html @@ -1,7 +1,10 @@
            - +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/basicSettings.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/basicSettings.html index 34e61367061..70f2b01da69 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/basicSettings.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/location/basicSettings.html @@ -1,103 +1,138 @@
            - -
            -
            -
            You are deploying into a deprecated region within the {{ command.credentials }} account!
            + +
            +
            +
            + You are deploying into a deprecated region within the {{ command.credentials }} account!
            -
            -
            - Account -
            -
            - -
            +
            +
            +
            + Account
            - -
            -
            - ECS Cluster name -
            -
            -
            - No ECS clusters found in the selected account/region -
            - - {{$select.selected}} - - - - -
            +
            +
            -
            -
            - Stack - -
            -
            +
            + +
            +
            + ECS Cluster name
            -
            -
            - Only dot(.) and underscore(_) special characters are allowed in the Stack field. +
            +
            + No ECS clusters found in the selected account/region
            + + {{$select.selected}} + + + +
            -
            -
            - Detail - -
            -
            +
            +
            +
            + Stack +
            -
            -
            - Only dot(.), underscore(_), and dash(-) special characters are allowed in the Detail field. -
            +
            + +
            +
            +
            +
            + Only dot(.) and underscore(_) special characters are allowed in the Stack field. +
            +
            +
            +
            + Detail +
            - -
            -
            -
            -
            -

            Your server group will be in the cluster:

            +
            + +
            +
            +
            +
            + Only dot(.), underscore(_), and dash(-) special characters are allowed in the Detail field. +
            +
            + +
            +
            +
            +
            +

            Your server group will be in the cluster:

            +

            + + {{basicSettingsCtrl.getNamePreview()}} + (new cluster) + +

            +
            +

            + There is already a server group in this cluster. Do you want to clone it? +

            +

            + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group. +

            +

            + To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the + server group. +

            - - {{basicSettingsCtrl.getNamePreview()}} - (new cluster) - + + Go to details for {{latestServerGroup.name}} +

            -
            -

            - There is already a server group in this cluster. Do you want to clone it? -

            -

            - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. -

            -

            - To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the - server group. -

            -

            - - Go to details for {{latestServerGroup.name}} - -

            -
            -
            -
            +
            +
            - +
            +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/logging/logging.component.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/logging/logging.component.html index 129e60690c4..422454b802b 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/logging/logging.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/logging/logging.component.html @@ -5,8 +5,10 @@
            - {{$select.selected}} - + {{ $select.selected }} + @@ -24,5 +26,4 @@
            Logging options are not available for your log driver selection.
            -
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.html index 9578f8fd7ef..8353d259ac1 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/networking/networkingSelector.component.html @@ -3,12 +3,10 @@
            -
            - Network mode -
            +
            Network mode
            - {{$select.selected}} + {{ $select.selected }} @@ -25,8 +23,13 @@
            - - {{$select.selected}} + + {{ $select.selected }} @@ -38,18 +41,23 @@
            - Security Groups + Security Groups +
            No security groups found in the selected account/region
            - - {{$item}} - + + {{ $item }} + @@ -64,13 +72,23 @@
            @@ -79,14 +97,20 @@
            -

            +

            + The following target groups could not be found in the selected account/region/VPC and were removed:

              -
            • {{targetGroup}}
              • +
            • {{ targetGroup }}

            - Okay + Okay

            @@ -99,11 +123,15 @@
            No target groups found in the selected account/region/VPC
            - - {{$select.selected}} - + + {{ $select.selected }} + @@ -118,7 +146,8 @@ last refreshed {{ $ctrl.refreshTime | timestamp }} refreshing...

            -

            If you're not finding a target group that was recently added, +

            + If you're not finding a target group that was recently added, click here to refresh the list.

            @@ -128,10 +157,14 @@
            Target container port
            -
            +
            + +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/serverGroupWizard.html index 68359a9ec73..53937f11c52 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/serverGroupWizard.html @@ -27,9 +27,17 @@

            - - + +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/templateSelection/templateSelection.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/templateSelection/templateSelection.html index 3d97e246d9c..92bdde554bd 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/templateSelection/templateSelection.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/templateSelection/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.component.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.component.html index 514a15f69d5..44f4df8d59b 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.component.html @@ -1,23 +1,29 @@
            -
            Reserved Compute Units
            -
            +
            + +
            Reserved Memory
            -
            +
            + +
            -
            diff --git a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.html b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.html index 7e5ce8f8450..67d19156f39 100644 --- a/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.html +++ b/app/scripts/modules/ecs/src/serverGroup/configure/wizard/verticalScaling/verticalScaling.html @@ -1,7 +1,10 @@
            - +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeCapacity.component.html b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeCapacity.component.html index 03464ccb7a9..0d88c53b808 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeCapacity.component.html +++ b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeCapacity.component.html @@ -12,48 +12,56 @@
            Current
            -
            +
            +
            -
            +
            +
            -
            +
            +
            Resize to
            -
            -
            -
            +
            + +
            +
            + +
            +
            + +
            -
            -

            To modify min and max instance counts, use the Advanced Mode.

            +

            + To modify min and max instance counts, use the + Advanced Mode. +

            @@ -61,12 +69,14 @@ Current size
            - - instances + + instances
            @@ -74,13 +84,15 @@ Resize to
            - - instances + + instances
            diff --git a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.html index 79cbf4c428f..571b003c80d 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.html +++ b/app/scripts/modules/ecs/src/serverGroup/details/resize/resizeServerGroup.html @@ -11,19 +11,18 @@

            Resize {{serverGroup.name}}

            - +
            -
            - +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.html index c941b30931d..fed71c230b3 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/ecs/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -22,10 +22,12 @@

            Rollback {{serverGroup.name}}

            - +
            @@ -41,28 +43,31 @@

            Rollback {{serverGroup.name}}

            1. Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
              2. -
            2. 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) +
            3. + 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)
            4. Disable {{ serverGroup.name }}
              5. -
            5. Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ - min: {{ serverGroup.capacity.min }} - ]
              6. +
            6. + 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 }}).

            -
            - +
            diff --git a/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.html index 6e96f507b49..17d6455100a 100644 --- a/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/ecs/src/serverGroup/details/serverGroupDetails.html @@ -1,23 +1,18 @@ -
            - +
            -
            - - - -
            -

            - -

            +
            + + + +
            +

            + +

            -
            - +
            @@ -26,7 +21,6 @@

            {{ctrl.serverGroup.name}} - page-location="details" on-update="ctrl.application.serverGroups.refresh()" > -

            @@ -51,10 +44,16 @@

          • Resize
          • Disable
            • -
          • Enable
            • +
          • + Enable +
          • - + Enable @@ -62,11 +61,13 @@

          • Destroy
            • - +

            • @@ -75,7 +76,9 @@

            Insight

            @@ -85,17 +88,22 @@

            Disabled {{ctrl.disabledDate | timestamp}}

            - +
            Created
            {{ctrl.serverGroup.createdTime | timestamp}}
            - +
            In
            @@ -127,22 +135,25 @@

            {{ctrl.serverGroup.taskDefinition.cpuUnits}}
            Container Reserved Memory
            -
            {{ctrl.serverGroup.taskDefinition.memoryReservation}} mb
            +
            + {{ctrl.serverGroup.taskDefinition.memoryReservation}} mb +
            Container Memory Limit
            {{ctrl.serverGroup.taskDefinition.memoryLimit}} mb

             -
            This server group has no environment variables
            +
            + This server group has no environment variables +
            {{variable.name}}
            {{variable.value}}
             -
            +
            Instances
            @@ -173,7 +184,12 @@

            -
            {{metricAlarmName}}
            +
            + {{metricAlarmName}} +
            There are no scaling policies assigned.
             @@ -182,16 +198,20 @@

            Average CPU Utilization last 15 minutes
            -
            90%
            +
            90%
            +
            Average CPU Utilization last 24 hours
            -
            30%
            +
            30%
            +
            Average memory Utilization last 15 minutes
            -
            40%
            +
            40%
            +
            Average memory Utilization last 24 hours
            -
            45%
            +
            45%
            +
            @@ -207,7 +227,7 @@

            Version
            {{ctrl.serverGroup.buildInfo.version}}
            Build Link
            -
            {{ctrl.buildJenkinsLink()}}
            +
            {{ctrl.buildJenkinsLink()}}

            diff --git a/app/scripts/modules/ecs/src/serverGroup/events/events.html b/app/scripts/modules/ecs/src/serverGroup/events/events.html index 0a8f33570c4..4597eff4569 100644 --- a/app/scripts/modules/ecs/src/serverGroup/events/events.html +++ b/app/scripts/modules/ecs/src/serverGroup/events/events.html @@ -16,20 +16,21 @@

            Server Group Events for {{$ctrl.serverGroup.name}}

            -
            - {{event.status}} -
            -
            - {{event.status}} -
            +
            + {{event.status}} +
            +
            + {{event.status}} +
            - {{event.createdAt | timestamp}} -
            - {{event.message}} -
            -
            + {{event.createdAt | timestamp}} +
            + {{event.message}} +
            +
            -
            diff --git a/app/scripts/modules/google/src/applicationProviderFields/gceFields.html b/app/scripts/modules/google/src/applicationProviderFields/gceFields.html index ee37dcff563..02c47d3af04 100644 --- a/app/scripts/modules/google/src/applicationProviderFields/gceFields.html +++ b/app/scripts/modules/google/src/applicationProviderFields/gceFields.html @@ -2,9 +2,11 @@
            GCE Settings
            diff --git a/app/scripts/modules/google/src/autoscalingPolicy/components/basicSettings/basicSettings.component.html b/app/scripts/modules/google/src/autoscalingPolicy/components/basicSettings/basicSettings.component.html index 134e463c12e..07b14598050 100644 --- a/app/scripts/modules/google/src/autoscalingPolicy/components/basicSettings/basicSettings.component.html +++ b/app/scripts/modules/google/src/autoscalingPolicy/components/basicSettings/basicSettings.component.html @@ -1,53 +1,62 @@
            -
            - Minimum number of instances -
            -
            - -
            -
            - Must be greater than zero. -
            +
            + Minimum number of instances +
            +
            + +
            +
            + Must be greater than zero. +
            +
            +
            +
            + Maximum number of instances +
            +
            + +
            +
            + Must be greater than or equal to minimum. +
            +
            +
            +
            + Cool-down period (seconds) + +
            +
            +
            -
            -
            - Maximum number of instances -
            -
            - -
            -
            - Must be greater than or equal to minimum. -
            +
            + Must be greater than or equal to 15 seconds.
            -
            -
            - Cool-down period (seconds) - -
            -
            - -
            -
            - Must be greater than or equal to 15 seconds. -
            @@ -55,12 +64,10 @@
            - +
            diff --git a/app/scripts/modules/google/src/autoscalingPolicy/components/metricSettings/metricSettings.component.html b/app/scripts/modules/google/src/autoscalingPolicy/components/metricSettings/metricSettings.component.html index cefd227577d..fd2f782cb12 100644 --- a/app/scripts/modules/google/src/autoscalingPolicy/components/metricSettings/metricSettings.component.html +++ b/app/scripts/modules/google/src/autoscalingPolicy/components/metricSettings/metricSettings.component.html @@ -8,19 +8,22 @@
            - +
            - Must be between 1 and 99. + Must be between 1 and 99.
            - @@ -46,18 +52,22 @@
            - +
            - + Must be between 1 and 99.
            @@ -68,8 +78,11 @@
            - @@ -78,15 +91,13 @@
            -
            +
            Metric Identifier
            - +
            - +
            -
            diff --git a/app/scripts/modules/google/src/cache/cacheRefresh.component.html b/app/scripts/modules/google/src/cache/cacheRefresh.component.html index 0cdf56207f0..29bd404f6c4 100644 --- a/app/scripts/modules/google/src/cache/cacheRefresh.component.html +++ b/app/scripts/modules/google/src/cache/cacheRefresh.component.html @@ -1,17 +1,17 @@

            - + {{::$ctrl.capitalizedKey}} last refreshed {{ $ctrl.getRefreshTime() | timestamp }} refreshing...

            -

            If you're not finding a {{::$ctrl.depluralizedKey}} that was recently added, +

            + If you're not finding a {{::$ctrl.depluralizedKey}} that was recently added, click here to refresh the list.

            diff --git a/app/scripts/modules/google/src/common/footer.directive.html b/app/scripts/modules/google/src/common/footer.directive.html index 1ef03baefe1..7c7765a30e0 100644 --- a/app/scripts/modules/google/src/common/footer.directive.html +++ b/app/scripts/modules/google/src/common/footer.directive.html @@ -1,11 +1,9 @@
            - + + -
            diff --git a/app/scripts/modules/google/src/instance/details/instanceDetails.html b/app/scripts/modules/google/src/instance/details/instanceDetails.html index d2b014b5b04..7133459acc2 100644 --- a/app/scripts/modules/google/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/google/src/instance/details/instanceDetails.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -24,27 +22,53 @@

            {{instance ? instance.instanceId : instanceIdNotFound}}

            + ng-if="instance.gcloudSSHCommand" + class="copy-to-clipboard" + text="instance.gcloudSSHCommand" + tool-tip="'Copy gcloud compute ssh command to clipboard'" + >
            -
            @@ -52,7 +76,9 @@

            Insight

            @@ -75,10 +101,13 @@

            {{instance.cpuPlatform}}
            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            Network
            {{instance.network || '(Unknown)'}}
            @@ -98,7 +127,10 @@

            {{metric.type | robotToHuman}}
            - + {{metric.state | robotToHuman}} @@ -108,7 +140,10 @@

            Status

            -
            +
            @@ -120,39 +155,44 @@

            {{instance.internalDnsName}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.internalDnsName" + tool-tip="'Copy to clipboard'" + >
            Internal IP Address
            {{instance.internalIpAddress}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.internalIpAddress" + tool-tip="'Copy to clipboard'" + >
            External IP Address
            {{instance.externalIpAddress}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.externalIpAddress" + tool-tip="'Copy to clipboard'" + >
            - +
            No custom metadata associated with this instance
            @@ -191,9 +231,10 @@

            SSH + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.sshLink" + tool-tip="'Copy to clipboard'" + >
            @@ -203,9 +244,10 @@

          • Cloud Console Logs + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.logsLink" + tool-tip="'Copy to clipboard'" + >
          • @@ -213,7 +255,13 @@

            • - +

            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.html b/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.html index 51e0997afd4..d365d7b5224 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/choice/gceLoadBalancerChoice.modal.html @@ -12,8 +12,7 @@

            Load Balancer Type Selection

            - + {{$select.selected}} @@ -26,8 +25,7 @@

            Load Balancer Type Selection

            - diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonAdvancedSettingsPage.html b/app/scripts/modules/google/src/loadBalancer/configure/common/commonAdvancedSettingsPage.html index 32a56889cd7..d00b79a7773 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonAdvancedSettingsPage.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonAdvancedSettingsPage.html @@ -3,11 +3,13 @@
            Session Affinity
            -
            @@ -16,13 +18,15 @@ Affinity Cookie TTL Seconds
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html index ae31875cee4..da4083d1792 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html @@ -2,20 +2,24 @@
            - + - + @@ -26,11 +30,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonEditLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/common/commonEditLoadBalancer.html index 6a29cf2e36d..98a38999511 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonEditLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonEditLoadBalancer.html @@ -2,17 +2,21 @@
            - + - + @@ -23,11 +27,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/commonHealthCheckPage.html b/app/scripts/modules/google/src/loadBalancer/configure/common/commonHealthCheckPage.html index b1a28fec52e..b407e2c5cd9 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/commonHealthCheckPage.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/commonHealthCheckPage.html @@ -1,12 +1,16 @@ - +
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.html b/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.html index b41052e9a5f..9922fafba29 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/common/healthCheck.component.html @@ -4,11 +4,14 @@
            -
            +
            + numbers, or hyphens, and cannot end with a hyphen." + >
            @@ -16,10 +19,12 @@
            Protocol
            -
            @@ -31,62 +36,65 @@ + class="form-control input-sm" + > - {{$select.selected.name}} + {{ $select.selected.name }} + repeat="healthCheck in $ctrl.existingHealthChecksForProtocol | filter: {name: $select.search}" + >
            - +
            -
            - Toggle for list of existing health checks - Toggle for text input + Toggle for list of existing health checks + Toggle for text input
            -
            +
            Request Path
            - +
            Port
            - +
            @@ -95,12 +103,14 @@ Timeout
            - +
            @@ -109,12 +119,14 @@ Interval
            - +
            @@ -123,12 +135,14 @@ Healthy Threshold
            - +
            @@ -137,12 +151,14 @@ Unhealthy Threshold
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html index 5e3d3a84308..2b4f3e049f9 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendService.component.html @@ -1,14 +1,17 @@
            -
            +
            -
            +
            + message="Name must start with a lowercase letter followed by up to 62 lowercase letters, numbers, or hyphens, and cannot end with a hyphen." + >
            @@ -17,28 +20,34 @@
            Name
            - + - {{$select.selected.name}} + {{ $select.selected.name }} - +
            - +
            @@ -51,14 +60,10 @@
            - Toggle for list of existing backend services - Toggle for text input + Toggle for list of existing backend services + Toggle for text input
            @@ -67,15 +72,16 @@ Health Check
            - + - {{$select.selected}} + {{ $select.selected }} - +
            @@ -87,14 +93,13 @@ Session Affinity
            - + - {{$select.selected}} + {{ $select.selected }} + repeat="sessionAffinity in ['None', 'Client IP', 'Generated Cookie'] | filter: $select.search" + >
            @@ -107,10 +112,7 @@
            - +
            @@ -120,9 +122,11 @@
            - +
            @@ -131,7 +135,7 @@ Enable CDN
            - +
            @@ -140,13 +144,15 @@ Affinity Cookie TTL Seconds
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html index 42859d00a5a..25f8cc5ee52 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html @@ -1,46 +1,57 @@
            -

            - The following backend services have not been associated with a host or path rule, or set as this - load balancer's default service: +

            + + The following backend services have not been associated with a host or path rule, or set as this load balancer's + default service:

            - Remove backend services + Remove backend services

            -
            +
            -

            +

            + You have not configured any backend services.

            - +
            -
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.component.html index 6d5619b0a60..c7749692f61 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.component.html @@ -2,65 +2,79 @@
            -
            +
            Your load balancer will be named: - {{$ctrl.getName($ctrl.loadBalancer, $ctrl.application.name)}} + {{ $ctrl.getName($ctrl.loadBalancer, $ctrl.application.name) }} - - + +
            Account
            - +
            Region
            - +
            Stack
            - +
            Detail
            - +
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.html b/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.html index 5efae8767c4..5c36baf5fe0 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/basicSettings/basicSettings.html @@ -1,4 +1,6 @@ - + diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.html index c10caacd143..5ab0694cac8 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/createHttpLoadBalancer.html @@ -2,10 +2,12 @@
            - + @@ -26,12 +28,12 @@
            - - + +
            - diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/defaultService/defaultService.html b/app/scripts/modules/google/src/loadBalancer/configure/http/defaultService/defaultService.html index 300fe2f7bd4..f3ac388a185 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/defaultService/defaultService.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/defaultService/defaultService.html @@ -5,14 +5,18 @@ Default Service
            - + {{$select.selected}} - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/editHttpLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/http/editHttpLoadBalancer.html index 9430a2134bc..680a782ecca 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/editHttpLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/editHttpLoadBalancer.html @@ -2,10 +2,12 @@
            - + @@ -23,11 +25,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthCheck.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthCheck.component.html index 6f4bee074f0..1e217c577e0 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthCheck.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthCheck.component.html @@ -1,14 +1,17 @@ -
            +
            -
            +
            + message="Name must start with a lowercase letter followed by up to 62 lowercase letters, numbers, or hyphens, and cannot end with a hyphen." + >
            @@ -16,10 +19,12 @@
            Protocol
            -
            @@ -37,59 +42,64 @@ + class="form-control input-sm" + > - {{$select.selected.name}} + {{ $select.selected.name }} - +
            - +
            - Toggle for list of existing health checks - Toggle for text input + Toggle for list of existing health checks + Toggle for text input
            -
            +
            Request Path
            - +
            Port
            - +
            @@ -98,12 +108,14 @@ Timeout
            - +
            @@ -112,12 +124,14 @@ Interval
            - +
            @@ -126,12 +140,14 @@ Healthy Threshold
            - +
            @@ -140,12 +156,14 @@ Unhealthy Threshold
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html index 0202b0bc1bc..2bae50f8634 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html @@ -1,44 +1,55 @@
            -

            +

            + The following health checks have not been associated with a backend service:

            - Remove health checks + Remove health checks

            -
            +
            -

            +

            + You have not configured any health checks.

            - +
            -
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRule.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRule.component.html index b2c87e4f3d2..d0c23782c83 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRule.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRule.component.html @@ -1,18 +1,15 @@ -
            +
            -
            Host Patterns - - +
            + Host Patterns +
            - - {{$item}} + + {{ $item }} - {{hostPattern}} + {{ hostPattern }}
            @@ -29,28 +26,33 @@ Default Service
            - + - {{$select.selected}} + {{ $select.selected }} - +
            - +
            -
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRules.html b/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRules.html index 9d329e5be11..0fb5190c9bf 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRules.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/hostRule/hostRules.html @@ -1,13 +1,14 @@ - +
            -
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listener.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listener.component.html index 0fd87e83f09..99116ebf7e0 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listener.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listener.component.html @@ -1,48 +1,58 @@ -
            +
            -
            +
            Your listener will be named: - {{$ctrl.getName($ctrl.listener, $ctrl.application.name)}} + {{ $ctrl.getName($ctrl.listener, $ctrl.application.name) }} - - + +
            Stack
            - +
            -
            Detail
            +
            Detail
            - +
            @@ -56,58 +66,69 @@
            Port
            - + - {{$select.selected}} + {{ $select.selected }} - {{choice}} + {{ choice }}
            -
            Certificate +
            + Certificate
            - - {{$select.selected}} - + + {{ $select.selected }} +
            - +
            -
            External IP +
            + External IP
            - +
            - +
            @@ -116,7 +137,9 @@
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listeners.html b/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listeners.html index e311d26a812..b3f483ad744 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listeners.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/listeners/listeners.html @@ -1,14 +1,15 @@ - +
            -
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/http/pathRule/pathRule.component.html b/app/scripts/modules/google/src/loadBalancer/configure/http/pathRule/pathRule.component.html index 360b5def22d..ca27df3da20 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/http/pathRule/pathRule.component.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/http/pathRule/pathRule.component.html @@ -1,19 +1,22 @@ -
            +
            -
            Paths - - +
            + Paths +
            - - {{$item}} + + {{ $item }} - {{path}} + {{ path }}
            @@ -30,13 +33,17 @@ Backend Service
            - + - {{$select.selected}} + {{ $select.selected }} - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/internal/createLoadBalancerProperties.html b/app/scripts/modules/google/src/loadBalancer/configure/internal/createLoadBalancerProperties.html index 3c975cedc09..081327f444a 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/internal/createLoadBalancerProperties.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/internal/createLoadBalancerProperties.html @@ -2,67 +2,84 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName(ctrl.loadBalancer, ctrl.application)}} - - + +
            Account
            - +
            - + - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/internal/listener.html b/app/scripts/modules/google/src/loadBalancer/configure/internal/listener.html index a8fe3cd06e8..436cad84646 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/internal/listener.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/internal/listener.html @@ -11,25 +11,29 @@
            - - + + - + - - + +
            @@ -55,7 +70,9 @@
            {{$select.selected}} - +
            @@ -70,8 +87,15 @@
            Container Port
            - +
            Load Balanced diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.html index fba1aa793e8..b068341791e 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/optional.html @@ -6,7 +6,9 @@ Executor
            -
            +
            + +
            @@ -14,7 +16,14 @@ Fetch URIs
            -
            +
            + +
            @@ -26,7 +35,9 @@ Constraints
            -
            +
            + +
            @@ -34,15 +45,23 @@ Accepted Resource Roles
            -
            +
            + +
            User
            -
            +
            + +
            diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/templateSelection.html index 96ef23d4854..3bd69431a4c 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.html b/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.html index ae9e4235568..b4503969a1d 100644 --- a/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.html +++ b/app/scripts/modules/dcos/serverGroup/configure/wizard/volumes.html @@ -8,21 +8,37 @@
            Size (MiB)
            - +
            Container Path
            -
            +
            + +
            @@ -37,8 +53,8 @@
            + Add Persistent Volume +
            Container Path
            -
            +
            + +
            Host Path
            -
            +
            + +
            @@ -71,7 +99,9 @@
            {{$select.selected.description}} - +
            @@ -89,8 +119,8 @@
            + Add Docker Volume +
            Name
            -
            +
            + +
            Container Path
            -
            +
            + +
            @@ -128,8 +175,8 @@
            + Add External Volume +
            - -
            + + - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html b/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html index 81ec25c5908..c38389731e5 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html @@ -1,12 +1,11 @@
            -
            Timeout
            - +
            @@ -15,7 +14,7 @@ Interval
            - +
            @@ -24,7 +23,7 @@ Healthy Threshold
            - +
            @@ -33,9 +32,8 @@ Unhealthy Threshold
            - +
            - diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.html index e7cd957cdd6..4af852d17a0 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.html @@ -14,11 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancerProperties.html b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancerProperties.html index 7280cfc42a7..9f40e0068d7 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancerProperties.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/createLoadBalancerProperties.html @@ -4,48 +4,71 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName()}} - - - + + +
            Account
            - +
            - +
            Stack
            - +
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/editLoadBalancer.html b/app/scripts/modules/google/src/loadBalancer/configure/network/editLoadBalancer.html index 3d5876ace42..c83e86a0b8d 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/editLoadBalancer.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/editLoadBalancer.html @@ -1,21 +1,29 @@ - + - +
            - - + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/healthCheck.html b/app/scripts/modules/google/src/loadBalancer/configure/network/healthCheck.html index fad02587afd..5ac5b9139ca 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/healthCheck.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/healthCheck.html @@ -1,25 +1,36 @@
            -
            Ping
            +
            Ping
            +
            - - - - + + + + - - - - + + + + -
            PortPath
            PortPath
            + + + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/listeners.html b/app/scripts/modules/google/src/loadBalancer/configure/network/listeners.html index f7b3b1752d5..2172d37c7bb 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/network/listeners.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/network/listeners.html @@ -2,7 +2,8 @@
            -

            +

            + Changing your load balancer's protocol or port range will cause the forwarding rule to be destroyed and recreated. This will most likely cause the IP address of this load balancer to change. If you want to preserve the IP for this load balancer, you need to reserve it and manipulate the forwarding rule in Google Cloud @@ -13,29 +14,39 @@

            - - - - + + + + - - - - - - - + + + + + + +
            ProtocolPort Range - -
            Protocol + Port Range + +
            - -
            + +
            + +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/ssl/backendService.html b/app/scripts/modules/google/src/loadBalancer/configure/ssl/backendService.html index 8c306f6322a..653b05f37e1 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/ssl/backendService.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/ssl/backendService.html @@ -6,10 +6,12 @@
            - +
            @@ -18,9 +20,11 @@
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/ssl/createLoadBalancerProperties.html b/app/scripts/modules/google/src/loadBalancer/configure/ssl/createLoadBalancerProperties.html index eabc507c7ff..56f453e6448 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/ssl/createLoadBalancerProperties.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/ssl/createLoadBalancerProperties.html @@ -2,59 +2,72 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName(ctrl.loadBalancer, ctrl.application)}} - - + +
            Account
            - +
            Region
            - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/ssl/listener.html b/app/scripts/modules/google/src/loadBalancer/configure/ssl/listener.html index 10f9ea3920b..3d78f8726e5 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/ssl/listener.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/ssl/listener.html @@ -4,32 +4,33 @@
            - - - - + + + + - - - - + + + +
            CertificatePort
            CertificatePort
            - - {{$select.selected.name}} - - - - - - -
            + + {{$select.selected.name}} + + + + + + +
            @@ -37,8 +38,7 @@
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/tcp/backendService.html b/app/scripts/modules/google/src/loadBalancer/configure/tcp/backendService.html index 8c306f6322a..653b05f37e1 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/tcp/backendService.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/tcp/backendService.html @@ -6,10 +6,12 @@
            - +
            @@ -18,9 +20,11 @@
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/tcp/createLoadBalancerProperties.html b/app/scripts/modules/google/src/loadBalancer/configure/tcp/createLoadBalancerProperties.html index eabc507c7ff..56f453e6448 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/tcp/createLoadBalancerProperties.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/tcp/createLoadBalancerProperties.html @@ -2,59 +2,72 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName(ctrl.loadBalancer, ctrl.application)}} - - + +
            Account
            - +
            Region
            - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/configure/tcp/listener.html b/app/scripts/modules/google/src/loadBalancer/configure/tcp/listener.html index a97dfc47eee..9d9af97b80b 100644 --- a/app/scripts/modules/google/src/loadBalancer/configure/tcp/listener.html +++ b/app/scripts/modules/google/src/loadBalancer/configure/tcp/listener.html @@ -5,10 +5,12 @@ Port
            -
            diff --git a/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.html b/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.html index da0818babdd..7d2c68f8038 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.html +++ b/app/scripts/modules/google/src/loadBalancer/details/deleteModal/deleteModal.html @@ -9,21 +9,23 @@

            Really delete {{ctrl.loadBalancer.name}}?

            - - Delete health checks? + + whether this option is selected or not." + >
            - +
            diff --git a/app/scripts/modules/google/src/loadBalancer/details/healthCheck/healthCheck.component.html b/app/scripts/modules/google/src/loadBalancer/details/healthCheck/healthCheck.component.html index ba2451b9fd8..3ff565cc712 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/healthCheck/healthCheck.component.html +++ b/app/scripts/modules/google/src/loadBalancer/details/healthCheck/healthCheck.component.html @@ -1,14 +1,14 @@
            Name
            -
            {{$ctrl.healthCheck.name}}
            +
            {{ $ctrl.healthCheck.name }}
            Type
            -
            {{$ctrl.healthCheck.healthCheckType}}
            +
            {{ $ctrl.healthCheck.healthCheckType }}
            Target
            -
            {{$ctrl.healthCheck.target}}
            +
            {{ $ctrl.healthCheck.target }}
            Timeout
            -
            {{$ctrl.healthCheck.timeout || $ctrl.healthCheck.timeoutSec}} seconds
            +
            {{ $ctrl.healthCheck.timeout || $ctrl.healthCheck.timeoutSec }} seconds
            Interval
            -
            {{$ctrl.healthCheck.interval || $ctrl.healthCheck.checkIntervalSec}} seconds
            +
            {{ $ctrl.healthCheck.interval || $ctrl.healthCheck.checkIntervalSec }} seconds
            Healthy Threshold
            -
            {{$ctrl.healthCheck.healthyThreshold}}
            +
            {{ $ctrl.healthCheck.healthyThreshold }}
            Unhealthy Threshold
            -
            {{$ctrl.healthCheck.unhealthyThreshold}}
            +
            {{ $ctrl.healthCheck.unhealthyThreshold }}
            diff --git a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.modal.html b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.modal.html index 97df3284f3a..d14c461861c 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.modal.html +++ b/app/scripts/modules/google/src/loadBalancer/details/hostAndPathRules/hostAndPathRules.modal.html @@ -8,20 +8,18 @@

            Host And Path Rules for {{ ctrl.loadBalancerName }}

            - +
            - - - - - + + + + + diff --git a/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetails.html b/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetails.html index 153462f44ae..c76cabe683f 100644 --- a/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetails.html +++ b/app/scripts/modules/google/src/loadBalancer/details/loadBalancerDetails.html @@ -1,9 +1,7 @@
            -
            - +
            @@ -14,8 +12,7 @@
            - +
            @@ -24,7 +21,6 @@

            {{loadBalancer.name}} - page-location="details" on-update="ctrl.application.loadBalancers.refresh()" > -

            @@ -46,15 +41,23 @@

            @@ -82,11 +85,13 @@

            @@ -94,11 +99,14 @@

            DNS Name
            - {{loadBalancer.elb.dns.dnsname}} + {{loadBalancer.elb.dns.dnsname}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="loadBalancer.elb.dns.dnsname" + tool-tip="'Copy DNS Name to clipboard'" + >
            @@ -107,20 +115,23 @@

            - +
            @@ -130,44 +141,48 @@

            -
            Load Balancer → Instance - +
            + Load Balancer → Instance +
            - {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} - → + {{listener.listener.protocol}}:{{listener.listener.loadBalancerPort}} → {{listener.listener.instanceProtocol}}:{{listener.listener.instancePort}}
            - -
            + +
            -
            +
            - +
            - -
            - + +
            -
            +
            - - +
            @@ -175,9 +190,10 @@

          • Cloud Console Logs + class="copy-to-clipboard copy-to-clipboard-sm" + text="loadBalancer.logsLink" + tool-tip="'Copy to clipboard'" + >
            • diff --git a/app/scripts/modules/google/src/networkSelectField.directive.html b/app/scripts/modules/google/src/networkSelectField.directive.html index e2f615c8ca2..79cbef5a7bc 100644 --- a/app/scripts/modules/google/src/networkSelectField.directive.html +++ b/app/scripts/modules/google/src/networkSelectField.directive.html @@ -2,14 +2,10 @@
            Network
            (Select an account)
            - +

            {{component[field]}}

            diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html index 5123e7f6aa0..8d986ec9b1b 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html @@ -49,7 +49,6 @@ -
            diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/google/src/pipeline/stages/bake/bakeStage.html index 80208066714..dc3927e6503 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/bake/bakeStage.html @@ -1,17 +1,18 @@
            - + - + -
            +
            @@ -19,21 +20,18 @@ -
            +
            @@ -42,66 +40,78 @@
            - - + + - - + + - +

            HostPathBackend Service
            HostPathBackend Service
            - - - - - + + + + + - - - - - + + + + + - - - + + +
            KeyValueActions
            KeyValueActions
            - {{key}} - - - - Remove -
            + {{key}} + + + + Remove +
            - -
            + +
            - - + + - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html index 336753d8b55..ec60407c05b 100644 --- a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html @@ -9,7 +9,8 @@ component="stage" accounts="accounts" single-region="true" - cluster-field="targetCluster"> + cluster-field="targetCluster" + >
            @@ -21,18 +22,20 @@
            Capacity
            @@ -44,41 +47,53 @@
            Desired
            -
            -
            -
            +
            + +
            +
            + +
            +
            + +
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html index 13b423a946b..fc3707e6936 100644 --- a/app/scripts/modules/google/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html +++ b/app/scripts/modules/google/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/google/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStage.html index acd7bbbce5d..1eb6c5aa898 100644 --- a/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,11 +1,7 @@
            - + -
            diff --git a/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/google/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/google/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/google/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStage.html index ffe3a1d7b23..79b319453b2 100644 --- a/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,18 +1,11 @@
            - - + -
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/google/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/google/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/google/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/google/src/pipeline/stages/disableCluster/disableClusterStage.html index 6182792afd7..756cda8ce25 100644 --- a/app/scripts/modules/google/src/pipeline/stages/disableCluster/disableClusterStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/disableCluster/disableClusterStage.html @@ -1,26 +1,26 @@
            - +
            Keep the - - + {{disableClusterStageCtrl.pluralize('server group', stage.remainingEnabledServerGroups)}} enabled.
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStage.html index 74b610a68f3..9839f3ded2c 100644 --- a/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,18 +1,11 @@
            - - + -
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStepLabel.html index 9261272f7f8..5a77ae17c0f 100644 --- a/app/scripts/modules/google/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/google/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/google/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/google/src/pipeline/stages/findAmi/findAmiStage.html index 61947e145f3..4749c81039e 100644 --- a/app/scripts/modules/google/src/pipeline/stages/findAmi/findAmiStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/findAmi/findAmiStage.html @@ -1,9 +1,5 @@
            - - + @@ -17,8 +13,7 @@ diff --git a/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html b/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html index e962318c615..b1518ab8c37 100644 --- a/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html @@ -1,7 +1,6 @@
            - + diff --git a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStage.html index a916cbf143b..4e12df4bacb 100644 --- a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -1,15 +1,10 @@
            - -
            - +
            @@ -17,21 +12,25 @@ -
            - @@ -39,23 +38,27 @@
            - +
            - 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
            @@ -71,25 +74,24 @@
            - +
            - +
            - +
            - If the targeted server group has an Autoscaler configured, the min/max values will - be used to update the scaling policy. If not, the desired size will be used to update the server group's - target size. + If the targeted server group has an Autoscaler configured, the min/max values will be used to update the + scaling policy. If not, the desired size will be used to update the server group's target size.
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index 200fb6e41f7..0b337cdd876 100644 --- a/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/google/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index 6b9bebd0b06..9f1ab77827d 100644 --- a/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html @@ -1,30 +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/google/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index f2fd1469702..a9ae3923910 100644 --- a/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html @@ -1,19 +1,21 @@
            - +
            Shrink to - + {{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the - @@ -22,13 +24,11 @@
            - +
            diff --git a/app/scripts/modules/google/src/pipeline/stages/tagImage/tagImageStage.html b/app/scripts/modules/google/src/pipeline/stages/tagImage/tagImageStage.html index 220ec8782e1..866a9f0012b 100644 --- a/app/scripts/modules/google/src/pipeline/stages/tagImage/tagImageStage.html +++ b/app/scripts/modules/google/src/pipeline/stages/tagImage/tagImageStage.html @@ -1,11 +1,6 @@
            - + diff --git a/app/scripts/modules/google/src/regionSelectField.directive.html b/app/scripts/modules/google/src/regionSelectField.directive.html index 197a3bb8b2e..73525ac6d77 100644 --- a/app/scripts/modules/google/src/regionSelectField.directive.html +++ b/app/scripts/modules/google/src/regionSelectField.directive.html @@ -2,14 +2,16 @@
            Region
            (Select an account)
            - +

            {{component[field]}}

            diff --git a/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.html b/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.html index e6c87567730..01b00fd60a2 100644 --- a/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.html +++ b/app/scripts/modules/google/src/securityGroup/clone/cloneSecurityGroup.html @@ -14,10 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.html index d92aa0ac528..09382c06f29 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.html +++ b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroup.html @@ -14,10 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupIngress.html index 4f3027faba9..09abf9f874c 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupIngress.html +++ b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupIngress.html @@ -1,52 +1,81 @@ -
            -
            -
            -
            -

            - The following could not be found in the selected account/region/VPC and were removed: -

            -
              -
            • {{securityGroup}}
              • -
            -

            - Okay -

            -
            -
            -
            -
            -
            -

            - Connections via each protocol/port will be permitted if they match the rules defined by the target tags and source filters above. +

            +
            +
            +
            +

            + The following + could not be found in the selected account/region/VPC and + were removed: +

            +
              +
            • {{securityGroup}}
              • +
            +

            + Okay

            -
            -
            - - + +
            +
            +

            + Connections via each protocol/port will be permitted if they + match the rules defined by the target tags and source filters above. +

            +
            +
            +
            +
            +
            + - - + + - - - - + + + + - -
            Protocol Start Port End Port
            - + + + + + + + + +
            - -
            +
            +
            +
            diff --git a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupProperties.html index 47a551b5136..64e7e66f1a6 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupProperties.html +++ b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupProperties.html @@ -1,41 +1,70 @@ -
            -
            -
            -
            - Your will be named: - - - - -
            +
            +
            +
            +
            + Your will be named: + + + +
            -
            -
            Detail (optional)
            -
            - -
            +
            +
            +
            Detail (optional)
            +
            +
            -
            -
            Description
            -
            - -
            +
            +
            +
            Description
            +
            +
            -
            -
            Account
            -
            - -
            +
            +
            +
            Account
            +
            +
            -
            +
            +
            diff --git a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupSourceFilters.html b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupSourceFilters.html index 9388c4b1f80..4ff78e2043e 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupSourceFilters.html +++ b/app/scripts/modules/google/src/securityGroup/configure/createSecurityGroupSourceFilters.html @@ -1,22 +1,26 @@
            -
            - Source Tags -
            +
            Source Tags
            - - - - + + + +
            - - - - - -
            + + + + + +
            -
            - Source CIDRs -
            +
            Source CIDRs
            - - - - + + + +
            - - - - -
            + + + + +
            -
            - Target Tags -
            +
            Target Tags
            - - - - + + + +
            - - - - - -
            + + + + + +
            -
            diff --git a/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.html b/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.html index 728a3c107d0..82471a6a9df 100644 --- a/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.html +++ b/app/scripts/modules/google/src/securityGroup/configure/editSecurityGroup.html @@ -1,7 +1,9 @@ - + @@ -13,10 +15,12 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.html index 714d1b41cac..17d435f0218 100644 --- a/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.html +++ b/app/scripts/modules/google/src/securityGroup/details/securityGroupDetail.html @@ -1,8 +1,7 @@
            - +
            @@ -14,7 +13,6 @@

            {{securityGroup.name || '(not found)'}} - page-location="details" on-update="ctrl.application.securityGroups.refresh()" > -

            @@ -36,13 +33,19 @@

            @@ -50,10 +53,19 @@

            -

            @@ -73,26 +85,44 @@

            {{securityGroup.description}}
            - +
            None
            -
            +
            IP Range
            {{sourceRange}}
            - +
            None
            -
            +
            Protocol
            {{ipIngressRule.protocol}}
            -
            Port Range
            -
            Port Ranges
            +
            + Port Range +
            +
            + Port Ranges +
            {{ipIngressRule.protocol}}: {{portRange.startPort}} → {{portRange.endPort}}
            @@ -100,15 +130,17 @@

              -
            • {{tag}} -
              • +
            • + {{tag}} +
            None
              -
            • {{tag}} -
              • +
            • + {{tag}} +
            None
             @@ -117,9 +149,10 @@

          • Cloud Console Logs + class="copy-to-clipboard copy-to-clipboard-sm" + text="securityGroup.logsLink" + tool-tip="'Copy to clipboard'" + >
            • diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html index aa64fc2a782..7065ae87bcc 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html @@ -6,26 +6,29 @@
            {{$select.selected}} - +

            - +
            -
            User Data
            +
            + User Data +
            -
            @@ -41,24 +44,32 @@ Tags - - - - + + + + - - - + + +
            - -
            + + + + +
            - -
            + +
            @@ -77,13 +88,25 @@
            @@ -95,13 +118,13 @@
            @@ -113,13 +136,18 @@
            @@ -128,13 +156,23 @@
            Associate Public IP Address
            @@ -146,13 +184,13 @@
            @@ -163,9 +201,7 @@
            - +
            @@ -174,7 +210,13 @@
            - + {{$item}} diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html index dc9ad29575a..0d4c15196ef 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html @@ -3,9 +3,7 @@
            Task Completion
            - - +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html index adf4d7888c4..2f806327cd1 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicy.html @@ -5,14 +5,16 @@
            - + diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.html index e6cefa87acf..33215135aaf 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/autoHealingPolicy/autoHealingPolicySelector.component.html @@ -4,8 +4,10 @@
            - {{$select.selected.displayName}} - + {{ $select.selected.displayName }} + @@ -17,12 +19,14 @@
            - + required + /> seconds
            @@ -32,39 +36,50 @@ Max Unavailable
            - +
            - + %
            - +
            -
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/advancedCapacitySelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/advancedCapacitySelector.component.html index 24c38759efc..d178f1f5d85 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/advancedCapacitySelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/advancedCapacitySelector.component.html @@ -10,21 +10,33 @@
            Capacity
            -
            -
            -
            +
            + +
            +
            + +
            +
            + +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/capacity.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/capacity.html index efb0c23737d..137f195a150 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/capacity.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/capacity.html @@ -2,10 +2,14 @@
            - - + +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/simpleCapacitySelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/simpleCapacitySelector.component.html index df3276ea3d2..473ace8b1b0 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/simpleCapacitySelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/capacity/simpleCapacitySelector.component.html @@ -1,9 +1,14 @@
            Number of Instances
            -
            +
            + +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/customInstance/customInstanceBuilder.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/customInstance/customInstanceBuilder.html index 1f5ab75933c..5e2af1471e2 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/customInstance/customInstanceBuilder.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/customInstance/customInstanceBuilder.html @@ -1,8 +1,10 @@
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/instanceType/instanceType.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/instanceType/instanceType.html index f37e294022c..3b155cc633a 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/instanceType/instanceType.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/instanceType/instanceType.html @@ -1,10 +1,11 @@
            - +
            -
            Please select an image.
            -
            Please select a zone.
            +
            Please select an image.
            +
            Please select a zone.
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.html index a9648f4a271..47f053d9d76 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/elSevenOptions/backendServiceSelector.component.html @@ -3,13 +3,17 @@ Backend services
            - - {{$item}} - + + {{ $item }} + diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html index 8bed0d93414..f2e3c3eeae3 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html @@ -1,14 +1,20 @@
            -

            +

            + The following load balancers could not be found in the selected account/region and were removed:

            • {{loadBalancer}}

            - Okay + Okay

            @@ -16,17 +22,24 @@
            Load Balancers
            - + {{$item}} - + - + @@ -41,11 +54,14 @@ last refreshed {{ vm.getLoadBalancerRefreshTime() | timestamp }} refreshing...

            -

            If you're not finding a load balancer that was recently added, +

            + If you're not finding a load balancer that was recently added, click here to refresh the list.

            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.html index 75a69ab2858..f1507b00d4b 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/loadBalancingPolicy/loadBalancingPolicySelector.component.html @@ -8,10 +8,8 @@
            - - {{namedPort.name}} + + {{ namedPort.name }} @@ -22,20 +20,27 @@
            - +
            - +
            -
            +
            Must be between 1 and {{ $ctrl.maxPort }}.
            @@ -54,10 +59,13 @@
            - - {{$select.selected}} + + {{ $select.selected }} @@ -72,20 +80,24 @@
            - + %
            -
            +
            Must be between 0 and 100%.
            @@ -96,16 +108,17 @@
            - +
            -
            +
            Cannot be less than zero.
            @@ -116,16 +129,17 @@
            - +
            -
            +
            Cannot be less than zero.
            @@ -137,20 +151,24 @@
            - + %
            -
            +
            Must be between 0 and 100%.
            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.html index b99408c1ed0..432d498955b 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/location/basicSettings.html @@ -5,31 +5,54 @@ Account
            - +
            - - - + + +
            Stack
            -
            +
            + +
            @@ -41,11 +64,15 @@ Detail
            -
            +
            + +
            @@ -53,28 +80,36 @@
            - + - + + expected-artifacts="command.viewState.expectedArtifacts" + selected="gceImageArtifact.delegate.getSelectedExpectedArtifact()" + on-change="gceImageArtifact.controller.onArtifactChange" + on-request-create="gceImageArtifact.controller.onRequestCreate" + offered-artifact-types="gceImageArtifact.delegate.getOfferedArtifactTypes()" + requesting-new="gceImageArtifact.showCreateArtifactForm" + > -
            @@ -84,42 +119,47 @@
            - - {{$select.selected.imageName || 'Search for an image...'}} - + + {{$select.selected.imageName || 'Search for an image...'}} +
            - + {{$select.selected.imageName}} - + - Search All Images + Search All Images
            -
            - Traffic -
            +
            Traffic
            - +
            @@ -131,13 +171,16 @@
            (new cluster)

            -
            +

            There is already a server group in this cluster. Do you want to clone it?

            - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group.

            To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html index 2f2ba7f9a32..28156923b51 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html @@ -1,16 +1,22 @@

            -
            +
            + +
            - - {{$item.name}} - - + + {{$item.name}} + - + () @@ -21,14 +27,19 @@

            - +

            -
            Implicit
            +
            + Implicit +
            • {{securityGroup.name}}
              • @@ -47,7 +58,8 @@ last refreshed {{ vm.getSecurityGroupRefreshTime() | timestamp }} refreshing...

              -

              If you're not finding a that was recently added, +

              + If you're not finding a that was recently added, click here to refresh the list.

            diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html index f010e54d9d2..0bfd716d9cf 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html @@ -1,7 +1,8 @@
            -

            - The following could not be found in the selected account/network and were removed: +

            + The following could + not be found in the selected account/network and were removed:

            • {{securityGroup}}
              • diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.html index f87745d664f..9a316e544a2 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/securityGroups/tagSelector.component.html @@ -1,18 +1,23 @@
              - Target Tags - + Target Tags +
              - - {{$item}} + + {{ $item }} diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/serverGroupWizard.html index 0e111e0670b..3fbce02bd3e 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/serverGroupWizard.html @@ -33,9 +33,17 @@
              - - + +
              diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/templateSelection/templateSelection.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/templateSelection/templateSelection.html index a668720e725..315c4182a38 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/templateSelection/templateSelection.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/templateSelection/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/regionalSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/regionalSelector.directive.html index aeacc5647b3..0a9693228ed 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/regionalSelector.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/regionalSelector.directive.html @@ -1,10 +1,12 @@
              Regional
              -
              diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html index ef8cb230d7a..88f731d8fdd 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html @@ -2,10 +2,12 @@
              Zone
              (Select a region)
              -
              @@ -23,9 +25,7 @@
            - + {{ $item }} {{ zone }} diff --git a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.html b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.html index 687c167ad1c..c804a9312ed 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.html +++ b/app/scripts/modules/google/src/serverGroup/details/autoHealingPolicy/modal/upsertAutoHealingPolicy.modal.html @@ -6,20 +6,24 @@

            {{ctrl.action}} autohealing policy

            - +
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.html b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.html index cd092f90a76..04d656da473 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.html +++ b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.html @@ -27,12 +27,15 @@
            {{$ctrl.policy.mode}}
            Messages
            -
            {{message}}
            - +
            + {{message}} +
            + diff --git a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.html b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.html index 5e6679f4798..e0d669f6bfe 100644 --- a/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.html +++ b/app/scripts/modules/google/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.html @@ -6,21 +6,22 @@

            {{ctrl.action}} scaling policy

            -

            Basic Settings

            -
            - -
            -

            Metric Types

            - - +

            Basic Settings

            +
            + +
            +

            Metric Types

            + +
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.html b/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.html index 3b8d6555484..f630da6f825 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.html +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeAutoscalingPolicy.component.html @@ -1,7 +1,8 @@
            -

            Sets min and max instance counts for this server group's autoscaling policy. +

            + Sets min and max instance counts for this server group's autoscaling policy.

            @@ -12,29 +13,43 @@
            Current
            -
            +
            +
            -
            +
            +
            Resize to
            -
            -
            +
            + +
            +
            + +
            diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.html b/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.html index f271e76d1fe..4084b03a1cf 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.html +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeCapacity.component.html @@ -10,11 +10,13 @@ Current size
            - + instances
            @@ -23,12 +25,14 @@ Resize to
            - + instances
            diff --git a/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.html index 706107de0fb..f48d1df47d6 100644 --- a/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.html +++ b/app/scripts/modules/google/src/serverGroup/details/resize/resizeServerGroup.html @@ -7,32 +7,35 @@

            Resize {{serverGroup.name}}

            - - + +
            - +
            -
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.html index 3d4c75a97c9..86aa37f8428 100644 --- a/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/google/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -22,20 +22,24 @@

            Rollback {{serverGroup.name}}

            - +
            - +
            diff --git a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html index e6582686b61..1a2a8c7ac94 100644 --- a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.html @@ -1,22 +1,18 @@ -
            +
            -
            - - - -
            -
            - -
            +
            + + + +
            +
            + +
            -
            - +
            @@ -25,7 +21,6 @@

            {{ctrl.serverGroup.name}} - page-location="details" on-update="ctrl.application.serverGroups.refresh()" > -

            @@ -50,15 +44,24 @@

          • Resize
          • Disable
            • -
          • Enable
            • +
          • + Enable +
          • Destroy
          • Clone
            • - +

            @@ -67,7 +70,9 @@

            Insight

            @@ -75,7 +80,10 @@

            [SERVER GROUP IS DISABLED]

            - +
            Created
            @@ -101,15 +109,13 @@

            [SERVER GROUP IS DIS

            -
            +
            Min/Max
            {{ctrl.serverGroup.asg.desiredCapacity}}
            Current
            {{ctrl.serverGroup.instances.length}}
            -
            +
            Min
            {{ctrl.serverGroup.asg.minSize}}
            Desired
            @@ -128,8 +134,7 @@

            [SERVER GROUP IS DIS

            -
            +
            Instances
            @@ -146,8 +151,12 @@

            [SERVER GROUP IS DIS
            {{ctrl.serverGroup.launchConfig.instanceType | customInstanceFilter }}
            Minimum CPU Platform
            {{ctrl.serverGroup.launchConfig.minCpuPlatform || '(Automatic)'}}
            -
            Disk{{diskDescription.countSuffix}}
            -
            {{diskDescription.finalLabel}}
            +
            + Disk{{diskDescription.countSuffix}} +
            +
            + {{diskDescription.finalLabel}} +
            Service Account
            {{ctrl.serverGroup.serviceAccountEmail}}
            Auth Scopes
            @@ -164,41 +173,55 @@

            [SERVER GROUP IS DIS
            Can IP Forward
            {{ctrl.serverGroup.canIpForward}}
            Startup Script
            -
            Show Startup Script
            +
            + Show Startup Script +
            [none]

            - + - + - - + + -
            No custom metadata associated with this server group
            +
            + No custom metadata associated with this server group +
            {{metadata.key}} @@ -208,11 +231,15 @@

            [SERVER GROUP IS DIS

            -
            No tags associated with this server group
            +
            + No tags associated with this server group +
            {{tag}} - +
            @@ -229,7 +256,9 @@

            [SERVER GROUP IS DIS

            -
            No availability policies associated with this server group
            +
            + No availability policies associated with this server group +
            @@ -263,7 +292,9 @@

            [SERVER GROUP IS DIS
            Version
            {{ctrl.serverGroup.buildInfo.version}}
            Build Link
            -
            {{ctrl.buildJenkinsLink()}}
            +
            + {{ctrl.buildJenkinsLink()}} +

            @@ -274,8 +305,7 @@

            [SERVER GROUP IS DIS

            -
            +
            Balancing Mode
            {{ctrl.serverGroup.loadBalancingPolicy.balancingMode}}
            Max RPS per instance
            @@ -301,9 +331,10 @@

            [SERVER GROUP IS DIS
          • Cloud Console Logs + class="copy-to-clipboard copy-to-clipboard-sm" + text="ctrl.serverGroup.logsLink" + tool-tip="'Copy to clipboard'" + >
            • diff --git a/app/scripts/modules/google/src/subnet/subnetSelectField.directive.html b/app/scripts/modules/google/src/subnet/subnetSelectField.directive.html index ecc58d4c889..ebc96804df4 100644 --- a/app/scripts/modules/google/src/subnet/subnetSelectField.directive.html +++ b/app/scripts/modules/google/src/subnet/subnetSelectField.directive.html @@ -5,14 +5,16 @@

            {{subnetPlaceholder}}
            - +

            {{component[field]}}

            diff --git a/app/scripts/modules/kubernetes/src/container/arguments.component.html b/app/scripts/modules/kubernetes/src/container/arguments.component.html index 31f752c6dee..e449965e662 100644 --- a/app/scripts/modules/kubernetes/src/container/arguments.component.html +++ b/app/scripts/modules/kubernetes/src/container/arguments.component.html @@ -1,18 +1,20 @@ - - - - - - + + + + + + +
            - + +
            + +
            - diff --git a/app/scripts/modules/kubernetes/src/container/commands.component.html b/app/scripts/modules/kubernetes/src/container/commands.component.html index 8f9c5c15694..3335b4ea1b7 100644 --- a/app/scripts/modules/kubernetes/src/container/commands.component.html +++ b/app/scripts/modules/kubernetes/src/container/commands.component.html @@ -1,17 +1,20 @@ - - - - - - + + + + + + +
            - + +
            + +
            diff --git a/app/scripts/modules/kubernetes/src/container/configurer.directive.html b/app/scripts/modules/kubernetes/src/container/configurer.directive.html index a4fb86b007d..d6e6743882c 100644 --- a/app/scripts/modules/kubernetes/src/container/configurer.directive.html +++ b/app/scripts/modules/kubernetes/src/container/configurer.directive.html @@ -1,4 +1,9 @@ -
            +
            Image @@ -7,7 +12,10 @@
            {{container.imageDescription.imageId}} - + @@ -28,7 +36,7 @@
            - +
            @@ -39,8 +47,12 @@
            @@ -54,20 +66,23 @@
            - - - - - - + + + + + + +
            - + +
            + +
            @@ -79,20 +94,23 @@
            - - - - - - + + + + + + +
            - + +
            + +
            @@ -107,15 +125,13 @@
            Environment From
            - - +
            -
            -
            +
            Requests @@ -136,10 +152,22 @@
            - +
            - +
            @@ -149,24 +177,36 @@
            - +
            - +
            -
            +
            Name
            - +
            - +
            Host IP
            - +
            @@ -198,8 +244,14 @@
            - +
            Protocol @@ -207,14 +259,18 @@
            -             @@ -226,8 +282,12 @@
            @@ -243,7 +303,7 @@
            - +
            @@ -252,7 +312,7 @@
            - +
            @@ -260,31 +320,44 @@ Read Only
            - +
            -
            +
            -             - -
            - + +
            +             - - + - + PostStart - + PreStop diff --git a/app/scripts/modules/kubernetes/src/container/environmentFrom.component.html b/app/scripts/modules/kubernetes/src/container/environmentFrom.component.html index 45e353d66a2..cc29703c767 100644 --- a/app/scripts/modules/kubernetes/src/container/environmentFrom.component.html +++ b/app/scripts/modules/kubernetes/src/container/environmentFrom.component.html @@ -1,80 +1,82 @@ - - + - - - - + + + + +
            -
            -
            - Prefix -
            -
            - -
            -
            - -
            -
            -
            -
            - Source -
            -
            - -
            -
            -
            -
            +
            +
            - Map Name + Prefix
            - +
            -
            - Optional -
            -
            - +
            +
            -
            +
            - Secret Name + Source
            - +
            -
            - Optional +
            +
            +
            +
            + Map Name +
            +
            + +
            +
            + Optional +
            +
            + +
            -
            - +
            +
            + Secret Name +
            +
            + +
            +
            + Optional +
            +
            + +
            -
            -
            - -
            + +
            diff --git a/app/scripts/modules/kubernetes/src/container/environmentVariables.component.html b/app/scripts/modules/kubernetes/src/container/environmentVariables.component.html index 5c6928b82e9..00944e2d6b7 100644 --- a/app/scripts/modules/kubernetes/src/container/environmentVariables.component.html +++ b/app/scripts/modules/kubernetes/src/container/environmentVariables.component.html @@ -1,114 +1,118 @@ - - + - - - - + + + + +
            -
            -
            - Name -
            -
            - -
            -
            - -
            -
            -
            -
            - Source -
            -
            - -
            -
            -
            -
            +
            +
            - Value -
            -
            - -
            -
            -
            -
            - Map Name -
            -
            - -
            -
            - Key + Name
            - +
            -
            - Optional -
            -
            - +
            +
            -
            +
            - Secret Name + Source
            - -
            -
            - Key -
            -
            - -
            -
            - Optional -
            -
            - +
            -
            -
            - Field Path -
            -
            - +
            +
            +
            + Value +
            +
            + +
            +
            +
            +
            + Map Name +
            +
            + +
            +
            + Key +
            +
            + +
            +
            + Optional +
            +
            + +
            +
            +
            +
            + Secret Name +
            +
            + +
            +
            + Key +
            +
            + +
            +
            + Optional +
            +
            + +
            +
            +
            +
            + Field Path +
            +
            + +
            -
            -
            - -
            + +
            diff --git a/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html b/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html index be816ff0139..f4d1105fff0 100644 --- a/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html +++ b/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html @@ -5,7 +5,12 @@
            Enabled
            - +
            @@ -13,58 +18,80 @@
            Hook Type
            - +
            -
            Command
            +
            + Command +
            - +
            -
            Path
            +
            + Path +
            - +
            -
            Port
            +
            + Port +
            - +
            -
            Host
            +
            + Host +
            - +
            -
            URI Scheme
            +
            + URI Scheme +
            - +
            HTTP Headers
            -
            +
            Name
            - +
            Value
            - +
            diff --git a/app/scripts/modules/kubernetes/src/container/ports.component.html b/app/scripts/modules/kubernetes/src/container/ports.component.html index 727a5350782..28f6c0ad67f 100644 --- a/app/scripts/modules/kubernetes/src/container/ports.component.html +++ b/app/scripts/modules/kubernetes/src/container/ports.component.html @@ -1,5 +1,5 @@
            -
            +
            Name @@ -21,7 +21,14 @@
            - +
            Host IP @@ -37,7 +44,14 @@
            - +
            Protocol @@ -45,7 +59,12 @@
            @@ -53,4 +72,3 @@ - diff --git a/app/scripts/modules/kubernetes/src/container/probe.directive.html b/app/scripts/modules/kubernetes/src/container/probe.directive.html index d7c39106883..10993623c5b 100644 --- a/app/scripts/modules/kubernetes/src/container/probe.directive.html +++ b/app/scripts/modules/kubernetes/src/container/probe.directive.html @@ -1,6 +1,13 @@ - +
            - +
            @@ -11,34 +18,49 @@
            - +
            -
            +
            Initial Delay
            - +
            Success Threshold
            - +
            @@ -47,16 +69,26 @@
            - +
            Failure Threshold
            - +
            @@ -65,8 +97,13 @@
            - +
            @@ -75,20 +112,28 @@ Commands - - - - - - + + + + + +
            - + + + +
            + +
            @@ -100,8 +145,14 @@ Port
            - +
            @@ -111,14 +162,25 @@ Port
            - +
            Path
            - +
            @@ -127,37 +189,44 @@
            -
            -
            +
            +
            Name
            - +
            Value
            - +
            -
            -
            diff --git a/app/scripts/modules/kubernetes/src/container/resources.component.html b/app/scripts/modules/kubernetes/src/container/resources.component.html index da414d05fd1..4dd461ef65d 100644 --- a/app/scripts/modules/kubernetes/src/container/resources.component.html +++ b/app/scripts/modules/kubernetes/src/container/resources.component.html @@ -19,10 +19,22 @@
            - +
            - +
            @@ -32,9 +44,21 @@
            - +
            - +
            - \ No newline at end of file + diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html b/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html index d4dcd746288..e1e4b0e3f66 100644 --- a/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html +++ b/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html @@ -3,21 +3,24 @@
            - {{field.label}} + {{ field.label }}
            - - - - + + + +
            - - - - - -
            + + + + + +
            - +
            - diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html b/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html index 5a35bced389..26e74211172 100644 --- a/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html +++ b/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html @@ -6,9 +6,11 @@
            - +
            diff --git a/app/scripts/modules/kubernetes/src/container/volumes.component.html b/app/scripts/modules/kubernetes/src/container/volumes.component.html index deac104f8b2..4815d484534 100644 --- a/app/scripts/modules/kubernetes/src/container/volumes.component.html +++ b/app/scripts/modules/kubernetes/src/container/volumes.component.html @@ -8,8 +8,9 @@
            @@ -24,7 +25,7 @@ Config Map Name
            - +
            @@ -35,26 +36,35 @@
            - - - - - + + + + + - - - - - + + + + +
            KeyPath
            KeyPath
            - - - - - - - -
            + + + + + + + +
            @@ -80,7 +94,13 @@
            - +
            @@ -89,7 +109,7 @@
            - +
            @@ -97,7 +117,7 @@ Read Only
            - +
            @@ -106,17 +126,22 @@
            - +
            -
            +
            Mount Path
            - +
            @@ -125,7 +150,12 @@
            - +
            @@ -133,16 +163,16 @@ Read Only
            - +
            -
            +
            - diff --git a/app/scripts/modules/kubernetes/src/instance/details/details.html b/app/scripts/modules/kubernetes/src/instance/details/details.html index 3315331dd5c..993f024f3ee 100644 --- a/app/scripts/modules/kubernetes/src/instance/details/details.html +++ b/app/scripts/modules/kubernetes/src/instance/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -27,12 +25,25 @@

            - @@ -42,7 +53,9 @@

            Insight

            @@ -60,10 +73,13 @@

            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            API Version
            {{instance.apiVersion}}
            @@ -72,14 +88,17 @@

            YAML
            Show YAML
            Kube UI
            -
            {{instance.name}}
            +
            {{instance.name}}
            {{metric.source | robotToHuman}}
            - + {{metric.state | robotToHuman}} @@ -91,41 +110,45 @@

            DNS Policy
            {{instance.dnsPolicy}} +
            +
            Host IP
            {{instance.hostIp}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.hostIp" + tool-tip="'Copy to clipboard'" + >
            Pod IP
            {{instance.podIp}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.podIp" + tool-tip="'Copy to clipboard'" + >

            - - +
            - + - + @@ -141,7 +164,13 @@

            - +

            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html index 5c5246fd3e6..6921df75c40 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html @@ -1,4 +1,8 @@ - +
            @@ -6,7 +10,7 @@
            - +
            @@ -15,19 +19,26 @@
            - +
            Type
            - +
            @@ -37,47 +48,61 @@
            - +
            -
            +
            External IPs - - - - + + + + - - - + + +
            + +
            - -
            + +
            - +
            - +
            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html index ea3d25c9d03..e195a67e263 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html @@ -4,49 +4,73 @@
            -
            +
            Your load balancer will be named: {{ctrl.getName()}} - - - + + +
            Account
            - +
            - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html index 015e13e393c..a87d6e5a0a5 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html @@ -10,9 +10,11 @@
            - - + +
            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html index 9e0fc41e3f3..2ca2292ae47 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html @@ -10,9 +10,11 @@
            - - + +
            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html index 1deb08e90c4..1e29a91b255 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html @@ -1,18 +1,23 @@ -
            +
            -
            +
            Name
            - +
            - Remove Port + Remove Port
            @@ -21,16 +26,28 @@
            - +
            Target Port
            - +
            @@ -39,26 +56,34 @@
            - +
            Protocol
            - +
            -
            diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.html b/app/scripts/modules/kubernetes/src/loadBalancer/details/details.html index 78fa675ee72..2cf82fe317b 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.html +++ b/app/scripts/modules/kubernetes/src/loadBalancer/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -32,8 +30,14 @@

            @@ -55,7 +59,7 @@

            YAML
            Show YAML
            Kube UI
            -
            {{loadBalancer.name}}
            +
            {{loadBalancer.name}}
            Server Groups
            @@ -68,23 +72,24 @@

            Service Type
            - {{loadBalancer.service.spec.type}} + {{loadBalancer.service.spec.type}}
            Session Affinity
            - {{loadBalancer.service.spec.sessionAffinity}} + {{loadBalancer.service.spec.sessionAffinity}}
            Internal DNS Name
            - {{ctrl.internalDNSName}} + {{ctrl.internalDNSName}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="ctrl.internalDNSName" + tool-tip="'Copy Internal DNS Name to clipboard'" + >
            @@ -95,9 +100,10 @@

            {{loadBalancer.service.spec.clusterIP}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="loadBalancer.service.spec.clusterIP" + tool-tip="'Copy Cluster IP to clipboard'" + >

            @@ -111,7 +117,8 @@

            ng-if="ingress.hostname" class="copy-to-clipboard copy-to-clipboard-sm" text="ingress.hostname" - tool-tip="'Copy Ingress hostname to clipboard'"> + tool-tip="'Copy Ingress hostname to clipboard'" + > {{ingress.ip}} @@ -120,7 +127,8 @@

            ng-if="ingress.ip" class="copy-to-clipboard copy-to-clipboard-sm" text="ingress.ip" - tool-tip="'Copy Ingress IP to clipboard'"> + tool-tip="'Copy Ingress IP to clipboard'" + > @@ -131,9 +139,10 @@

            {{loadBalancer.service.spec.loadBalancerIP}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="loadBalancer.service.spec.loadBalancerIP" + tool-tip="'Copy Load Balancer IP to clipboard'" + > @@ -167,14 +176,12 @@

            - - +
            - - +

            diff --git a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html b/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html index 63ad7cf9c40..d0a4ef6a84e 100644 --- a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html +++ b/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html @@ -1,11 +1,13 @@

            (Select an Account)

            - + include-select-all-button="true" + >             diff --git a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html b/app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html index 9c71524fb32..64d635f418b 100644 --- a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html +++ b/app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html @@ -1,11 +1,13 @@

            (Select an Account)

            - + include-select-all-button="true" + >             diff --git a/app/scripts/modules/kubernetes/src/namespace/selectField.directive.html b/app/scripts/modules/kubernetes/src/namespace/selectField.directive.html index c79001e92c2..386728aec0a 100644 --- a/app/scripts/modules/kubernetes/src/namespace/selectField.directive.html +++ b/app/scripts/modules/kubernetes/src/namespace/selectField.directive.html @@ -1,18 +1,19 @@
            -
            Namespace -
            +
            Namespace
            (Select an account)
            - +

            {{component[field]}}

            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html index 79a8553efaa..a385f8e117d 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,14 +1,9 @@
            - + -
            - diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index d4da9f0a0c4..c2fec6657e7 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html @@ -1,5 +1,3 @@ - Destroy Server Group: - {{step.context.serverGroupName}} - ({{step.context.namespace}}) + Destroy Server Group: {{step.context.serverGroupName}} ({{step.context.namespace}}) diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html index f6e8315818b..05c9dcebfaa 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,12 +1,7 @@
            - - + -
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index 613c9241a5f..554ef6c4ce0 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html @@ -1,5 +1,3 @@ - Disable Server Group: - {{step.context.serverGroupName}} - ({{step.context.namespace}}) + Disable Server Group: {{step.context.serverGroupName}} ({{step.context.namespace}}) diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html index 19ce0c0c2e5..cfd9c18a57e 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html @@ -29,7 +29,6 @@
            -
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html index 39addd962db..9a20a868352 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html @@ -1,20 +1,20 @@
            - - + -
            Keep the - - + diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html index 007cbee0fc4..1a8642447aa 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,12 +1,7 @@
            - - + -
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html index 4349d9fd0c5..0a066e5b511 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html @@ -1,5 +1,3 @@ - Enable Server Group: - {{step.context.serverGroupName}} - ({{step.context.namespace}}) + Enable Server Group: {{step.context.serverGroupName}} ({{step.context.namespace}}) diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html index 3c57dc873d4..642b1b0ba71 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html @@ -1,10 +1,10 @@
            - + accounts="accounts" + > @@ -18,13 +18,11 @@ - +
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html index d4e9aebb212..99eba2e8424 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html @@ -4,10 +4,7 @@
            - +
            @@ -15,21 +12,25 @@             -
            - @@ -38,24 +39,31 @@
            - % + %
            - This is the percentage by which the target server group's capacity will be scaled + This is the percentage by which the target server group's capacity will be scaled
            - +
            - This is the exact amount by which the target server group's capacity will be scaled + This is the exact amount by which the target server group's capacity will be scaled
            @@ -63,7 +71,7 @@
            - +
            @@ -71,8 +79,6 @@ This is the exact amount to which the target server group will be scaled
            - +
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html index f246f058623..c5e7bd798fc 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.namespace}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.namespace}}) diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html index 92050046a7e..c5a0b712940 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html @@ -1,34 +1,39 @@
            - + - + - + - + {{ $item.imageDescription | kubernetesImageId }} + refresh="ctrl.searchImages($select.search)" + > @@ -37,38 +42,35 @@ - - +
            Pod Annotations
            - - +
            Pod Labels
            - - - + +
            Node Selector
            - - - - - + + +
            @@ -76,7 +78,7 @@
            - +
            @@ -86,8 +88,12 @@
            @@ -96,15 +102,13 @@ Commands
            - - +
            Args
            - - +
            Environment Variables @@ -115,51 +119,63 @@
            Environment From
            - - + - + - - + - + -
            - +
            +             - - + - - + - - PostStart + + PostStart - - PreStop + + PreStop
            -
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html index c0abd7456e5..82203a94feb 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html @@ -1,40 +1,41 @@
            - - - - - - + + + + + + - - - - - - + + + + + + - - - + + +
            AccountNamespaceImageActions
            AccountNamespaceImageActions
            - - - {{ ctrl.stage.namespace }} - -
            - {{ container.imageDescription | kubernetesImageId }} -
            -             		- - -
            + + + {{ ctrl.stage.namespace }} + +
            + {{ container.imageDescription | kubernetesImageId }} +
            +             		+ + +
            - -
            + +
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html index 66fc2e7b89b..88fa916f84f 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html @@ -1,52 +1,53 @@
            - -
            -
            -
            -
            -
            Account
            -
            - -
            -
            Namespace
            -
            {{stage.context.namespaces.join(', ')}}
            -
            Cluster
            -
            {{stage.context.cluster}}
            -
            Keep Full Size
            -
            {{stage.context.remainingFullSizeServerGroups}}
            -
            Scale Active?
            -
            {{stage.context.allowScaleDownActive}}
            -
            -
            -
            + +
            +
            +
            +
            +
            Account
            +
            + +
            +
            Namespace
            +
            {{stage.context.namespaces.join(', ')}}
            +
            Cluster
            +
            {{stage.context.cluster}}
            +
            Keep Full Size
            +
            {{stage.context.remainingFullSizeServerGroups}}
            +
            Scale Active?
            +
            {{stage.context.allowScaleDownActive}}
            +
            +
            +
            -
            -
            -
            -
            Scaled down
            -
            {{namespace}}
            -
            {{servergroups.join(', ')}}
            -
            -
            -
            +
            +
            +
            +
            Scaled down
            +
            +
            {{namespace}}
            +
            {{servergroups.join(', ')}}
            +
            +
            +
            - + -
            -
            -
            - - - View Execution Logs - -
            -
            +
            +
            +
            + + + View Execution Logs +
            +
            +
            -
            -
            - -
            +
            +
            +
            +
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index eb2ac9c6d98..93f4009e08d 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html @@ -1,30 +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/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html index 1141be1c8bd..648893ab792 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html @@ -1,52 +1,53 @@
            - -
            -
            -
            -
            -
            Account
            -
            - -
            -
            Namespace
            -
            {{stage.context.namespaces.join(', ')}}
            -
            Cluster
            -
            {{stage.context.cluster}}
            -
            Shrink to Size
            -
            {{stage.context.shrinkToSize}}
            -
            Delete Active?
            -
            {{stage.context.allowDeleteActive}}
            -
            -
            -
            + +
            +
            +
            +
            +
            Account
            +
            + +
            +
            Namespace
            +
            {{stage.context.namespaces.join(', ')}}
            +
            Cluster
            +
            {{stage.context.cluster}}
            +
            Shrink to Size
            +
            {{stage.context.shrinkToSize}}
            +
            Delete Active?
            +
            {{stage.context.allowDeleteActive}}
            +
            +
            +
            -
            -
            -
            -
            Destroyed
            -
            {{namespace}}
            -
            {{servergroups.join(', ')}}
            -
            -
            -
            +
            +
            +
            +
            Destroyed
            +
            +
            {{namespace}}
            +
            {{servergroups.join(', ')}}
            +
            +
            +
            - + -
            -
            -
            - - - View Execution Logs - -
            -
            +
            +
            +
            + + + View Execution Logs +
            +
            +
            -
            -
            - -
            +
            +
            +
            +
            diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index cbf930d4212..47704876e32 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html @@ -1,19 +1,21 @@
            - +
            Shrink to - + {{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the - @@ -22,7 +24,7 @@
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html index b9b2c13b1d2..703eafda022 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html @@ -1,8 +1,18 @@
            - +
            - +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html index e4004825f35..984f930c463 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html @@ -1,13 +1,19 @@ -
            +
            Load Balancer
            - + {{securityGroup.ingress.serviceName}} @@ -21,8 +27,14 @@
            - +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html index 5b33e50d29c..5117d91bf07 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html @@ -4,49 +4,73 @@
            -
            +
            Your will be named: {{ctrl.getName()}} - - - + + +
            Account
            - +
            - +
            Stack
            - +
            Detail
            - +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html index b898fcada15..c1a8bb8c575 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html @@ -16,9 +16,11 @@
            - - + +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html index 553fa2452d9..0c5172316d9 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html @@ -16,9 +16,11 @@
            - - + +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html index 01d2a14cc4d..76ac62a17ea 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html @@ -1,35 +1,37 @@ -
            +
            -
            +
            Host
            - +
            -
            -
            -
            -
            +
            +
            +
            +
            Load Balancer
            - + {{path.ingress.serviceName}} @@ -38,8 +40,8 @@
            @@ -49,7 +51,7 @@
            - +
            @@ -58,22 +60,27 @@
            - +
            -
            -
            -
            -
            -
            +
            +
            +
            -
            -
            +
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html index e86471d90d3..fac061654f0 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html @@ -1,19 +1,23 @@ -
            +
            -
            +
            Host
            - +
            @@ -23,12 +27,12 @@
            - +
            -
            diff --git a/app/scripts/modules/kubernetes/src/securityGroup/details/details.html b/app/scripts/modules/kubernetes/src/securityGroup/details/details.html index 63f0c5fd3f5..12031feeaff 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/details/details.html +++ b/app/scripts/modules/kubernetes/src/securityGroup/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -21,8 +20,12 @@

            Actions

            @@ -54,13 +57,17 @@

            -
            +
            Host
            {{rule.host}}
            -
            +
            Path
            {{path.path}}
            Service Name
            @@ -74,9 +81,11 @@

            -
            +
            Host
            {{tls.hosts[0]}}
            @@ -85,22 +94,22 @@

            -
            +
            IP
            {{ingress.ip}}
            - - +
            - - +

            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html index 01bdac2e544..abb06864ca4 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html @@ -1,16 +1,16 @@
            - - -
            +
            DNS Policy
            -
            @@ -20,7 +20,7 @@ Service Account Name
            - +
            @@ -31,41 +31,52 @@
            - + seconds
            - +
            - +
            - +
            - +
            -
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html index f9070afcb91..6accd0d130a 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html @@ -1,23 +1,41 @@ - +
            Account
            - +
            - +
            Stack
            -
            +
            + +
            @@ -29,10 +47,15 @@ Detail
            -
            +
            + +
            @@ -42,21 +65,25 @@
            -

            +

            + The following containers are not registered in the above namespace/account and were removed:

            • {{removed}}

            - Okay + Okay

            -
            Containers - +
            + Containers +
            @@ -66,7 +93,8 @@ group-by="command.groupByRegistry" refresh-delay="0" ui-disable-choice="container.message" - refresh="basicSettingsController.searchImages($select.search)"> + refresh="basicSettingsController.searchImages($select.search)" + > @@ -74,8 +102,9 @@
            -
            Init Containers - +
            + Init Containers +
            @@ -85,18 +114,25 @@ group-by="command.groupByRegistry" refresh-delay="0" ui-disable-choice="container.message" - refresh="basicSettingsController.searchImages($select.search)"> + refresh="basicSettingsController.searchImages($select.search)" + >
            - +
            -
            +
            -
            +

            Your server group will be in the cluster:

            @@ -105,13 +141,15 @@

            (new cluster)

            -
            +

            There is already a server group in this cluster. Do you want to clone it?

            - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group.

            To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html index 19617739f8c..3e914ba81b2 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html @@ -1,4 +1,9 @@ - +

            @@ -6,11 +11,16 @@
            - +
            -
            +
            Strategy @@ -18,8 +28,12 @@
            @@ -29,14 +43,25 @@
            - +
            History Limit
            - +
            @@ -45,19 +70,31 @@
            - +
            Max Unavailable
            - +
            -
            +
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html index e5cd3bdf18f..7dfc0f67da0 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html @@ -1,14 +1,25 @@ - +
            -

            +

            + The following load balancers could not be found in the selected account/namespace and were removed:

            • {{loadBalancer}}

            - Okay + Okay

            @@ -16,10 +27,12 @@
            Load Balancers
            - + {{$item}} @@ -33,10 +46,13 @@

            Load balancers - last refreshed {{ loadBalancersController.getLoadBalancerRefreshTime() | timestamp }} + last refreshed {{ loadBalancersController.getLoadBalancerRefreshTime() | timestamp }} refreshing...

            -

            If you're not finding a load balancer that was recently added, +

            + If you're not finding a load balancer that was recently added, click here to refresh the list.

            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html index 4414dd00566..6f334b759e6 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html @@ -6,7 +6,7 @@
            - +
            @@ -15,7 +15,7 @@
            - +
            @@ -28,7 +28,7 @@ Capacity
            - +
            @@ -46,21 +46,31 @@ Capacity
            - +
            - +
            - +
            -
            +
            CPU Target @@ -69,8 +79,13 @@
            - + %
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html index c32ccd75b0e..8b674eb65ee 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html index c90455e5957..de79b8b56d4 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html @@ -1,4 +1,7 @@ -
            +
            @@ -7,15 +10,16 @@
            - +
            @@ -23,7 +27,7 @@ Name
            - +
            @@ -31,7 +35,7 @@ Config Map Name
            - +
            @@ -49,19 +53,28 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +
            @@ -87,7 +104,13 @@
            - +
            @@ -96,7 +119,7 @@
            - +
            @@ -104,7 +127,7 @@ Read Only
            - +
            @@ -113,7 +136,7 @@
            - +
            @@ -122,7 +145,12 @@
            - +
            @@ -131,7 +159,7 @@
            - +
            @@ -140,7 +168,12 @@
            - +
            @@ -149,7 +182,7 @@
            - +
            @@ -158,7 +191,13 @@
            - +
            @@ -166,15 +205,15 @@ Read Only
            - +
            -
            +
            -
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html index b465482ec07..a9794266bac 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html @@ -6,10 +6,12 @@
            - + @@ -30,20 +32,36 @@
            - +
            - +
            - - + +
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/details.html b/app/scripts/modules/kubernetes/src/serverGroup/details/details.html index a863884a862..f182eb80684 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/details.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/details.html @@ -1,23 +1,18 @@ -
            - +
            -
            - - - -
            -
            - -
            +
            + + + +
            +
            + +
            -
            - +
            @@ -38,7 +33,14 @@

          • Resize
          • Disable
            • -
          • Enable
            • +
          • + Enable +
          • Destroy
          • Clone
            • @@ -48,7 +50,9 @@

            Insight

            @@ -56,14 +60,19 @@

            [SERVER GROUP IS DISABLED]

            - +
            Created
            {{serverGroup.createdTime | timestamp }}
            In
            -
            -
            Namespace
            +
            +
            +
            Namespace
            +
            {{serverGroup.region}}
            Kind
            {{serverGroup.kind}}
            @@ -72,7 +81,7 @@

            [SERVER GROUP IS DISABLED
            Revision
            {{serverGroup.revision}}
            Kube UI
            -
            {{serverGroup.name}}
            +
            {{serverGroup.name}}

             @@ -97,7 +106,7 @@

            [SERVER GROUP IS DISABLED
            Revision
            {{serverGroup.deploymentStatus.revision}}

            -
            +
            Available
            {{serverGroup.deploymentStatus.availableReplicas}}
            @@ -138,24 +147,30 @@

            [SERVER GROUP IS DISABLED
            Target CPU
            {{serverGroup.deployDescription.scalingPolicy.cpuUtilization.target}}%
            Current CPU
            -
            {{serverGroup.autoscalerStatus.currentCpuUtilization !== null ? serverGroup.autoscalerStatus.currentCpuUtilization : '- '}}%
            +
            + {{serverGroup.autoscalerStatus.currentCpuUtilization !== null ? + serverGroup.autoscalerStatus.currentCpuUtilization : '- '}}% +
            Latest Rescale
            -
            {{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}}
            +
            + {{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}} +

            - - + - +
            - - +
            @@ -172,12 +187,13 @@

            [SERVER GROUP IS DISABLED
            - - +
            - +
            Value
            {{toleration.value}}
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html b/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html index a3faea7bea3..2a3b7e48c89 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html @@ -17,20 +17,28 @@

            Resize {{serverGroup.name}}

            - - pods + + pods
            - - pods + + pods
            @@ -40,22 +48,26 @@

            Resize {{serverGroup.name}}

            - + pods
            - + pods
            @@ -66,11 +78,13 @@

            Resize {{serverGroup.name}}

            - + %
            @@ -78,9 +92,7 @@

            Resize {{serverGroup.name}}

            - +
            @@ -94,10 +106,12 @@

            Resize {{serverGroup.name}}

            - + pods
            @@ -108,11 +122,13 @@

            Resize {{serverGroup.name}}

            - + pods
            @@ -120,23 +136,23 @@

            Resize {{serverGroup.name}}

            - +
            -
            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html b/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html index 4e91ac620a6..afbecada4a4 100644 --- a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html +++ b/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html @@ -24,12 +24,10 @@

            Rollback {{serverGroup.name}}

            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/instance/details/details.html b/app/scripts/modules/kubernetes/src/v2/instance/details/details.html index 1542d2e36a0..71761b1fd94 100644 --- a/app/scripts/modules/kubernetes/src/v2/instance/details/details.html +++ b/app/scripts/modules/kubernetes/src/v2/instance/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,14 +12,12 @@

            - +
            - +

            {{ctrl.instance.displayName}}

            @@ -56,7 +53,9 @@

            QOS Class
            Logs
            -
            +
            + +
            @@ -65,14 +64,20 @@

            - + - + @@ -80,4 +85,3 @@

            - diff --git a/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.html b/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.html index fa82f4f9b12..d7636794de7 100644 --- a/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.html +++ b/app/scripts/modules/kubernetes/src/v2/loadBalancer/details/details.html @@ -1,8 +1,7 @@ -
            +
            - +
            @@ -11,58 +10,60 @@

            -
            -
            - - - -
            -
            - -

            - {{ctrl.loadBalancer.displayName}} +
            +
            + + + +
            +
            + +

            + {{ctrl.loadBalancer.displayName}} + + + +

            +
            +
            +
            + +

            -
            -
            -
            - - -
            +
            +
            -
            +
            Created
            @@ -74,22 +75,26 @@

            Kind
            {{ctrl.loadBalancer.kind}}
            Service Type
            -
            {{ctrl.loadBalancer.manifest.spec.type}}
            +
            {{ctrl.loadBalancer.manifest.spec.type}}
            Sess. Affinity
            {{ctrl.loadBalancer.manifest.spec.sessionAffinity}}
            -
            No workloads associated with this {{ctrl.loadBalancer.kind | robotToHuman}}.
            +
            + No workloads associated with this {{ctrl.loadBalancer.kind | robotToHuman}}. +
            Workloads
            @@ -121,9 +127,10 @@

            {{ctrl.loadBalancer.manifest.spec.loadBalancerIP}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="ctrl.loadBalancer.manifest.spec.loadBalancerIP" + tool-tip="'Copy Load Balancer IP to clipboard'" + >

            @@ -138,7 +145,8 @@

            ng-if="ingress.hostname" class="copy-to-clipboard copy-to-clipboard-sm" text="ingress.hostname" - tool-tip="'Copy Ingress hostname to clipboard'"> + tool-tip="'Copy Ingress hostname to clipboard'" + > {{ingress.ip}} @@ -147,13 +155,17 @@

            ng-if="ingress.ip" class="copy-to-clipboard copy-to-clipboard-sm" text="ingress.ip" - tool-tip="'Copy Ingress IP to clipboard'"> + tool-tip="'Copy Ingress IP to clipboard'" + > - + @@ -162,6 +174,5 @@

            -

            diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.html b/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.html index cbc36d4fdf5..bc2ff8ef090 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.html +++ b/app/scripts/modules/kubernetes/src/v2/manifest/delete/delete.html @@ -8,11 +8,13 @@

            Delete {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.command.locati
            Manifest is controlled by - + provider: 'kubernetes'})" + > {{ctrl.manifestController | robotToHuman }} and may be recreated after deletion. @@ -24,12 +26,15 @@

            Delete {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.command.locati

            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.html b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.html index 3f1542df020..c11fc759d09 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.html +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.html @@ -10,12 +10,15 @@

            Pause rollout of {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.comm

            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.html b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.html index c0e6355bbec..87d3d066ccc 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.html +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.html @@ -10,12 +10,15 @@

            Resume rollout of {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.com

            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.html b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.html index f76a622443a..d46d894f61d 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.html +++ b/app/scripts/modules/kubernetes/src/v2/manifest/rollout/undo.html @@ -13,8 +13,12 @@

            Undo rollout of {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.comma
            @@ -23,12 +27,15 @@

            Undo rollout of {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.comma
            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.html b/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.html index 89a2fb5a6bf..ca996e3d248 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.html +++ b/app/scripts/modules/kubernetes/src/v2/manifest/scale/scale.html @@ -11,12 +11,15 @@

            Scale {{ctrl.command.manifestName | robotToHuman}} in {{ctrl.command.locatio
            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.html index 07d5fe28183..1f1bdab4fb2 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deleteManifest/deleteManifestConfig.html @@ -4,5 +4,7 @@

            Manifest

            Settings

            - + diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.html index ed4b23d18a0..6f039bd3371 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifestConfig.html @@ -1,44 +1,43 @@

            Basic Settings

            - +

            Manifest Configuration


            + + +
            - + - + + expected-artifacts="ctrl.$scope.expectedArtifacts" + selected="ctrl.manifestArtifactDelegate.getSelectedExpectedArtifact()" + on-change="ctrl.manifestArtifactController.onArtifactChange" + on-request-create="ctrl.manifestArtifactController.onRequestCreate" + excluded-artifact-types="ctrl.manifestArtifactDelegate.getExcludedArtifactTypes()" + requesting-new="ctrl.$scope.showCreateArtifactForm" + > @@ -46,23 +45,26 @@

            Manifest Configuration

            accounts="ctrl.manifestArtifactController.accountsForArtifact" selected="ctrl.manifestArtifactDelegate.getSelectedAccount()" on-change="ctrl.manifestArtifactController.onAccountChange" - > + >             - -
            - +
            +
            diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.html index 383b508c837..f9db76a02ac 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceConfig.html @@ -1,5 +1,10 @@

            Manifest

            - +
            diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html index 34f59ee24f5..155eab19bf7 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html @@ -2,21 +2,24 @@

            Resource to Patch

            - +

            Patch Content

            -
            +
            @@ -25,22 +28,29 @@

            Patch Content

            + value="ctrl.rawPatchBody" + > + value="ctrl.rawPatchBody" + > - + + expected-artifacts="ctrl.$scope.expectedArtifacts" + selected="ctrl.manifestArtifactDelegate.getSelectedExpectedArtifact()" + on-change="ctrl.manifestArtifactController.onArtifactChange" + on-request-create="ctrl.manifestArtifactController.onRequestCreate" + excluded-artifact-types="ctrl.manifestArtifactDelegate.getExcludedArtifactTypes()" + requesting-new="ctrl.$scope.showCreateArtifactForm" + > @@ -48,30 +58,34 @@

            Patch Content

            accounts="ctrl.manifestArtifactController.accountsForArtifact" selected="ctrl.manifestArtifactDelegate.getSelectedAccount()" on-change="ctrl.manifestArtifactController.onAccountChange" - > + >             - -
            - +
            +

            Patch Options

            + on-change="ctrl.handleMergeStrategyChange" + >
            diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.html index b112d9a167a..cd6287bf48d 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.html @@ -1,7 +1,12 @@

            Manifest

            - +

            Settings

            diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.html index 5d93bf36ad5..8d033167b2a 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.html +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/undoRolloutManifest/undoRolloutManifestConfig.html @@ -1,7 +1,10 @@

            Manifest

            - +

            Settings

            @@ -11,10 +14,12 @@

            Settings

            - + revisions
            diff --git a/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.html b/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.html index 4e782968acb..c27034ccc81 100644 --- a/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.html +++ b/app/scripts/modules/kubernetes/src/v2/securityGroup/details/details.html @@ -1,8 +1,7 @@ -
            +
            - +
            @@ -11,59 +10,62 @@

            -
            -
            - - - -
            -
            - -

            - {{ctrl.securityGroup.displayName}} - - - - +
            +
            + + + +
            +
            + +

            + {{ctrl.securityGroup.displayName}} - -

            -
            -
            -
            - -

            +
            +
            +
            + + -
            +
            +
            -
            +
            Created
            @@ -77,11 +79,13 @@

            - + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.html b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.html index 2047f422e06..b791ec54208 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.html +++ b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/details.html @@ -1,9 +1,7 @@ -
            +
            - +
            @@ -14,17 +12,19 @@

            - +
            - +

            {{ctrl.serverGroup.displayName}} - page-location="details" on-update="ctrl.app.serverGroups.refresh()" > -

            @@ -70,11 +69,13 @@

            - +

            @@ -83,7 +84,10 @@

            Disabled
            - +
            Created
            @@ -96,18 +100,23 @@

            {{ctrl.serverGroup.kind}}
            Controller
            - + provider: 'kubernetes'})" + > {{ctrl.manifestController() | robotToHuman }}

            - + @@ -120,20 +129,20 @@

            -
            +
            Current
            {{ctrl.serverGroup.instances.length}}
            -
            +
            Min/Max
            {{ctrl.serverGroup.capacity.min}}
            Current
            {{ctrl.serverGroup.instances.length}}
            -
            +
            Min
            {{ctrl.serverGroup.capacity.min}}
            Max
            @@ -143,8 +152,7 @@

            -
            +
            Instances
            diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.html b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.html index bcb990a5c02..df97998f7d4 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.html +++ b/app/scripts/modules/kubernetes/src/v2/serverGroup/details/resize/resize.html @@ -13,10 +13,12 @@

            Resize {{ctrl.serverGroup.kind}} {{ctrl.serverGroup.displayName}}

            - + pods
            @@ -27,11 +29,13 @@

            Resize {{ctrl.serverGroup.kind}} {{ctrl.serverGroup.displayName}}

            - + pods
            @@ -41,12 +45,15 @@

            Resize {{ctrl.serverGroup.kind}} {{ctrl.serverGroup.displayName}}

            - + + -
            diff --git a/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.html b/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.html index 01d472b00a2..2a689f6af96 100644 --- a/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.html +++ b/app/scripts/modules/kubernetes/src/v2/serverGroupManager/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,13 +12,16 @@

            - +
            - +

            {{ctrl.serverGroupManager.displayName}} @@ -73,11 +75,13 @@

            - +

            @@ -98,10 +102,12 @@

            Managing
            @@ -115,7 +121,10 @@

            - + diff --git a/app/scripts/modules/openstack/src/common/cacheBackedMultiSelect.template.html b/app/scripts/modules/openstack/src/common/cacheBackedMultiSelect.template.html index 7f41e4349df..9c211fe9756 100644 --- a/app/scripts/modules/openstack/src/common/cacheBackedMultiSelect.template.html +++ b/app/scripts/modules/openstack/src/common/cacheBackedMultiSelect.template.html @@ -1,8 +1,14 @@
            {{label}}
            - + {{$item.name}} diff --git a/app/scripts/modules/openstack/src/common/cacheBackedSelectField.template.html b/app/scripts/modules/openstack/src/common/cacheBackedSelectField.template.html index 07bb47fdc1e..f2270e83376 100644 --- a/app/scripts/modules/openstack/src/common/cacheBackedSelectField.template.html +++ b/app/scripts/modules/openstack/src/common/cacheBackedSelectField.template.html @@ -1,7 +1,15 @@ - + diff --git a/app/scripts/modules/openstack/src/common/cacheRefresh.tooltip.html b/app/scripts/modules/openstack/src/common/cacheRefresh.tooltip.html index c72996f8cde..53bce86da26 100644 --- a/app/scripts/modules/openstack/src/common/cacheRefresh.tooltip.html +++ b/app/scripts/modules/openstack/src/common/cacheRefresh.tooltip.html @@ -1,4 +1,4 @@

            {{refreshToolTipLabel}} list is refreshing.

            Click to refresh {{refreshToolTipLabel}} list.

            -

            Last Updated:
            {{cache.lastRefresh | timestamp }}
            ({{cache.lastRefresh | relativeTime }})

            -

            Note: Due to caching, data may be delayed up to 2 minutes

            +

            Last Updated:
            {{cache.lastRefresh | timestamp }}
            ({{cache.lastRefresh | relativeTime }})

            +

            Note: Due to caching, data may be delayed up to 2 minutes

            diff --git a/app/scripts/modules/openstack/src/common/footer.directive.html b/app/scripts/modules/openstack/src/common/footer.directive.html index 1ef03baefe1..7c7765a30e0 100644 --- a/app/scripts/modules/openstack/src/common/footer.directive.html +++ b/app/scripts/modules/openstack/src/common/footer.directive.html @@ -1,11 +1,9 @@
            - + + -
            diff --git a/app/scripts/modules/openstack/src/common/refresh.tooltip.html b/app/scripts/modules/openstack/src/common/refresh.tooltip.html index ad7af6cece3..f90edd9ce66 100644 --- a/app/scripts/modules/openstack/src/common/refresh.tooltip.html +++ b/app/scripts/modules/openstack/src/common/refresh.tooltip.html @@ -1,4 +1,4 @@

            {{$ctrl.label}} list is refreshing.

            Click to refresh {{$ctrl.label}} list.

            -

            Last Updated:
            {{$ctrl.lastRefresh | timestamp }}
            ({{$ctrl.lastRefresh | relativeTime }})

            -

            Note: Due to caching, data may be delayed up to 2 minutes

            +

            Last Updated:
            {{$ctrl.lastRefresh | timestamp }}
            ({{$ctrl.lastRefresh | relativeTime }})

            +

            Note: Due to caching, data may be delayed up to 2 minutes

            diff --git a/app/scripts/modules/openstack/src/common/selectField.component.html b/app/scripts/modules/openstack/src/common/selectField.component.html index a0a4cb12af5..d11b51c7929 100644 --- a/app/scripts/modules/openstack/src/common/selectField.component.html +++ b/app/scripts/modules/openstack/src/common/selectField.component.html @@ -1,17 +1,33 @@
            -
            - {{$ctrl.label}} - +
            + {{ $ctrl.label }} +
            -
            {{noOptionsMessage}}
            -
            -

            {{selectedOption ? selectedOption.label : noSelectionMessage}}

            - - +
            - +
            diff --git a/app/scripts/modules/openstack/src/instance/details/instanceDetails.html b/app/scripts/modules/openstack/src/instance/details/instanceDetails.html index f18175b813d..89868c592c1 100644 --- a/app/scripts/modules/openstack/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/openstack/src/instance/details/instanceDetails.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -27,12 +25,25 @@

            -
            @@ -68,10 +81,13 @@

            {{instance.instanceType || '(Unknown)'}}
            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            Subnet
            @@ -90,7 +106,10 @@

            {{metric.type | robotToHuman}}
            - + {{metric.state | robotToHuman}} @@ -100,7 +119,10 @@

            Status

            -
            +
            @@ -112,9 +134,10 @@

            {{instance.ipv4}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.ipv4" + tool-tip="'Copy to clipboard'" + >
            Private IP Address (V6)
            @@ -123,28 +146,32 @@

            + tool-tip="'Copy to clipboard'" + >

            Floating IP Address
            {{instance.floatingIp}} + class="copy-to-clipboard copy-to-clipboard-sm" + text="instance.floatingIp" + tool-tip="'Copy to clipboard'" + >
            - +
            No metadata associated with this server
            @@ -160,7 +187,13 @@

            - +

            diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/createWizard.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/createWizard.html index 69ec86fc734..681f18c0c81 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/createWizard.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/createWizard.html @@ -14,10 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/editWizard.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/editWizard.html index 2c7a9a1a1fc..d16f63bc4ee 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/editWizard.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/editWizard.html @@ -14,10 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html index cf753f0f572..a47506605d6 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html @@ -5,17 +5,24 @@
            - +
            Interval
            - +
            @@ -24,59 +31,102 @@
            - +
            Retries
            - +

            -
            +
            Method
            - +
            -
            +
            URL
            - +
            -
            +
            Status Codes
            -
            +
            {{statusCode}} - +
            - + - diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/interface.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/interface.html index 315b1a7803b..8df0c2a50d8 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/interface.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/interface.html @@ -5,7 +5,8 @@ help-key="openstack.loadBalancer.network" read-only="!isNew" allow-no-selection="true" - filter="{ account: loadBalancer.account }"> + filter="{ account: loadBalancer.account }" + > + model="loadBalancer.securityGroups" + >
            diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html index 02ab6d5aad2..4b9e4fc856e 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html @@ -1,47 +1,62 @@
            - + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + +
            ProtocolExternal PortInternal PortSSL Certificate Name
            ProtocolExternal PortInternal PortSSL Certificate Name
            → - -
            + + + + → + + + + + +
            - -
            + +
            -
            diff --git a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/location.html b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/location.html index b50ef2d3793..e9ed00d6e9d 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/location.html +++ b/app/scripts/modules/openstack/src/loadBalancer/configure/wizard/location.html @@ -3,58 +3,87 @@
            -
            +
            Your load balancer will be named: {{loadBalancer.name}} - - - + + +
            Account
            - +
            - +
            Stack

            {{loadBalancer.stack}}

            - +
            Detail

            {{loadBalancer.detail}}

            - +
            - +
            diff --git a/app/scripts/modules/openstack/src/loadBalancer/details/details.html b/app/scripts/modules/openstack/src/loadBalancer/details/details.html index fee56d8e786..f168bb0ef24 100644 --- a/app/scripts/modules/openstack/src/loadBalancer/details/details.html +++ b/app/scripts/modules/openstack/src/loadBalancer/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -13,8 +12,7 @@
            - +
            @@ -32,8 +30,14 @@

            @@ -60,7 +64,8 @@

            + tool-tip="'Copy Link to clipboard'" + >
            Distribution
            @@ -74,7 +79,9 @@

            Load Balancer → Instance
            - {{listener.externalProtocol}}:{{listener.sslCertificateId}}:{{listener.externalPort}}:{{listener.internalPort}} + {{listener.externalProtocol}}:{{listener.sslCertificateId}}:{{listener.externalPort}}:{{listener.internalPort}}
            @@ -89,14 +96,20 @@

            Retries
            {{loadBalancer.healthMonitor.maxRetries}}
            -
            +
            Method
            {{loadBalancer.healthMonitor.httpMethod}}
            URL
            {{loadBalancer.healthMonitor.url}}
            Status Codes
            -
            {{statusCode}}
            +
            +
            + {{statusCode}} +
            +

            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html index 57162969bde..e3caf44ce74 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html @@ -41,7 +41,6 @@
            -
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeStage.html index 2afa5f42f7e..28164da7525 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeStage.html @@ -7,8 +7,7 @@ - + @@ -16,9 +15,7 @@ @@ -26,8 +23,7 @@
            @@ -36,50 +32,54 @@
            - - + + - + - - - - - + + + + + - - - - - + + + + + - - - + + +
            KeyValueActions
            KeyValueActions
            - {{key}} - - - - Remove -
            + {{key}} + + + + Remove +
            - -
            + +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html index 0024cd8ef5b..a3e7650602e 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html @@ -9,7 +9,8 @@ component="stage" accounts="accounts" single-region="true" - cluster-field="targetCluster"> + cluster-field="targetCluster" + >
            @@ -21,18 +22,20 @@
            Capacity
            @@ -44,41 +47,53 @@
            Desired
            -
            -
            -
            +
            + +
            +
            + +
            +
            + +
            - +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html index 13b423a946b..fc3707e6936 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStage.html index 7cd3503e01a..d21680f7a87 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,11 +1,9 @@
            - + - - - + + + +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStage.html index c8eca323f8c..002c94c3acb 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,18 +1,11 @@
            - - + -
            - +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/disableClusterStage.html index 115a7529e31..0db7f42525a 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/disableClusterStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/disableCluster/disableClusterStage.html @@ -1,26 +1,26 @@
            - +
            Keep the - - + {{disableClusterStageCtrl.pluralize('server group', stage.remainingEnabledServerGroups)}} enabled.
            - +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStage.html index 700fc84f398..4026fa37430 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStage.html @@ -1,16 +1,11 @@
            - +
            - +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStepLabel.html index 9261272f7f8..5a77ae17c0f 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/enableAsg/enableAsgStepLabel.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/openstack/src/pipeline/stages/findAmi/findAmiStage.html index 0eedc7da545..ecaed87cf1b 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/findAmi/findAmiStage.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStage.html index 91f353894ec..18a35f87a3e 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -4,34 +4,33 @@
            - - + -
            -
            - @@ -40,12 +39,13 @@
            - +
            - 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
            @@ -53,13 +53,14 @@
            - +
            - 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
            @@ -76,13 +77,30 @@
            - +
            - +
            - +
            @@ -91,8 +109,6 @@ This is the exact amount to which the target server group will be scaled
            - +
            diff --git a/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index 200fb6e41f7..0b337cdd876 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/openstack/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index 1b4decc7a61..60a7e208e7c 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/openstack/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/openstack/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/openstack/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index 8743aef0439..ab8cd64eb22 100644 --- a/app/scripts/modules/openstack/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/openstack/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/openstack/src/region/regionSelectField.directive.html b/app/scripts/modules/openstack/src/region/regionSelectField.directive.html index 02bf22b8db3..4cfe8ebf94e 100644 --- a/app/scripts/modules/openstack/src/region/regionSelectField.directive.html +++ b/app/scripts/modules/openstack/src/region/regionSelectField.directive.html @@ -1,5 +1,12 @@ - + diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/basicSettings.html b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/basicSettings.html index de5506bd6f6..c83df62ecc8 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/basicSettings.html +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/basicSettings.html @@ -4,74 +4,97 @@
            -
            +
            Your will be named: {{ctrl.getName()}} - - - + + +
            -
            -
            Account
            -
            - -
            -
            - -
            +
            +
            Account
            +
            +
            -
            -
            Stack
            -
            - -
            -
            - -
            +
            +
            -
            -
            Detail
            -
            - -
            -
            - -
            +
            +
            +
            Stack
            +
            +
            -
            -
            Description
            -
            - -
            +
            +
            -
            - +
            +
            +
            Detail
            +
            +
            -
            -
            Region
            -
            - -
            +
            +
            +
            +
            +
            + Description +
            +
            + +
            +
            +
            + +
            +
            +
            Region
            +
            + +
            +
            diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/createWizard.html b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/createWizard.html index 41a7c74ab69..e4c7f14ade7 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/createWizard.html +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/createWizard.html @@ -1,17 +1,19 @@ - - - - - - - + + + + + + +
            - - + +
            diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/editWizard.html b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/editWizard.html index df9eac58f67..dbc49d301ee 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/editWizard.html +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/editWizard.html @@ -1,19 +1,23 @@ - - - - - - - - -
            - - -
            + + + + + + + + +
            + + +
            diff --git a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.html b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.html index 6f0df63a93e..af26d1d8a1f 100644 --- a/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.html +++ b/app/scripts/modules/openstack/src/securityGroup/configure/wizard/rules.html @@ -1,95 +1,175 @@ - +
            - - - - - - - - + + + + + + + +
            - + - @@ -97,8 +177,8 @@ @@ -106,18 +186,21 @@
            ProtocolFrom Port/TypeTo Port/CodeRemoteCIDR
            Protocol + From Port/Type + + To Port/Code + RemoteCIDR
            + + - + - + - + - + - - {{$select.selected.name}} - - - - + + {{$select.selected.name}} + + + + - + - + - + + + - + - + - + - + - + - + - + - + - +
            -
            -
            -
            +
            +

            - - - last refreshed {{ rulesController.getSecurityGroupRefreshTime() | timestamp }} - refreshing... + + + last refreshed {{ rulesController.getSecurityGroupRefreshTime() | timestamp }} + refreshing...

            -

            If you're not finding a that was recently added, - click here to refresh the list. +

            + If you're not finding a that was recently added, + click here to refresh the list.

            +
            -
            diff --git a/app/scripts/modules/openstack/src/securityGroup/details/details.html b/app/scripts/modules/openstack/src/securityGroup/details/details.html index a5c22cb4eb8..1cf9acf38b9 100644 --- a/app/scripts/modules/openstack/src/securityGroup/details/details.html +++ b/app/scripts/modules/openstack/src/securityGroup/details/details.html @@ -1,8 +1,7 @@
            - +
            @@ -21,8 +20,12 @@

            Actions

            @@ -42,11 +45,16 @@

            {{securityGroup.description}}
            - +
            None
            -
            +
            IP Range
            {{ipRangeRule.range.ip}}{{ipRangeRule.range.cidr}}
            Port Ranges
            @@ -55,23 +63,33 @@

            - -
            None
            + +
            None
            -
            -
            -
            - - - {{rule.securityGroup.name}} ({{rule.securityGroup.id}}) - -
            -
            Port Ranges
            -
            - {{rule.protocol}}: {{portRange.startPort}} → {{portRange.endPort}} -
            -
            +
            +
            +
            + + + {{rule.securityGroup.name}} ({{rule.securityGroup.id}}) + +
            +
            Port Ranges
            +
            + {{rule.protocol}}: {{portRange.startPort}} → {{portRange.endPort}} +
            +

            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html index c8394323e3b..fd4db6ae9cb 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html @@ -1,18 +1,22 @@
            -
            -

            +

            + The following load balancers could not be found in the selected namespace and were removed:

            • {{loadBalancer}}

            - Okay + Okay

            @@ -22,7 +26,8 @@ cache="allLoadBalancers" refresh-cache="updateLoadBalancers" required="false" - model="command.loadBalancers"> + model="command.loadBalancers" + > + model="command.securityGroups" + >
            @@ -40,13 +46,13 @@
            @@ -55,9 +61,11 @@
            - +
            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.html index 0953e3a4746..ec37dee7e68 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/advanced/advancedSettings.html @@ -1,4 +1,7 @@ -
            +
            @@ -21,22 +24,28 @@
            User Data Value
            - - - + + +
            @@ -50,7 +59,8 @@ refresh-cache="updateAvailabilityZones" required="false" model="selectedAZs" - on-change="selectedAZsChanged()"> + on-change="selectedAZsChanged()" + >
            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/clusterSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/clusterSettings.html index f61a7d58041..6d83c230d14 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/clusterSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/clusterSettings.html @@ -5,30 +5,48 @@ Minimum Size
            -
            +
            + +
            Desired Size
            -
            +
            + +
            Maximum Size
            -
            +
            + +
            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/instanceSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/instanceSettings.html index 468307fd221..5c80f8f7d79 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/instanceSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/instance/instanceSettings.html @@ -1,6 +1,14 @@ -
            +
            - +
            @@ -8,15 +16,21 @@
            - - {{$select.selected.name || 'Search for an image...'}} - + + {{$select.selected.name || 'Search for an image...'}} + diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/basicSettings.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/basicSettings.html index c697fdc578a..c3d586105b9 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/basicSettings.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/location/basicSettings.html @@ -1,84 +1,114 @@
            - -
            -
            -
            -
            -

            Your server group will be in the cluster:

            + +
            +
            +
            +
            +

            Your server group will be in the cluster:

            +

            + + {{basicSettingsCtrl.getNamePreview()}} + (new cluster) + +

            +

            - - {{basicSettingsCtrl.getNamePreview()}} - (new cluster) - + There is already a server group in this cluster. Do you want to clone it?

            -
            -

            - There is already a server group in this cluster. Do you want to clone it? -

            -

            - Cloning copies the entire configuration from the selected server group, allowing you - to modify whichever fields (e.g. image) you need to change in the new server group. -

            -

            - To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the - server group. -

            -

            - - Go to details for {{latestServerGroup.name}} - -

            -
            -
            -
            +

            + Cloning copies the entire configuration from the selected server group, allowing you to modify whichever + fields (e.g. image) you need to change in the new server group. +

            +

            + To clone a server group, select "Clone" from the "Server Group Actions" menu in the details view of the + server group. +

            +

            + + Go to details for {{latestServerGroup.name}} + +

            +
            +
            +
            -
            -
            - Account -
            -
            - -
            +
            +
            + Account
            - -
            -
            - Stack - -
            -
            +
            +
            -
            -
            - Only dot(.) and underscore(_) special characters are allowed in the Stack field. -
            +
            + +
            +
            + Stack +
            -
            -
            - Detail - -
            -
            +
            +
            -
            -
            - Only dot(.), underscore(_), and dash(-) special characters are allowed in the Detail field. -
            +
            +
            +
            + Only dot(.) and underscore(_) special characters are allowed in the Stack field. +
            +
            +
            +
            + Detail + +
            +
            + +
            +
            +
            +
            + Only dot(.), underscore(_), and dash(-) special characters are allowed in the Detail field.
            - - - - +
            + + + +
            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/serverGroupWizard.html index ea813e2c6b9..75115d36d81 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/serverGroupWizard.html @@ -7,30 +7,64 @@
            - + - + - + - + - +
            - - + +
            diff --git a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/templateSelection.html index f53c6de7ce0..03be2f4051c 100644 --- a/app/scripts/modules/openstack/src/serverGroup/configure/wizard/templateSelection.html +++ b/app/scripts/modules/openstack/src/serverGroup/configure/wizard/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.html index a951afff2a0..9a7781bca77 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.html +++ b/app/scripts/modules/openstack/src/serverGroup/details/resize/resizeServerGroup.html @@ -26,31 +26,42 @@

            Resize {{serverGroup.name}}

            New
            -
            -
            -
            +
            + +
            +
            + +
            +
            + +
            -

            Sets min, max, and desired instance counts to the same value.

            -

            To allow true auto-scaling, use the Advanced Mode.

            +

            To allow true auto-scaling, use the Advanced Mode.

            @@ -61,11 +72,13 @@

            Current size:

            @@ -78,12 +91,14 @@

            Resize to:

            @@ -91,21 +106,17 @@

            Resize to:

            - +
            - + + -
            diff --git a/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.html index c33a1bdf9d1..894c2a3a4a0 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/openstack/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -22,10 +22,12 @@

            Rollback {{serverGroup.name}}

            - +
            @@ -41,11 +43,11 @@

            Rollback {{serverGroup.name}}

            1. Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
              2. -
            2. Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [ - min: {{serverGroup.capacity.min}}, - max: {{ serverGroup.capacity.max }}, - desired: {{ serverGroup.capacity.desired }} - ]
              3. +
            3. + Resize {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} to [ + min: {{serverGroup.capacity.min}}, max: {{ serverGroup.capacity.max }}, + desired: {{ serverGroup.capacity.desired }} ] +
            4. Disable {{ serverGroup.name }}
            @@ -54,12 +56,13 @@

            Rollback {{serverGroup.name}}

            -
            - +
            diff --git a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html index 3308e89557a..cbd53af1d6a 100644 --- a/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html @@ -1,23 +1,18 @@ -
            - +
            -
            - - - -
            -
            - -
            +
            + + + +
            +
            + +
            -
            - +
            @@ -38,10 +33,16 @@

          • Resize
          • Disable
            • -
          • Enable
            • +
          • + Enable +
          • - + Enable @@ -56,7 +57,9 @@

            Insight

            • @@ -66,7 +69,10 @@

            Disabled {{ctrl.disabledDate | timestamp}}

            - +
            Created
            @@ -78,7 +84,11 @@

            {{ctrl.serverGroup.region}}
            Subnet
            -
            {{ctrl.subnetName || ctrl.serverGroup.subnetId}} ({{ctrl.serverGroup.subnetId}})
            +
            + {{ctrl.subnetName || ctrl.serverGroup.subnetId}} + ({{ctrl.serverGroup.subnetId}}) +

            @@ -94,17 +104,21 @@

            Current
            {{ctrl.serverGroup.instances.length}}
            Min
            -
            {{ctrl.serverGroup.scalingConfig.minSize}}
            +
            + {{ctrl.serverGroup.scalingConfig.minSize}} +
            Desired
            {{ctrl.serverGroup.scalingConfig.desiredSize}}
            Max
            -
            {{ctrl.serverGroup.scalingConfig.maxSize}}
            +
            + {{ctrl.serverGroup.scalingConfig.maxSize}} +
            - + @@ -122,7 +136,10 @@

            {{ctrl.serverGroup.image.properties.kernel_id}}
            Floating IP Network
            -
            {{ctrl.floatingNetworkName || ctrl.serverGroup.launchConfig.floatingNetworkId}} ({{ctrl.serverGroup.launchConfig.floatingNetworkId}})
            +
            + {{ctrl.floatingNetworkName || ctrl.serverGroup.launchConfig.floatingNetworkId}} + ({{ctrl.serverGroup.launchConfig.floatingNetworkId}}) +
            @@ -138,13 +155,15 @@

            Version
            {{ctrl.serverGroup.buildInfo.version}}
            Build Link
            -
            {{ctrl.buildJenkinsLink()}}
            +
            {{ctrl.buildJenkinsLink()}}
            • - + {{securityGroup.name}} ({{securityGroup.id}})
              • @@ -153,7 +172,9 @@

              • - + {{loadBalancer.name}} ({{loadBalancer.id}})
                • diff --git a/app/scripts/modules/oracle/src/common/footer.component.html b/app/scripts/modules/oracle/src/common/footer.component.html index 1ef03baefe1..7c7765a30e0 100644 --- a/app/scripts/modules/oracle/src/common/footer.component.html +++ b/app/scripts/modules/oracle/src/common/footer.component.html @@ -1,11 +1,9 @@
                - + + -
                diff --git a/app/scripts/modules/oracle/src/instance/details/instanceDetails.html b/app/scripts/modules/oracle/src/instance/details/instanceDetails.html index 31f42948cd4..2d48f539d34 100644 --- a/app/scripts/modules/oracle/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/oracle/src/instance/details/instanceDetails.html @@ -1,8 +1,7 @@
                - +
                diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/backendSets.html b/app/scripts/modules/oracle/src/loadBalancer/configure/backendSets.html index 2e758688895..31b0d4ec2fd 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/backendSets.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/backendSets.html @@ -15,41 +15,53 @@ - - - {{backendSet.name}} + + {{backendSet.name}} - + - + - + - + - + - -

            diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/certificates.html b/app/scripts/modules/oracle/src/loadBalancer/configure/certificates.html index 03becf8864b..5d02e29eec1 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/certificates.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/certificates.html @@ -15,29 +15,34 @@ {{cert.certificateName}} - + - + - + - + - + - + @@ -45,7 +50,8 @@ - diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.html b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.html index 9ab15ce9ff1..41abd6e293a 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancer.html @@ -14,9 +14,12 @@
            - - + +
            diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancerProperties.html b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancerProperties.html index 2142828487a..4ba679da22f 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancerProperties.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/createLoadBalancerProperties.html @@ -4,19 +4,27 @@
            -
            +
            Your load balancer will be named: {{loadBalancerCmd.name}} - - - + + +
            @@ -35,44 +43,76 @@
            Private Load Balancer
            Account
            - +
            - +
            Virtual Network
            - - {{$select.selected.name}} - - - - + + {{$select.selected.name}} + + + +
            Subnets
            - - {{$item.name}} - - - - + + {{$item.name}} + + + +
            @@ -86,23 +126,25 @@
            Stack
            - +
            - - + +
            diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/editLoadBalancer.html b/app/scripts/modules/oracle/src/loadBalancer/configure/editLoadBalancer.html index ee90d038721..2267bd40413 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/editLoadBalancer.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/editLoadBalancer.html @@ -1,19 +1,26 @@
            - - - - - - - - - - - + + + + + + + + + + +
            - - + +
            diff --git a/app/scripts/modules/oracle/src/loadBalancer/configure/listeners.html b/app/scripts/modules/oracle/src/loadBalancer/configure/listeners.html index 2baee9f66bc..d75e9ec41c0 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/configure/listeners.html +++ b/app/scripts/modules/oracle/src/loadBalancer/configure/listeners.html @@ -16,11 +16,23 @@ - + - - {{$select.selected.certificateName}} + + {{$select.selected.certificateName}} @@ -28,22 +40,31 @@
            N/A
            - + - + - {{$select.selected.name}} + {{$select.selected.name}} - + + + @@ -54,14 +75,14 @@ - -
            diff --git a/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.html b/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.html index a66f4163abc..527de37c4a1 100644 --- a/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.html +++ b/app/scripts/modules/oracle/src/loadBalancer/details/loadBalancerDetail.html @@ -1,9 +1,7 @@
            -
            - +
            @@ -14,8 +12,7 @@
            - +
            @@ -33,8 +30,14 @@

            @@ -48,7 +51,10 @@

            Created
            {{loadBalancer.timeCreated}}
            In
            -
            {{loadBalancer.region}}
            +
            + + {{loadBalancer.region}} +
            Subnets
            {{subnet.name}}
            Public IP
            @@ -59,11 +65,13 @@

            diff --git a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.html b/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.html index 39040bb187e..2e7ef544ff2 100644 --- a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStage.html @@ -1,18 +1,11 @@
            - - + -
            - +
            diff --git a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/oracle/src/pipeline/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/oracle/src/pipeline/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/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html index 10a2c9ab76f..c330ab541e3 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html @@ -45,7 +45,6 @@

            -
            diff --git a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeStage.html index d7a867d6318..bae4ec3d650 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeStage.html @@ -1,75 +1,71 @@
            -
            - -
            +
            + +
            - - - - + + + + - - - + + + - -
            - -
            -             + +
            + +
            +             - - - + + + - - - + + + - -
            - -
            -             -
            -
            -
            - -
            -
            + +
            +
            -
            - - - - - - - - - + +
            +
            +
            + +
            +
            +
            + + + + + + + + + +
            diff --git a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.html index 899cb4c5584..1951d792bcb 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStage.html @@ -1,9 +1,6 @@
            - +
            diff --git a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html index c9bac9c56ec..0f172440730 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html +++ b/app/scripts/modules/oracle/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/oracle/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.html index a57f86c297d..94dc0c9d434 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStage.html @@ -1,16 +1,11 @@
            - +
            - +
            diff --git a/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStepLabel.html index bf9b915777b..d078cf0a813 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/disableAsg/disableAsgStepLabel.html +++ b/app/scripts/modules/oracle/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/oracle/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.html index 41fd65ccdc1..b91b7174ece 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/findAmi/findAmiStage.html @@ -1,8 +1,5 @@
            - + @@ -16,7 +13,7 @@ diff --git a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.html index a2084612a9a..1a67da75e81 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStage.html @@ -4,10 +4,7 @@
            - +
            @@ -15,21 +12,25 @@             -
            - @@ -37,22 +38,26 @@
            - +
            - 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
            @@ -68,19 +73,17 @@
            - +
            - +
            - +
            - +
            diff --git a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html index 200fb6e41f7..0b337cdd876 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html @@ -1,5 +1,3 @@ - Resize Server Group: - {{step.context.serverGroupName}} - ({{step.context.region}}) + Resize Server Group: {{step.context.serverGroupName}} ({{step.context.region}}) diff --git a/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html index 851f95ec55d..d5148a415c3 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html @@ -1,29 +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/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html index e79468e0f26..398e3ac81bd 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html +++ b/app/scripts/modules/oracle/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html @@ -1,15 +1,19 @@
            - +
            Shrink to - + {{shrinkClusterStageCtrl.pluralize('server group', stage.shrinkToSize)}}, keeping the + Allow deletion of active server groups
            - +
            diff --git a/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.html index 4cdf7e0f2f8..b782b8264c7 100644 --- a/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.html +++ b/app/scripts/modules/oracle/src/securityGroup/configure/createSecurityGroup.html @@ -1,11 +1,16 @@ - - +

            Notice

            -

            We don't currently support the ability to create for Oracle Cloud from Spinnaker.

            -

            You can use the Oracle Cloud console to create and manage Security Lists to provide a virtual for an instance.

            +

            + We don't currently support the ability to create for Oracle + Cloud from Spinnaker. +

            +

            + You can use the Oracle Cloud console to create and manage Security Lists to provide a virtual + for an instance. +

            diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html index a1f1a28e5a2..d8ce666f0ed 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html @@ -3,7 +3,9 @@
            {{$select.selected}} - + diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.html index 0ae2a18780a..c8e967a59e6 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/basicSettings/basicSettings.html @@ -5,19 +5,38 @@ Account
            - +
            - +
            VCN
            - + {{$select.selected.name}} @@ -29,10 +48,16 @@
            Availability Domain
            - + {{$select.selected.name}} - + @@ -45,9 +70,12 @@ Subnet
            - + {{$select.selected.name}} @@ -79,7 +107,12 @@
            -
            @@ -94,9 +127,18 @@
            - +
            - +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/capacity/capacitySelector.component.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/capacity/capacitySelector.component.html index 53a70829fa4..03f8d089a3f 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/capacity/capacitySelector.component.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/capacity/capacitySelector.component.html @@ -6,10 +6,8 @@
            Number of Instances
            -
            +
            + +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/instanceType/instanceType.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/instanceType/instanceType.html index f90af9a8ed8..9d0af1e3ae5 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/instanceType/instanceType.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/instanceType/instanceType.html @@ -4,8 +4,7 @@ Image
            - + {{$select.selected.name}} @@ -20,12 +19,13 @@ Shape
            - + {{$select.selected.name}} - + : command.backingData.filtered.allShapes)" + > diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html index 6328e9551a0..a2074e351cb 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html @@ -4,9 +4,11 @@ Load Balancer
            - + {{$select.selected.name}} @@ -21,9 +23,12 @@ Backend Set
            - + {{$select.selected.name}} diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html index 41845cf2f99..86905d4ae32 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html @@ -1,13 +1,15 @@
            -
            - SSH Key - -
            -
            - -
            +
            + SSH Key + +
            +
            + +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html index cb7763f3b5d..0ac9eacdc6d 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html @@ -24,9 +24,17 @@
            - - + +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/templateSelection/templateSelection.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/templateSelection/templateSelection.html index 22de8f64609..9a48c41e6ea 100644 --- a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/templateSelection/templateSelection.html +++ b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/templateSelection/templateSelection.html @@ -1,7 +1,9 @@ - + diff --git a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.html b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.html index 0aaaef676b6..c81c9c243a8 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.html +++ b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeCapacity.component.html @@ -10,11 +10,13 @@ Current size
            - + instances
            @@ -23,12 +25,14 @@ Resize to
            - + instances
            diff --git a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.html index 43d71ba3e75..d288caf3f1b 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.html +++ b/app/scripts/modules/oracle/src/serverGroup/details/resize/resizeServerGroup.html @@ -8,25 +8,26 @@

            Resize {{serverGroup.name}}

            + server-group="serverGroup" + form-methods="formMethods" + application="application" + command="command" + >
            - +
            - +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.html index 588ce89c6e7..ee14520ffad 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/oracle/src/serverGroup/details/rollback/rollbackServerGroup.html @@ -21,19 +21,23 @@

            Rollback {{serverGroup.name}}

            - +
            - +
            diff --git a/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html index acf2d2aa9a7..ad0b7ffb649 100644 --- a/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html @@ -1,9 +1,7 @@ -
            +
            - +
            @@ -13,8 +11,7 @@
            - +
            @@ -42,7 +39,9 @@

            Insight

            diff --git a/app/scripts/modules/titus/src/instance/details/instanceDetails.html b/app/scripts/modules/titus/src/instance/details/instanceDetails.html index 5d17bf22c97..614ed336f8e 100644 --- a/app/scripts/modules/titus/src/instance/details/instanceDetails.html +++ b/app/scripts/modules/titus/src/instance/details/instanceDetails.html @@ -24,24 +24,38 @@

            ng-if="instance" class="copy-to-clipboard" text="sshLink" - tool-tip="'Copy titus-ssh command to clipboard'"> + tool-tip="'Copy titus-ssh command to clipboard'" + >

            -
            @@ -50,12 +64,14 @@

            Insight

            @@ -76,19 +92,22 @@

            Server Group
            - {{instance.serverGroup}} + provider: instance.provider})" + >{{instance.serverGroup}}
            Job Id
            {{instance.jobId}}
            Instance Id
            -
            {{instance.id}} - +
            + {{instance.id}} +
            @@ -104,8 +123,10 @@

            {{metric.type | robotToHuman}}
            - + {{metric.state | robotToHuman}} @@ -113,13 +134,16 @@

            Health Check | Status - | + + | Discovery Info

            -
            +
            @@ -128,18 +152,25 @@

            Container IP
            -
            {{instance.placement.containerIp}} +
            + {{instance.placement.containerIp}} + tool-tip="'Copy container IP clipboard'" + >
            Host IP
            {{instance.placement.host}}
             - + + + -

            diff --git a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html index be06f186ec2..025faaa6cdc 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html +++ b/app/scripts/modules/titus/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 }})
            @@ -31,10 +33,12 @@

            Rollback {{serverGroup.name}}

            - +
            @@ -44,11 +48,13 @@

            Rollback {{serverGroup.name}}

            Wait - + seconds before disabling {{ ctrl.label(serverGroup) }}.
            @@ -56,11 +62,12 @@

            Rollback {{serverGroup.name}}

            Consider rollback successful when - percent of instances are healthy.
            @@ -75,19 +82,23 @@

            Rollback {{serverGroup.name}}

            1. Enable {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}
              2. -
            2. 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) +
            3. + 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) +
              4. +
            4. - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
            5. Disable {{ serverGroup.name }}
              6. -
            6. Restore minimum capacity of {{ command.rollbackContext.restoreServerGroupName || 'previous server group' }} [ - min: {{ serverGroup.capacity.min }} - ]
              7. +
            7. + 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 }}). @@ -97,32 +108,34 @@

            Rollback {{serverGroup.name}}

              -
            1. 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) +
            2. + 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)
            3. - Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} - instances to report as healthy + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} instances to + report as healthy
            4. Disable {{ serverGroup.name }}
              5. -
            5. Restore minimum capacity of new server group [ - min: {{ serverGroup.capacity.min }} - ]
              6. +
            6. + 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/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html index 002705d76eb..059aca1685e 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html @@ -1,18 +1,20 @@ -{{$ctrl.policy.policyType | robotToHuman | uppercase }} -({{$ctrl.policy.status.state}}) +{{ $ctrl.policy.policyType | robotToHuman | uppercase }} +({{ $ctrl.policy.status.state }})
            -
            +
            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/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html index cd9b49391e5..36d14cfb83d 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html @@ -1,4 +1,5 @@ + application="$ctrl.application" +> diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html index 9da6a6238e8..63878c730f1 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingPopover.html @@ -1,4 +1,5 @@ + server-group="$ctrl.alarmServerGroup" +> diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html index a2aeb032f5e..a94cb0375f6 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html @@ -1,4 +1,5 @@ + application="$ctrl.application" +> diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html index 9bde0bb52a0..f602397f756 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html @@ -8,51 +8,64 @@

            {{$ctrl.policy.id ? "Update" : "Create"}} scaling policy

            Target Metric

            -

            With target tracking policies, Amazon will automatically adjust the size of your job to keep the selected - metric as close as possible to the selected value.

            -

            Note: metrics must be sent to Amazon CloudWatch before they can be used in auto scaling. If you do not +

            + With target tracking policies, Amazon will automatically adjust the size of your job to keep the selected + metric as close as possible to the selected value. +

            +

            + Note: metrics must be sent to Amazon CloudWatch before they can be used in auto scaling. If you do not see a metric below, click "Configure available metrics" in the server group details to set up forwarding from - Atlas to CloudWatch.

            + Atlas to CloudWatch. +

            Metric
            - +
            Target
            - of
            - +
            -
            - -
            Note: to zoom in, hold down the alt key and use your - mouse to select an area. Double-click to zoom back out.
            + +
            + Note: to zoom in, hold down the alt key and use your mouse to select an area. Double-click to + zoom back out. +
            @@ -64,14 +77,18 @@

            Additional Settings

            - This option disables scale in events for the target tracking policy, while keeping the scale out events. - This means that ASG will not scale in unless you explicitly set up a separate step policy to scale it - in. + This option disables scale in events for the target tracking policy, while keeping the scale out + events. This means that ASG will not scale in unless you explicitly set up a separate step policy to + scale it in.

            This is useful when you have special requirements, such as gradual or delayed scale in. @@ -84,14 +101,13 @@

            Additional Settings

            - This policy will not scale down. Make sure you have another policy (either TT or Step) that - will scale in this ASG. + This policy will not scale down. Make sure you have another policy (either TT or Step) that will scale in + this ASG.
            - This policy will scale both in and out. Make sure you don't have other scaling policies, as they - will likely interfere with each other. + This policy will scale both in and out. Make sure you don't have other scaling policies, as they will + likely interfere with each other.
            -
            @@ -101,11 +117,13 @@

            Additional Settings

            - + seconds @@ -118,26 +136,29 @@

            Additional Settings

            - + seconds
            -
            - +
            diff --git a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html index 5e259463126..cc34d71133b 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html +++ b/app/scripts/modules/titus/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html @@ -6,16 +6,19 @@

            {{ctrl.action}} scaling policy

            -

            Conditions

            -

            Note: metrics must be sent to Amazon CloudWatch before they can be used in auto scaling. If you do not +

            + Note: metrics must be sent to Amazon CloudWatch before they can be used in auto scaling. If you do not see a metric below, click "Configure available metrics" in the server group details to set up forwarding from - Atlas to CloudWatch.

            - + Atlas to CloudWatch. +

            +

            Actions

            @@ -23,9 +26,11 @@

            Actions

            Select a metric

            - +

            Additional Settings

            @@ -37,11 +42,13 @@

            Additional Settings

            instances in increments of at least - + instance(s) @@ -50,11 +57,13 @@

            Additional Settings

            Cooldown
            - + seconds @@ -66,9 +75,11 @@

            Additional Settings

            - +
            diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html index 26489d4dd8e..e2a4c6f1a9d 100644 --- a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html +++ b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html @@ -1,5 +1,4 @@
            -
            @@ -13,8 +12,7 @@

            - +
            @@ -49,11 +47,13 @@

          • Enable
          • Destroy
          • Clone
            • - +

            @@ -61,12 +61,14 @@

            Insight

            @@ -78,8 +80,10 @@

            Job is Disabled
            - +
            Created
            @@ -95,8 +99,7 @@

            -
            +
            Desired
            {{serverGroup.capacity.desired}}
            Current
            @@ -104,8 +107,7 @@

            Cap. Group
            {{serverGroup.capacityGroup}}

            -
            +
            Min
            {{serverGroup.capacity.min}}
            Desired
            @@ -152,17 +154,24 @@

            - + + application="ctrl.application" + > + application="ctrl.application" + >
            region="serverGroup.region" env="ctrl.env" config="configBinData" - config-updated="addConfigBinData"> + config-updated="addConfigBinData" + >
            -
            No job attributes associated with this - server group -
            +
            No job attributes associated with this server group
            {{key}}
            {{val}}
             -
            No container attributes associated with this - server group -
            +
            No container attributes associated with this server group
            {{key}}
            {{val}}
             -
            No environment variables associated with this - server group -
            +
            No environment variables associated with this server group
            {{key}}
            {{val}}
            From 20bdc03a657bf131b20bde1a95813250aab90a38 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:23:31 -0800 Subject: [PATCH 3/9] chore(yarn): Update yarn.lock (#6601) --- yarn.lock | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7b144f1bf7c..9835cd44190 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,15 +46,6 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/types@^7.2.0": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.2.tgz#424f5be4be633fff33fb83ab8d67e4a8290f5a2f" - integrity sha512-3Y6H8xlUlpbGR+XvawiH0UXehqydTmNmEpozWcXymqwcrwYAl5KMvKtQ+TF6f6E08V6Jur7v/ykdDSF+WDEIXQ== - dependencies: - esutils "^2.0.2" - lodash "^4.17.10" - to-fast-properties "^2.0.0" - "@fortawesome/fontawesome-free-webfonts@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f" @@ -1910,15 +1901,6 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-angularjs-annotate@0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/babel-plugin-angularjs-annotate/-/babel-plugin-angularjs-annotate-0.10.0.tgz#4213b3aaae494a087aad0b8237c5d0716d22ca76" - integrity sha512-NPE7FOAxcLPCUR/kNkrhHIjoScR3RyIlRH3yRn79j8EZWtpILVnCOdA9yKfsOmRh6BHnLHKl8ZAThc+YDd/QwQ== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/types" "^7.2.0" - simple-is "~0.2.0" - babel-plugin-check-es2015-constants@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" @@ -14063,11 +14045,6 @@ signum@^1.0.0: resolved "https://registry.yarnpkg.com/signum/-/signum-1.0.0.tgz#74a7d2bf2a20b40eba16a92b152124f1d559fa77" integrity sha1-dKfSvyogtA66FqkrFSEk8dVZ+nc= -simple-is@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" - integrity sha1-Krt1qt453rXMgVzhDmGRFkhQuvA= - simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -15167,11 +15144,6 @@ to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - to-float32@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-float32/-/to-float32-1.0.0.tgz#32a310fe2fb7d49459037b1d47447ce5b2d5ac95" From 814236a3b5dee648e46e0dcefeea665edbabbca4 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:28:21 -0800 Subject: [PATCH 4/9] chore(core): Bump version to 0.0.338 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7d5fc346bca54c5d53f9eb46d823cd993c102058 chore(prettier): Just Use Prettier™ (#6600) 64fb4892ee3e7114eccb8f6acc9d84ae652f1af3 fix(html): Fix various invalid HTML (#6597) 39f6858797af81265a6de1aa0735c33b9c35bd30 fix(core/diffs): Fix misnamed tempate field 5cf6c79da63404bb7238291d38bb7f5cfd10c26b chore(prettier): Just Use Prettier™ 3ffa4fb7498df815014d61071e8588f0b34bf8b9 chore(angularjs): Do not use .component('foo', new Foo()) 14bf52b2da88555cbab3bca7ae33062cf32d7625 feat(gremlin): Per feedback review within gate, change the Gate gremlin endpoint prefix from "gremlin" to "integrations/gremlin" (#6591) --- app/scripts/modules/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/core/package.json b/app/scripts/modules/core/package.json index 700af432daf..24e6d67dddd 100644 --- a/app/scripts/modules/core/package.json +++ b/app/scripts/modules/core/package.json @@ -1,6 +1,6 @@ { "name": "@spinnaker/core", - "version": "0.0.337", + "version": "0.0.338", "main": "lib/lib.js", "typings": "lib/index.d.ts", "scripts": { From 55a7fdbedae4b48bf78c9ecf5da8648e8d0b596e Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:29:21 -0800 Subject: [PATCH 5/9] chore(docker): Bump version to 0.0.35 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7d5fc346bca54c5d53f9eb46d823cd993c102058 chore(prettier): Just Use Prettier™ (#6600) 64fb4892ee3e7114eccb8f6acc9d84ae652f1af3 fix(html): Fix various invalid HTML (#6597) --- app/scripts/modules/docker/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/docker/package.json b/app/scripts/modules/docker/package.json index eb79b02b868..b2725cdb3e3 100644 --- a/app/scripts/modules/docker/package.json +++ b/app/scripts/modules/docker/package.json @@ -1,6 +1,6 @@ { "name": "@spinnaker/docker", - "version": "0.0.34", + "version": "0.0.35", "main": "lib/lib.js", "typings": "lib/index.d.ts", "scripts": { From ac64613268a00f966515ef8c635689fa2f82b4c4 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:29:48 -0800 Subject: [PATCH 6/9] chore(amazon): Bump version to 0.0.176 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7d5fc346bca54c5d53f9eb46d823cd993c102058 chore(prettier): Just Use Prettier™ (#6600) 04bb4a01c2d988aab5b5b8ae6e3aadbc59214898 fix(html): Fix various invalid HTML (#6599) 64fb4892ee3e7114eccb8f6acc9d84ae652f1af3 fix(html): Fix various invalid HTML (#6597) 5cf6c79da63404bb7238291d38bb7f5cfd10c26b chore(prettier): Just Use Prettier™ 3ffa4fb7498df815014d61071e8588f0b34bf8b9 chore(angularjs): Do not use .component('foo', new Foo()) --- app/scripts/modules/amazon/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/amazon/package.json b/app/scripts/modules/amazon/package.json index 9a2ca1946c7..ba65f824803 100644 --- a/app/scripts/modules/amazon/package.json +++ b/app/scripts/modules/amazon/package.json @@ -1,6 +1,6 @@ { "name": "@spinnaker/amazon", - "version": "0.0.175", + "version": "0.0.176", "main": "lib/lib.js", "typings": "lib/index.d.ts", "scripts": { From 7aee95b05829b848f34dd0bc38ad8d4f13342953 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Thu, 21 Feb 2019 16:30:21 -0800 Subject: [PATCH 7/9] chore(titus): Bump version to 0.0.76 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7d5fc346bca54c5d53f9eb46d823cd993c102058 chore(prettier): Just Use Prettier™ (#6600) 04bb4a01c2d988aab5b5b8ae6e3aadbc59214898 fix(html): Fix various invalid HTML (#6599) 5cf6c79da63404bb7238291d38bb7f5cfd10c26b chore(prettier): Just Use Prettier™ 3ffa4fb7498df815014d61071e8588f0b34bf8b9 chore(angularjs): Do not use .component('foo', new Foo()) --- app/scripts/modules/titus/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/titus/package.json b/app/scripts/modules/titus/package.json index e83ad5e4213..5e76d558cc2 100644 --- a/app/scripts/modules/titus/package.json +++ b/app/scripts/modules/titus/package.json @@ -1,6 +1,6 @@ { "name": "@spinnaker/titus", - "version": "0.0.75", + "version": "0.0.76", "main": "lib/lib.js", "typings": "lib/index.d.ts", "scripts": { From 35d38da84e3abb37e8ddeab829f13ba7db95695f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 21 Feb 2019 17:14:31 -0800 Subject: [PATCH 8/9] chore(deps): bump @spinnaker/kayenta from 0.0.69 to 0.0.70 (#6589) --- package.json | 2 +- yarn.lock | 70 ++++++++++++++++++++++------------------------------ 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index ca53732b123..57fdfcd9134 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.4.1", - "@spinnaker/kayenta": "0.0.69", + "@spinnaker/kayenta": "0.0.70", "@spinnaker/styleguide": "^1.0.10", "@types/memoize-one": "^3.1.1", "@types/react-tether": "^0.5.3", diff --git a/yarn.lock b/yarn.lock index 9835cd44190..871f81e55ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,12 +46,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@fortawesome/fontawesome-free-webfonts@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f" - integrity sha512-uYd3d748klO7/+0N2F0JFYO1JeSR8/VF50S2+anI3/tG56GDAaT7fwTwlhv3N+C023f4vw3z7IPRc9ixstaAcw== - -"@fortawesome/fontawesome-free@^5.4.1": +"@fortawesome/fontawesome-free@5.5.0", "@fortawesome/fontawesome-free@^5.4.1": version "5.5.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.5.0.tgz#0c6c53823d04457ae669cd19567b8a21dbb4fcfd" integrity sha512-p4lu0jfj5QN013ddArh99r3OXZ/fp9rbovs62LfaO70OMBsAXxtNd0lAq/97fitrscR0fqfd+/a5KNcp6Sh/0A== @@ -114,17 +109,17 @@ d3-collection "1" d3-interpolate "1" -"@spinnaker/kayenta@0.0.69": - version "0.0.69" - resolved "https://registry.yarnpkg.com/@spinnaker/kayenta/-/kayenta-0.0.69.tgz#aa1edfa2c2ed29d03e853f8eb33f5e3aaf436c3a" - integrity sha512-1P2AYVHXMOIUPenQYJTS6UosAh+7TkYnkAjCEMW1nCZ2dr0qxupIov0sThNX3Y9eSLPn3DHJ4Sp8IyHMmGDgow== +"@spinnaker/kayenta@0.0.70": + version "0.0.70" + resolved "https://registry.yarnpkg.com/@spinnaker/kayenta/-/kayenta-0.0.70.tgz#7646dcb3485566755d50a684564c5141908dbda8" + integrity sha512-UDjFFovVwswkbbJW5IfYqUMlI2gIClx+XrAVBlCWm0YggAaVBOipby1/g+zbDwnKDX5ecyaTXs6aY9PVXARuMw== dependencies: - "@fortawesome/fontawesome-free-webfonts" "^1.0.4" + "@fortawesome/fontawesome-free" "5.5.0" "@types/plotly.js" "^1.28.12" "@uirouter/angularjs" "^1.0.15" - "@uirouter/react-hybrid" "^0.1.0" + "@uirouter/react-hybrid" "0.3.9" Select2 "git://github.com/select2/select2.git#3.4.8" - angular "~1.6.3" + angular "1.6.10" angular-ui-bootstrap "^2.5.0" angular-ui-router "1.0.0" angular-ui-sortable "^0.17.0" @@ -137,15 +132,18 @@ classnames "^2.2.5" diff-match-patch "^1.0.0" dompurify "^1.0.4" + human-readable-ids "1.0.4" ify-loader "^1.1.0" js-yaml "^3.8.3" lodash "^4.16.1" lodash-decorators "^4.4.1" + memoize-one "4.0.2" moment-timezone "^0.4.0" n3-charts "^2.0.18" ngimport "^0.6.0" plotly.js "^1.35.2" react "16.3.2" + react-ace "6.4.0" react-bootstrap "^0.32.1" react-bootstrap-typeahead "^3.2.4" react-dom "16.3.2" @@ -748,7 +746,7 @@ resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.21.tgz#b6c4c311e9416a1e8ce76b072e042a60224d1b3a" integrity sha512-QWHc0wT00qtYNkT0BXZaFNLLHZyux0qJjF8c2WklW5/Q0Z866NoJjJErEMWjQb/AR+olkR2NlfEEi8KTQU2OpA== -"@uirouter/react-hybrid@0.3.8", "@uirouter/react-hybrid@^0.1.0": +"@uirouter/react-hybrid@0.3.8": version "0.3.8" resolved "https://registry.yarnpkg.com/@uirouter/react-hybrid/-/react-hybrid-0.3.8.tgz#895fe1f42be0c27056549a4459eecd651b167b27" integrity sha512-3ESdlWWF4BzoikUBbhlA0POCmaNTWhmv5MaKR/Qh3q3q+zleIHMbPl2VLzoR5OfUN5fBVANwf/tVGnXt0/uZYA== @@ -1245,7 +1243,7 @@ angular2react@^3.0.2: lodash.kebabcase "^4.1.1" ngimport "^1.0.0" -angular@1.6.10, angular@>=1.5, angular@>=1.5.0, angular@^1.4.0, angular@~1.6.3: +angular@1.6.10, angular@>=1.5, angular@>=1.5.0, angular@^1.4.0: version "1.6.10" resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" integrity sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg== @@ -2588,7 +2586,7 @@ brace-expansion@^1.1.7: balanced-match "^0.4.1" concat-map "0.0.1" -brace@^0.11.0: +brace@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg= @@ -4856,10 +4854,10 @@ diagnostics@^1.0.1: enabled "1.0.x" kuler "1.0.x" -diff-match-patch@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048" - integrity sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg= +diff-match-patch@^1.0.0, diff-match-patch@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" + integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== diff@^3.1.0: version "3.5.0" @@ -7957,7 +7955,7 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" -human-readable-ids@^1.0.4: +human-readable-ids@1.0.4, human-readable-ids@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/human-readable-ids/-/human-readable-ids-1.0.4.tgz#41b3a2a6966636e104e41e0673b984b36dfde202" integrity sha512-h1zwThTims8A/SpqFGWyTx+jG1+WRMJaEeZgbtPGrIpj2AZjsOgy8Y+iNzJ0yAyN669Q6F02EK66WMWcst+2FA== @@ -8919,15 +8917,7 @@ js-worker-search@^1.2.1: flow-bin "^0.50.0" uuid "^2.0.1" -js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.8.3, js-yaml@^3.9.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" - integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.12.0: +js-yaml@^3.10.0, js-yaml@^3.12.0, js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.8.3, js-yaml@^3.9.0: version "3.12.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA== @@ -9511,7 +9501,7 @@ lodash.isarray@^3.0.0: resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= -lodash.isequal@^4.1.1, lodash.isequal@^4.5.0: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= @@ -9929,7 +9919,7 @@ mem@^4.0.0: mimic-fn "^1.0.0" p-is-promise "^1.1.0" -memoize-one@^4.0.2: +memoize-one@4.0.2, memoize-one@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.0.2.tgz#3fb8db695aa14ab9c0f1644e1585a8806adc1aee" integrity sha512-ucx2DmXTeZTsS4GPPUZCbULAN7kdPT1G+H49Y34JjbQ5ESc6OGhVxKvb1iKhr9v19ZB9OtnHwNnhUnNR/7Wteg== @@ -12576,16 +12566,16 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-ace@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-6.1.4.tgz#33d93a83ae46c61f23b1801df79b71837a328b75" - integrity sha512-a8/lAsy2bfi7Ho+3Kaj8hBPR+PEiCTG9xFG9LIjCJrv5WQFYFpeFTiPWA96M3t+LgIDFFltwfVTwD2pmdAVOxQ== +react-ace@6.4.0, react-ace@^6.1.4: + version "6.4.0" + resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-6.4.0.tgz#49152a9e04108324fa3e7438ed9f1454fe0738c1" + integrity sha512-woTTgGk9x4GRRWiM4QLNOspjaJAYLX3UZ3J2XRYQvJiN6wyxrFY9x7rdOKc+4Tj+khb/ccPiDj/kll4UeJEDPw== dependencies: - brace "^0.11.0" - diff-match-patch "^1.0.0" + brace "^0.11.1" + diff-match-patch "^1.0.4" lodash.get "^4.4.2" - lodash.isequal "^4.1.1" - prop-types "^15.5.8" + lodash.isequal "^4.5.0" + prop-types "^15.6.2" react-addons-test-utils@15.6.2: version "15.6.2" From 70fb404d23cd9bbf2c58ebe75f26be585367e444 Mon Sep 17 00:00:00 2001 From: Erik Munson Date: Thu, 21 Feb 2019 17:21:26 -0800 Subject: [PATCH 9/9] fix(core/executions): Disable text selection when re-ordering pipelines (#6603) --- .../modules/core/src/pipeline/filter/ExecutionFilters.tsx | 3 ++- .../modules/core/src/pipeline/filter/executionFilters.less | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/scripts/modules/core/src/pipeline/filter/ExecutionFilters.tsx b/app/scripts/modules/core/src/pipeline/filter/ExecutionFilters.tsx index a60dc2d1529..2b0411dd159 100644 --- a/app/scripts/modules/core/src/pipeline/filter/ExecutionFilters.tsx +++ b/app/scripts/modules/core/src/pipeline/filter/ExecutionFilters.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import * as ReactGA from 'react-ga'; import { get, isEmpty, orderBy, uniq } from 'lodash'; import { Debounce } from 'lodash-decorators'; +import * as classnames from 'classnames'; import { SortableContainer, SortableElement, SortableHandle, arrayMove, SortEnd } from 'react-sortable-hoc'; import { Subscription } from 'rxjs'; @@ -290,7 +291,7 @@ const FilterCheckbox = (props: { const Pipeline = SortableElement( (props: { tag: IFilterTag; pipeline: string; dragEnabled: boolean; update: () => void }) => ( -
            +