diff --git a/app/scripts/modules/azure/help/azure.help.ts b/app/scripts/modules/azure/help/azure.help.ts index acc26d7650f..6250b09b1e3 100644 --- a/app/scripts/modules/azure/help/azure.help.ts +++ b/app/scripts/modules/azure/help/azure.help.ts @@ -35,6 +35,18 @@ const helpContents: { [key: string]: string } = { } tags at most.`, 'azure.serverGroup.enableInboundNAT': 'An Azure load balancer of the basic sku will be created with adding inbound NAT port-forwarding rules to facilitate loggin on VM instances. There is no charge for creating an Azure load balancer of the basic sku. This option is disabled if Availability Zones are set which require Standard Azure Load Balancer and an extra Network Security Group with correct inbound and outbound rules configured.', + 'azure.loadBalancer.dnsName': + 'If there is no custom DNS label specified, a default DNS name will be created. The default value will be "GeneratedText.cloudapp.net" for Azure Application Gateway or "GeneratedText.[region].cloudapp.azure.com" for Azure Load Balancer.', + 'azure.loadBalancer.probes.probeInterval': + 'Probe interval in seconds. This value is the time interval between two consecutive probes.', + 'azure.loadBalancer.probes.timeout': + 'Probe time-out in seconds. If a valid response is not received within this time-out period, the probe is marked as failed. Note that the time-out value should not be more than the Interval value.', + 'azure.loadBalancer.probes.unhealthyThreshold': + 'Probe retry count. The back-end server is marked down after the consecutive probe failure count reaches the unhealthy threshold.', + 'azure.loadBalancer.loadBalancingRules.idleTimeout': + 'Keep a TCP or HTTP connection open without relying on clients to send keep-alive messages.', + 'azure.loadBalancer.loadBalancingRules.sessionPersistence': + 'Session persistence specifies that traffic from a client should be handled by the same virtual machine in the backend pool for the duration of a session. "None" specifies that successive requests from the same client may be handled by any virtual machine. "Client IP" specifies that successive requests from the same client IP address will be handled by the same virtual machine. "Client IP and protocol" specifies that successive requests from the same client IP address and protocol combination will be handled by the same virtual machine.', }; Object.keys(helpContents).forEach(key => HelpContentsRegistry.register(key, helpContents[key])); diff --git a/app/scripts/modules/azure/loadBalancer/configure/advancedSettings.html b/app/scripts/modules/azure/loadBalancer/configure/advancedSettings.html new file mode 100644 index 00000000000..f7e2a3855d3 --- /dev/null +++ b/app/scripts/modules/azure/loadBalancer/configure/advancedSettings.html @@ -0,0 +1,82 @@ +
+
+
+
+
+ Custom DNS Label + +
+
+ + .{{loadBalancer.region}}.cloudapp.azure.com +
+
+
+
+ Health Check +
+
+
+
+ Interval + +
+
+ +
+
+
+
+ Unhealthy Threshold + +
+
+ +
+
+
+
+ Idle Timeout + +
+
+ +
+
+
+
+ Timeout + +
+
+ +
+
+
+
+ Session persistence + +
+
+ +
+
+
+
+
diff --git a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js index a1e4fa89fd3..4dd32e6c9fa 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js +++ b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.controller.js @@ -37,6 +37,7 @@ module.exports = angular location: require('./createLoadBalancerProperties.html'), listeners: require('./listeners.html'), healthCheck: require('./healthCheck.html'), + advancedSettings: require('./advancedSettings.html'), }; $scope.isNew = isNew; diff --git a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html index c3bfe8d79bf..57187f05fbb 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html +++ b/app/scripts/modules/azure/loadBalancer/configure/createLoadBalancer.html @@ -9,6 +9,9 @@ + + +
diff --git a/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html b/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html index 1308848d7ee..130009db6ef 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html +++ b/app/scripts/modules/azure/loadBalancer/configure/editLoadBalancer.html @@ -10,6 +10,9 @@ + + +
diff --git a/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html b/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html index 470f9a0c188..8eb3a3fd73c 100644 --- a/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html +++ b/app/scripts/modules/azure/loadBalancer/configure/healthCheck.html @@ -71,58 +71,4 @@
-
-
-

Advanced Settings

-
-
-
-
- Interval - -
-
- -
-
-
-
- Unhealthy Threshold - -
-
- -
-
-
-
- Timeout - -
-
- -
-
-
-
- Session persistence - -
-
- -
-
-
-
diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js index 97a10f743bb..a82392aa42e 100644 --- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js +++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js @@ -127,6 +127,7 @@ module.exports = angular $uibModal.open({ templateUrl: require('../configure/editLoadBalancer.html'), controller: 'azureCreateLoadBalancerCtrl as ctrl', + size: 'lg', resolve: { application: function() { return app; diff --git a/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js index fafe10cd512..2efb5fd6469 100644 --- a/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js +++ b/app/scripts/modules/azure/loadBalancer/loadBalancer.transformer.js @@ -62,6 +62,9 @@ module.exports = angular } toEdit.probes = elb.probes; + if (elb.dnsName && elb.dnsName !== 'dns-not-found') { + toEdit.dnsName = elb.dnsName.split('.')[0]; + } } return toEdit; }