@spinnaker/amazon 0.8.7 → 0.8.11

package/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.controller.ts

@@ -1,129 +0,0 @@
-import { IComponentController, IScope } from 'angular';
-import { IModalServiceInstance } from 'angular-ui-bootstrap';
-import { cloneDeep } from 'lodash';
-import { Subject } from 'rxjs';
-
-import { Application, IServerGroup, TaskMonitor } from '@spinnaker/core';
-
-import { IUpsertScalingPolicyCommand, ScalingPolicyWriter } from '../ScalingPolicyWriter';
-import {
-  ICustomizedMetricSpecification,
-  ITargetTrackingConfiguration,
-  ITargetTrackingPolicy,
-} from '../../../../domain';
-
-export type MetricType = 'custom' | 'predefined';
-
-export interface ITargetTrackingState {
-  metricType: MetricType;
-  unit: string;
-  scaleInChanged: boolean;
-}
-
-export interface ITargetTrackingPolicyCommand extends IUpsertScalingPolicyCommand {
-  estimatedInstanceWarmup: number;
-  targetTrackingConfiguration: ITargetTrackingConfiguration;
-}
-
-export class UpsertTargetTrackingController implements IComponentController {
-  public predefinedMetrics = ['ASGAverageCPUUtilization', 'ASGAverageNetworkOut', 'ASGAverageNetworkIn'];
-  public statistics = ['Average', 'Maximum', 'Minimum', 'SampleCount', 'Sum'];
-  public alarmUpdated = new Subject();
-
-  public taskMonitor: TaskMonitor;
-  public state: ITargetTrackingState;
-  public command: ITargetTrackingPolicyCommand;
-
-  public static $inject = ['$uibModalInstance', 'policy', 'serverGroup', 'application', '$scope'];
-  constructor(
-    private $uibModalInstance: IModalServiceInstance,
-    public policy: ITargetTrackingPolicy,
-    public serverGroup: IServerGroup,
-    public application: Application,
-    private $scope: IScope,
-  ) {}
-
-  public $onInit() {
-    const metricType = this.policy.targetTrackingConfiguration.customizedMetricSpecification ? 'custom' : 'predefined';
-    this.command = this.buildCommand();
-    this.state = {
-      metricType,
-      unit: null,
-      scaleInChanged: false,
-    };
-  }
-
-  public metricTypeChanged = (type: MetricType) => {
-    this.state.metricType = type;
-  };
-
-  public toggleMetricType = (): void => {
-    const config = this.command.targetTrackingConfiguration;
-    if (this.state.metricType === 'predefined') {
-      config.predefinedMetricSpecification = null;
-      config.customizedMetricSpecification = {
-        metricName: 'CPUUtilization',
-        namespace: 'AWS/EC2',
-        dimensions: [{ name: 'AutoScalingGroupName', value: this.serverGroup.name }],
-        statistic: 'Average',
-      };
-      this.state.metricType = 'custom';
-    } else {
-      config.customizedMetricSpecification = null;
-      config.predefinedMetricSpecification = {
-        predefinedMetricType: 'ASGAverageCPUUtilization',
-      };
-      this.state.metricType = 'predefined';
-    }
-  };
-
-  public updateUnit = (unit: string) => {
-    this.state.unit = unit;
-  };
-
-  public scaleInChanged(): void {
-    this.state.scaleInChanged = true;
-  }
-
-  public alarmChanged = (newAlarm: ICustomizedMetricSpecification) => {
-    this.command.targetTrackingConfiguration.customizedMetricSpecification = newAlarm;
-    this.alarmUpdated.next();
-  };
-
-  public commandChanged = (updatedCommand: ITargetTrackingPolicyCommand) => {
-    this.$scope.$applyAsync(() => {
-      this.command = updatedCommand;
-    });
-  };
-
-  public cancel(): void {
-    this.$uibModalInstance.dismiss();
-  }
-
-  public save(): void {
-    const action = this.policy.policyName ? 'Update' : 'Create';
-    const command = cloneDeep(this.command);
-    this.taskMonitor = new TaskMonitor({
-      application: this.application,
-      title: `${action} scaling policy for ${this.serverGroup.name}`,
-      modalInstance: this.$uibModalInstance,
-      submitMethod: () => ScalingPolicyWriter.upsertScalingPolicy(this.application, command),
-    });
-
-    this.taskMonitor.submit();
-  }
-
-  private buildCommand(): ITargetTrackingPolicyCommand {
-    return {
-      type: 'upsertScalingPolicy',
-      cloudProvider: 'aws',
-      credentials: this.serverGroup.account,
-      region: this.serverGroup.region,
-      serverGroupName: this.serverGroup.name,
-      adjustmentType: null,
-      name: this.policy.policyName,
-      estimatedInstanceWarmup: this.policy.estimatedInstanceWarmup || 600,
-      targetTrackingConfiguration: { ...this.policy.targetTrackingConfiguration },
-    };
-  }
-}

