feat(aws/netflix): Add UX for specifying ASG Metrics

See also spinnaker/spinnaker#1548. These changes introduce an Group Metrics (EnabledMetrics) Advanced Setting. Exposing the EnabledMetrics property we added support for in spinnaker/clouddriver#1563.
spinnaker · Apr 11, 2017 · a85edd1 · a85edd1
1 parent 88ec307
commit a85edd1
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 2 deletions.
diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js
@@ -56,6 +56,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service
             },
             targetHealthyDeployPercentage: 100,
             cooldown: 10,
+            enabledMetrics: [],
             healthCheckType: 'EC2',
             healthCheckGracePeriod: 600,
             instanceMonitoring: false,
@@ -145,6 +146,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service
           { asgName: serverGroup.name, region: serverGroup.region }
         ],
         cooldown: serverGroup.asg.defaultCooldown,
+        enabledMetrics: angular.copy(serverGroup.asg.enabledMetrics),
         healthCheckGracePeriod: serverGroup.asg.healthCheckGracePeriod,
         healthCheckType: serverGroup.asg.healthCheckType,
         terminationPolicies: angular.copy(serverGroup.asg.terminationPolicies),
@@ -190,6 +192,7 @@ module.exports = angular.module('spinnaker.aws.serverGroupCommandBuilder.service
           freeFormDetails: serverGroupName.freeFormDetails,
           credentials: serverGroup.account,
           cooldown: serverGroup.asg.defaultCooldown,
+          enabledMetrics: serverGroup.asg.enabledMetrics,
           healthCheckGracePeriod: serverGroup.asg.healthCheckGracePeriod,
           healthCheckType: serverGroup.asg.healthCheckType,
           terminationPolicies: serverGroup.asg.terminationPolicies,

diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js
@@ -31,11 +31,13 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [
                                                           serverGroupCommandRegistry, autoScalingProcessService) {
 
 
-    var healthCheckTypes = ['EC2', 'ELB'],
+    var enabledMetrics = ['GroupMinSize', 'GroupMaxSize', 'GroupDesiredCapacity', 'GroupInServiceInstances', 'GroupPendingInstances', 'GroupStandbyInstances', 'GroupTerminatingInstances', 'GroupTotalInstances'],
+      healthCheckTypes = ['EC2', 'ELB'],
       terminationPolicies = ['OldestInstance', 'NewestInstance', 'OldestLaunchConfiguration', 'ClosestToNextInstanceHour', 'Default'];
 
     function configureUpdateCommand(command) {
       command.backingData = {
+        enabledMetrics: angular.copy(enabledMetrics),
         healthCheckTypes: angular.copy(healthCheckTypes),
         terminationPolicies: angular.copy(terminationPolicies)
       };
@@ -85,6 +87,7 @@ module.exports = angular.module('spinnaker.aws.serverGroup.configure.service', [
         keyPairs: keyPairsReader.listKeyPairs(),
         packageImages: imageLoader,
         instanceTypes: awsInstanceTypeService.getAllTypesByRegion(),
+        enabledMetrics: $q.when(angular.copy(enabledMetrics)),
         healthCheckTypes: $q.when(angular.copy(healthCheckTypes)),
         terminationPolicies: $q.when(angular.copy(terminationPolicies)),
       }).then(function(backingData) {

diff --git a/...ules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html b/...ules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html
@@ -21,6 +21,23 @@
                                  class="form-control input-sm no-spel"
                                  ng-model="$ctrl.command.cooldown"/></div>&nbsp;seconds
   </div>
+  <div class="form-group">
+    <div class="col-md-5 sm-label-right">
+      <b>Enabled Metrics</b>
+      <help-field key="aws.serverGroup.enabledMetrics"></help-field>
+    </div>
+    <div class="col-md-6">
+
+      <ui-select multiple ng-model="$ctrl.command.enabledMetrics" class="form-control input-sm">
+        <ui-select-match>{{$item}}</ui-select-match>
+        <ui-select-choices repeat="enabledMetric in $ctrl.command.backingData.enabledMetrics | filter: $select.search | orderBy: 'toString()'">
+          <span ng-bind-html="enabledMetric | highlight: $select.search"></span>
+        </ui-select-choices>
+      </ui-select>
+
+    </div>
+  </div>
+
   <div class="form-group">
     <div class="col-md-5 sm-label-right"><b>Health Check Type</b></div>
     <div class="col-md-6">
@@ -87,7 +104,11 @@
                                  ng-model="$ctrl.command.base64UserData"/></div>
   </div>
   <div class="form-group">
-    <div class="col-md-5 sm-label-right"><b>Instance Monitoring</b></div>
+    <div class="col-md-5 sm-label-right">
+      <b>Instance Monitoring</b>
+      <help-field key="aws.serverGroup.instanceMonitoring"></help-field>
+    </div>
+
     <div class="col-md-6 checkbox">
       <label><input type="checkbox" ng-model="$ctrl.command.instanceMonitoring"/> Enable Instance Monitoring </label>
     </div>

diff --git a/...ts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/...ts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html
@@ -12,6 +12,22 @@ <h3>Edit Advanced Settings for {{serverGroup.name}}</h3>
                                      class="form-control input-sm"
                                      ng-model="command.cooldown"/></div>&nbsp;seconds
       </div>
+      <div class="form-group">
+        <div class="col-md-5 sm-label-right">
+          <b>Enabled Metrics</b>
+          <help-field key="aws.serverGroup.enabledMetrics"></help-field>
+        </div>
+        <div class="col-md-6">
+
+          <ui-select multiple ng-model="$ctrl.command.enabledMetrics" class="form-control input-sm">
+            <ui-select-match>{{$item}}</ui-select-match>
+            <ui-select-choices repeat="enabledMetric in $ctrl.command.backingData.enabledMetrics | filter: $select.search | orderBy: 'toString()'">
+              <span ng-bind-html="enabledMetric | highlight: $select.search"></span>
+            </ui-select-choices>
+          </ui-select>
+
+        </div>
+      </div>
       <div class="form-group">
         <div class="col-md-5 sm-label-right"><b>Health Check Type</b></div>
         <div class="col-md-6">

diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.html
@@ -273,6 +273,8 @@ <h3 select-on-dbl-click>
       <dl class="horizontal-when-filters-collapsed">
         <dt>Cooldown</dt>
         <dd>{{ctrl.serverGroup.asg.defaultCooldown}} seconds</dd>
+        <dt>Enabled Metrics</dt>
+        <dd>{{ctrl.serverGroup.asg.enabledMetrics.join(', ')}}</dd>
         <dt>Health Check Type</dt>
         <dd>{{ctrl.serverGroup.asg.healthCheckType}}</dd>
         <dt>Grace Period</dt>

diff --git a/app/scripts/modules/core/help/helpContents.js b/app/scripts/modules/core/help/helpContents.js
diff --git a/app/scripts/modules/netflix/serverGroup/awsServerGroupDetails.html b/app/scripts/modules/netflix/serverGroup/awsServerGroupDetails.html
@@ -271,6 +271,8 @@ <h3 select-on-dbl-click>
       <dl class="horizontal-when-filters-collapsed">
         <dt>Cooldown</dt>
         <dd>{{ctrl.serverGroup.asg.defaultCooldown}} seconds</dd>
+        <dt>Enabled Metrics</dt>
+        <dd>{{ctrl.serverGroup.asg.enabledMetrics.join(', ')}}</dd>
         <dt>Health Check Type</dt>
         <dd>{{ctrl.serverGroup.asg.healthCheckType}}</dd>
         <dt>Grace Period</dt>