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) + +
    5. + Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}} + instances to report as healthy
    6. Disable {{ serverGroup.name }}
    7. 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}}

    -