package/src/serverGroup/details/scalingPolicy/targetTracking/upsertTargetTracking.modal.html

@@ -1,94 +0,0 @@
-<div modal-page class="scaling-policy-modal form-inline">
-  <task-monitor monitor="$ctrl.taskMonitor"></task-monitor>
-  <modal-close dismiss="$dismiss()"></modal-close>
-  <div class="modal-header">
-    <h4 class="modal-title">{{$ctrl.policy.policyName ? "Update" : "Create"}} scaling policy</h4>
-  </div>
-  <div class="modal-body">
-    <form name="form" novalidate>
-      <h4 class="section-heading">Target Metric</h4>
-      <target-metric-fields
-        allow-dual-mode="true"
-        cloudwatch="false"
-        command="$ctrl.command"
-        is-custom-metric="$ctrl.state.metricType === 'custom'"
-        server-group="$ctrl.serverGroup"
-        toggle-metric-type="$ctrl.metricTypeChanged"
-        unit="$ctrl.state.unit"
-        update-command="$ctrl.commandChanged"
-        update-unit="$ctrl.updateUnit"
-      ></target-metric-fields>
-      <h4 class="section-heading">Additional Settings</h4>
-      <div class="section-body section-additional-settings">
-        <div class="row" ng-if="$ctrl.policy.policyName">
-          <div class="col-md-2 sm-label-right">Policy Name</div>
-          <div class="col-md-10 content-fields">
-            <span class="form-control-static select-placeholder" ng-bind="$ctrl.policy.policyName"></span>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-md-2 sm-label-right">Warmup</div>
-          <div class="col-md-10 content-fields">
-            <span class="form-control-static select-placeholder">Instances need</span>
-            <input
-              type="number"
-              style="width: 60px"
-              class="form-control input-sm"
-              required
-              ng-model="$ctrl.command.estimatedInstanceWarmup"
-            />
-            <span class="input-label"> seconds to warm up </span>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-md-2 sm-label-right">Scale In</div>
-          <div class="col-md-9">
-            <div class="checkbox" style="margin-top: 5px">
-              <label>
-                <input
-                  type="checkbox"
-                  ng-model="$ctrl.command.targetTrackingConfiguration.disableScaleIn"
-                  ng-change="$ctrl.scaleInChanged()"
-                />
-                Disable Scale-downs
-              </label>
-              <div class="small" style="margin-top: 5px">
-                <p>
-                  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.
-                </p>
-                <p>This is useful when you have special requirements, such as gradual or delayed scale-down.</p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="row" ng-if="$ctrl.state.scaleInChanged">
-          <div class="col-md-10 col-md-offset-1 well">
-            <div ng-if="$ctrl.command.targetTrackingConfiguration.disableScaleIn">
-              This policy will not scale down. Make sure you have another policy (either TT or Step) that will scale
-              down this ASG.
-            </div>
-            <div ng-if="!$ctrl.command.targetTrackingConfiguration.disableScaleIn">
-              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.
-            </div>
-          </div>
-        </div>
-      </div>
-    </form>
-  </div>
-
-  <div class="modal-footer">
-    <button class="btn btn-default" ng-click="$ctrl.cancel()">Cancel</button>
-    <submit-button
-      is-disabled="!form.$valid || $ctrl.taskMonitor.submitting"
-      submitting="$ctrl.taskMonitor.submitting"
-      on-click="$ctrl.save()"
-      is-new="!$ctrl.policy.policyName"
-    ></submit-button>
-  </div>
-</div>

package/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.js

@@ -1,20 +0,0 @@
-import { module } from 'angular';
-import { react2angular } from 'react2angular';
-import { withErrorBoundary } from '@spinnaker/core';
-
-import { SimplePolicyAction } from './SimplePolicyAction';
-
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT =
-  'spinnaker.amazon.serverGroup.details.scalingPolicy.upsert.actions.simplePolicy';
-export const name = AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT; // for backwards compatibility
-
-module(AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT, []).component(
-  'awsSimplePolicyAction',
-  react2angular(withErrorBoundary(SimplePolicyAction, 'awsSimplePolicyAction'), [
-    'adjustmentType',
-    'adjustmentTypeChanged',
-    'operator',
-    'scalingAdjustment',
-    'updateScalingAdjustment',
-  ]),
-);

package/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js

@@ -1,248 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-import { linen } from 'color-name';
-import { cloneDeep } from 'lodash';
-
-import { TaskMonitor } from '@spinnaker/core';
-
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_ADDITIONAL_SETTINGS_COMPONENT } from './ScalingPolicyAdditionalSettings';
-import { ScalingPolicyWriter } from '../ScalingPolicyWriter';
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_ALARM_ALARMCONFIGURER_COMPONENT } from './alarm/alarmConfigurer.component';
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARM_CONFIGURER_COMPONENT } from './alarm/awsAlarmConfigurer.component';
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT } from './simple/simplePolicyAction.component';
-import { STEP_POLICY_ACTION_COMPONENT } from './step/stepPolicyAction.component';
-
-import './upsertScalingPolicy.modal.less';
-
-export const AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER =
-  'spinnaker.amazon.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller';
-export const name = AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER; // for backwards compatibility
-module(AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER, [
-  AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_SIMPLE_SIMPLEPOLICYACTION_COMPONENT,
-  STEP_POLICY_ACTION_COMPONENT,
-  AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_ALARM_ALARMCONFIGURER_COMPONENT,
-  AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARM_CONFIGURER_COMPONENT,
-  AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_ADDITIONAL_SETTINGS_COMPONENT,
-]).controller('awsUpsertScalingPolicyCtrl', [
-  '$uibModalInstance',
-  'serverGroup',
-  'application',
-  'policy',
-  '$scope',
-  function ($uibModalInstance, serverGroup, application, policy, $scope) {
-    this.serverGroup = serverGroup;
-
-    this.viewState = {
-      isNew: !policy.policyARN,
-      multipleAlarms: policy.alarms.length > 1,
-      metricsLoaded: false,
-      namespacesLoaded: false,
-    };
-
-    function createCommand() {
-      return {
-        name: policy.policyName,
-        serverGroupName: serverGroup.name,
-        credentials: serverGroup.account,
-        region: serverGroup.region,
-        provider: serverGroup.type,
-        adjustmentType: policy.adjustmentType,
-        minAdjustmentMagnitude: policy.minAdjustmentMagnitude || 1,
-      };
-    }
-
-    function initializeAlarm(command, policy) {
-      const alarm = policy.alarms[0];
-      command.alarm = {
-        name: alarm.alarmName,
-        region: serverGroup.region,
-        actionsEnabled: true,
-        alarmDescription: alarm.alarmDescription,
-        comparisonOperator: alarm.comparisonOperator,
-        dimensions: alarm.dimensions,
-        evaluationPeriods: alarm.evaluationPeriods,
-        period: alarm.period,
-        threshold: alarm.threshold,
-        namespace: alarm.namespace,
-        metricName: alarm.metricName,
-        statistic: alarm.statistic,
-        unit: alarm.unit,
-        alarmActionArns: alarm.alarmActions,
-        insufficientDataActionArns: alarm.insufficientDataActions,
-        okActionArns: alarm.okActions,
-      };
-    }
-
-    this.initialize = () => {
-      const command = createCommand();
-
-      initializeAlarm(command, policy);
-
-      if (command.adjustmentType === 'ExactCapacity') {
-        this.viewState.operator = 'Set to';
-        this.viewState.adjustmentType = 'instances';
-      } else {
-        let adjustmentBasis = policy.scalingAdjustment;
-        if (policy.stepAdjustments && policy.stepAdjustments.length) {
-          adjustmentBasis = policy.stepAdjustments[0].scalingAdjustment;
-        }
-        this.viewState.operator = adjustmentBasis > 0 ? 'Add' : 'Remove';
-        this.viewState.adjustmentType = policy.adjustmentType === 'ChangeInCapacity' ? 'instances' : 'percent of group';
-      }
-
-      if (policy.stepAdjustments && policy.stepAdjustments.length) {
-        initializeStepPolicy(command, policy);
-      } else {
-        initializeSimplePolicy(command, policy);
-      }
-
-      this.command = command;
-    };
-
-    function initializeStepPolicy(command, policy) {
-      const threshold = command.alarm.threshold;
-      command.step = {
-        estimatedInstanceWarmup: policy.estimatedInstanceWarmup || command.cooldown || 600,
-        metricAggregationType: 'Average',
-      };
-      command.step.stepAdjustments = policy.stepAdjustments.map((adjustment) => {
-        const step = {
-          scalingAdjustment: Math.abs(adjustment.scalingAdjustment),
-        };
-        if (adjustment.metricIntervalUpperBound !== undefined) {
-          step.metricIntervalUpperBound = adjustment.metricIntervalUpperBound + threshold;
-        }
-        if (adjustment.metricIntervalLowerBound !== undefined) {
-          step.metricIntervalLowerBound = adjustment.metricIntervalLowerBound + threshold;
-        }
-        return step;
-      });
-    }
-
-    function initializeSimplePolicy(command, policy) {
-      command.simple = {
-        cooldown: policy.cooldown || 600,
-        scalingAdjustment: Math.abs(policy.scalingAdjustment) || 1,
-      };
-    }
-
-    this.commandChanged = (updatedCommand) => {
-      this.$scope.$applyAsync(() => {
-        this.command = updatedCommand;
-      });
-    };
-
-    this.scalingAdjustmentChanged = (adjustment) => {
-      this.command.simple.scalingAdjustment = adjustment;
-    };
-
-    this.stepsChanged = (newSteps) => {
-      this.command.step.stepAdjustments = newSteps;
-      this.boundsChanged();
-    };
-
-    this.alarmChanged = (newAlarm) => {
-      this.command.alarm = newAlarm;
-    };
-
-    this.adjustmentTypeChanged = (action, type) => {
-      this.viewState.operator = action;
-      this.viewState.adjustmentType = type;
-      const newType =
-        type !== 'instances' ? 'PercentChangeInCapacity' : action === 'Set to' ? 'ExactCapacity' : 'ChangeInCapacity';
-      this.command.adjustmentType = newType;
-    };
-
-    this.boundsChanged = () => {
-      const source = this.viewState.comparatorBound === 'min' ? 'metricIntervalLowerBound' : 'metricIntervalUpperBound';
-      const target = source === 'metricIntervalLowerBound' ? 'metricIntervalUpperBound' : 'metricIntervalLowerBound';
-
-      if (this.command.step) {
-        const steps = this.command.step.stepAdjustments;
-        steps.forEach((step, index) => {
-          if (steps.length > index + 1) {
-            steps[index + 1][target] = step[source];
-          }
-        });
-        // remove the source boundary from the last step
-        delete steps[steps.length - 1][source];
-      }
-    };
-
-    this.switchMode = () => {
-      const command = this.command;
-      const cooldownOrWarmup = command.step ? command.step.estimatedInstanceWarmup : command.simple.cooldown;
-      if (command.step) {
-        const policy = { cooldown: cooldownOrWarmup };
-        delete command.step;
-        initializeSimplePolicy(command, policy);
-      } else {
-        const stepAdjustments = [
-          {
-            scalingAdjustment: command.simple.scalingAdjustment,
-          },
-        ];
-        if (this.viewState.comparatorBound === 'min') {
-          stepAdjustments[0].metricIntervalUpperBound = 0;
-        } else {
-          stepAdjustments[0].metricIntervalLowerBound = 0;
-        }
-        delete command.simple;
-        initializeStepPolicy(command, {
-          estimatedInstanceWarmup: cooldownOrWarmup,
-          stepAdjustments: stepAdjustments,
-        });
-        this.boundsChanged();
-      }
-    };
-
-    this.action = this.viewState.isNew ? 'Create' : 'Edit';
-
-    const prepareCommandForSubmit = () => {
-      const command = cloneDeep(this.command);
-
-      if (command.adjustmentType !== 'PercentChangeInCapacity') {
-        delete command.minAdjustmentMagnitude;
-      }
-
-      if (command.step) {
-        // adjust metricIntervalLowerBound/UpperBound for each step based on alarm threshold
-        command.step.stepAdjustments.forEach((step) => {
-          if (this.viewState.operator === 'Remove') {
-            step.scalingAdjustment = 0 - step.scalingAdjustment;
-            delete command.step.estimatedInstanceWarmup;
-          }
-          if (step.metricIntervalLowerBound !== undefined) {
-            step.metricIntervalLowerBound -= command.alarm.threshold;
-          }
-          if (step.metricIntervalUpperBound !== undefined) {
-            step.metricIntervalUpperBound -= command.alarm.threshold;
-          }
-        });
-      } else {
-        if (this.viewState.operator === 'Remove') {
-          command.simple.scalingAdjustment = 0 - command.simple.scalingAdjustment;
-        }
-      }
-      return command;
-    };
-
-    this.taskMonitor = new TaskMonitor({
-      application: application,
-      title: this.action + ' scaling policy for ' + serverGroup.name,
-      modalInstance: $uibModalInstance,
-    });
-
-    this.save = () => {
-      const command = prepareCommandForSubmit();
-      const submitMethod = () => ScalingPolicyWriter.upsertScalingPolicy(application, command);
-
-      this.taskMonitor.submit(submitMethod);
-    };
-
-    this.cancel = $uibModalInstance.dismiss;
-
-    this.initialize();
-  },
-]);

package/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html

@@ -1,74 +0,0 @@
-<div modal-page class="scaling-policy-modal form-inline">
-  <task-monitor monitor="ctrl.taskMonitor"></task-monitor>
-  <modal-close dismiss="$dismiss()"></modal-close>
-  <div class="modal-header">
-    <h4 class="modal-title">{{ctrl.action}} scaling policy</h4>
-  </div>
-  <div class="modal-body">
-    <form name="form" novalidate>
-      <h4 class="section-heading">Conditions</h4>
-      <div class="section-body">
-        <alarm-configurer
-          alarm="ctrl.command.alarm"
-          multiple-alarms="ctrl.viewState.multipleAlarms"
-          server-group="ctrl.serverGroup"
-          step-adjustments="ctrl.command.step.stepAdjustments"
-          steps-changed="ctrl.stepsChanged"
-          update-alarm="ctrl.alarmChanged"
-        ></alarm-configurer>
-      </div>
-      <h4 class="section-heading">Actions</h4>
-      <div class="section-body" ng-if="!ctrl.command.alarm.metricName">
-        <h4 class="text-center">Select a metric</h4>
-      </div>
-      <div class="section-body" ng-if="ctrl.command.alarm.metricName">
-        <div ng-if="ctrl.command.simple">
-          <div class="row">
-            <div class="col-md-10 col-md-offset-1">
-              <p>
-                This is a simple scaling policy. To declare different actions based on the magnitude of the alarm,
-                <strong>switch to a <a href ng-click="ctrl.switchMode()">step policy</a>.</strong>
-              </p>
-            </div>
-          </div>
-          <aws-simple-policy-action
-            adjustment-type="ctrl.viewState.adjustmentType"
-            adjustment-type-changed="ctrl.adjustmentTypeChanged"
-            operator="ctrl.viewState.operator"
-            scaling-adjustment="ctrl.command.simple.scalingAdjustment"
-            update-scaling-adjustment="ctrl.scalingAdjustmentChanged"
-          ></aws-simple-policy-action>
-        </div>
-        <div ng-if="ctrl.command.step">
-          <step-policy-action
-            adjustment-type="ctrl.viewState.adjustmentType"
-            adjustment-type-changed="ctrl.adjustmentTypeChanged"
-            alarm="ctrl.command.alarm"
-            is-min="ctrl.viewState.comparatorBound === 'min'"
-            operator="ctrl.viewState.operator"
-            step="ctrl.command.step"
-            steps-changed="ctrl.stepsChanged"
-          >
-          </step-policy-action>
-        </div>
-      </div>
-      <scaling-policy-additional-settings
-        command="ctrl.command"
-        is-instance-type="ctrl.viewState.adjustmentType === 'instances'"
-        is-new="ctrl.viewState.isNew"
-        operator="ctrl.viewState.operator"
-        update-command="ctrl.commandChanged"
-      ></scaling-policy-additional-settings>
-    </form>
-  </div>
-
-  <div class="modal-footer">
-    <button class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
-    <submit-button
-      is-disabled="!form.$valid"
-      submitting="taskMonitor.submitting"
-      on-click="ctrl.save()"
-      is-new="ctrl.viewState.isNew"
-    ></submit-button>
-  </div>
-</div>

package/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.less

@@ -1,32 +0,0 @@
-.scaling-policy-modal {
-  input,
-  select {
-    margin: 0 5px;
-  }
-  span.input-label,
-  .select-placeholder {
-    display: inline-block;
-    font-size: 12px;
-  }
-
-  .section-additional-settings {
-    .row {
-      margin-bottom: 10px;
-    }
-
-    .number-input-sm {
-      width: 60px;
-    }
-  }
-
-  aws-alarm-configurer > .row {
-    margin-bottom: 10px;
-  }
-
-  .sm-label-right {
-    padding-right: 5px;
-  }
-  .content-fields {
-    padding-left: 0;
-  }
-}