@spinnaker/titus 0.5.4 → 0.5.8

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

@@ -1,98 +0,0 @@
-import { IComponentController } from 'angular';
-import { IModalServiceInstance } from 'angular-ui-bootstrap';
-import { cloneDeep } from 'lodash';
-import { Subject } from 'rxjs';
-
-import {
-  ITargetTrackingConfiguration,
-  ITargetTrackingPolicy,
-  IUpsertScalingPolicyCommand,
-  ScalingPolicyWriter,
-} from '@spinnaker/amazon';
-import { Application, IServerGroup, TaskMonitor } from '@spinnaker/core';
-
-import { IAlarmRenderingServerGroup } from './targetTrackingSummary.component';
-
-export interface ITargetTrackingState {
-  unit: string;
-  scaleInChanged: boolean;
-}
-
-export interface ITargetTrackingPolicyCommand extends IUpsertScalingPolicyCommand {
-  jobId: string;
-  targetTrackingConfiguration: ITargetTrackingConfiguration;
-}
-
-export interface ITitusServerGroup extends IServerGroup {
-  id: string;
-}
-
-export interface ITitusTargetTrackingPolicy extends ITargetTrackingPolicy {
-  id?: string;
-}
-
-export class UpsertTargetTrackingController implements IComponentController {
-  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', 'alarmServerGroup', 'application'];
-  constructor(
-    private $uibModalInstance: IModalServiceInstance,
-    public policy: ITitusTargetTrackingPolicy,
-    public serverGroup: ITitusServerGroup,
-    public alarmServerGroup: IAlarmRenderingServerGroup,
-    public application: Application,
-  ) {}
-
-  public $onInit() {
-    this.command = this.buildCommand();
-    this.state = {
-      unit: null,
-      scaleInChanged: false,
-    };
-  }
-
-  public scaleInChanged(): void {
-    this.state.scaleInChanged = true;
-  }
-
-  public updateUnit = (unit: string) => {
-    this.state.unit = unit;
-  };
-
-  public cancel(): void {
-    this.$uibModalInstance.dismiss();
-  }
-
-  public save(): void {
-    const action = this.policy.id ? '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 {
-      scalingPolicyID: this.policy.id,
-      type: 'upsertScalingPolicy',
-      cloudProvider: 'titus',
-      jobId: this.serverGroup.id,
-      credentials: this.serverGroup.account,
-      region: this.serverGroup.region,
-      serverGroupName: this.serverGroup.name,
-      adjustmentType: null,
-      name: this.policy.id,
-      targetTrackingConfiguration: { ...this.policy.targetTrackingConfiguration },
-    };
-  }
-}

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

@@ -1,154 +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.id ? "Update" : "Create"}} scaling policy</h4>
-  </div>
-  <div class="modal-body">
-    <form name="form" novalidate>
-      <h4 class="section-heading">Target Metric</h4>
-      <div class="section-body">
-        <p>
-          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.
-        </p>
-        <p>
-          <b>Note:</b> 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.
-        </p>
-        <div class="row" style="margin-bottom: 10px">
-          <div class="col-md-2 sm-label-right">Metric</div>
-          <div class="col-md-10 content-fields">
-            <aws-metric-selector
-              alarm-updated="$ctrl.alarmUpdated"
-              alarm="$ctrl.command.targetTrackingConfiguration.customizedMetricSpecification"
-              server-group="$ctrl.alarmServerGroup"
-            ></aws-metric-selector>
-          </div>
-        </div>
-
-        <div class="row" style="margin-bottom: 10px">
-          <div class="col-md-2 sm-label-right">Target</div>
-          <div class="col-md-10 content-fields">
-            <select
-              class="form-control input-sm"
-              required
-              ng-model="$ctrl.command.targetTrackingConfiguration.customizedMetricSpecification.statistic"
-              ng-change="$ctrl.alarmUpdated.next()"
-              ng-options="stat for stat in $ctrl.statistics"
-            ></select>
-            <span class="input-label" style="vertical-align: top; margin-top: 7px"> of </span>
-            <div style="display: inline-block">
-              <input
-                type="number"
-                class="form-control input-sm"
-                style="width: 100px"
-                ng-change="$ctrl.alarmUpdated.next()"
-                ng-model="$ctrl.command.targetTrackingConfiguration.targetValue"
-              />
-              <span class="input-label" ng-bind="$ctrl.state.unit" ng-if="$ctrl.state.unit !== 'None'"></span>
-            </div>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-md-10 col-md-offset-1">
-            <div>
-              <target-tracking-chart
-                config="$ctrl.command.targetTrackingConfiguration"
-                alarm-updated="$ctrl.alarmUpdated"
-                server-group="$ctrl.alarmServerGroup"
-                unit="$ctrl.state.unit"
-                update-unit="$ctrl.updateUnit"
-              ></target-tracking-chart>
-            </div>
-          </div>
-        </div>
-      </div>
-      <h4 class="section-heading">Additional Settings</h4>
-      <div class="section-body section-additional-settings">
-        <div class="row">
-          <div class="col-md-3 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 Server Group 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 in
-              this ASG.
-            </div>
-            <div ng-if="!$ctrl.command.targetTrackingConfiguration.disableScaleIn">
-              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.
-            </div>
-          </div>
-        </div>
-
-        <div class="row" ng-if="!$ctrl.command.targetTrackingConfiguration.disableScaleIn">
-          <div class="col-md-3 sm-label-right">
-            Scale In Cooldown
-            <help-field key="titus.autoscaling.scaleIn.cooldown"></help-field>
-          </div>
-          <div class="col-md-9 content-fields">
-            <input
-              type="number"
-              style="width: 60px"
-              class="form-control input-sm"
-              required
-              ng-model="$ctrl.command.targetTrackingConfiguration.scaleInCooldown"
-            />
-            <span class="input-label"> seconds </span>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-md-3 sm-label-right">
-            Scale Out Cooldown
-            <help-field key="titus.autoscaling.scaleOut.cooldown"></help-field>
-          </div>
-          <div class="col-md-9 content-fields">
-            <input
-              type="number"
-              style="width: 60px"
-              class="form-control input-sm"
-              required
-              ng-model="$ctrl.command.targetTrackingConfiguration.scaleOutCooldown"
-            />
-            <span class="input-label"> seconds </span>
-          </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.id"
-    ></submit-button>
-  </div>
-</div>

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

@@ -1,188 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-import { cloneDeep } from 'lodash';
-
-import { ScalingPolicyWriter } from '@spinnaker/amazon';
-import { TaskMonitor } from '@spinnaker/core';
-
-export const TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER =
-  'spinnaker.titus.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller';
-export const name = TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER; // for backwards compatibility
-module(TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTROLLER, []).controller(
-  'titusUpsertScalingPolicyCtrl',
-  [
-    '$uibModalInstance',
-    'alarmServerGroup',
-    'serverGroup',
-    'application',
-    'policy',
-    function ($uibModalInstance, alarmServerGroup, serverGroup, application, policy) {
-      this.serverGroup = serverGroup;
-      // alarmServerGroup is used to trick the chart rendering into using AWS metrics
-      this.alarmServerGroup = alarmServerGroup;
-
-      this.viewState = {
-        isNew: !policy.id,
-        multipleAlarms: policy.alarms.length > 1,
-        metricsLoaded: false,
-        namespacesLoaded: false,
-      };
-
-      function createCommand() {
-        return {
-          scalingPolicyID: policy.id,
-          jobId: serverGroup.id,
-          serverGroupName: serverGroup.name,
-          credentials: serverGroup.account,
-          region: serverGroup.region,
-          cloudProvider: 'titus',
-          adjustmentType: policy.adjustmentType,
-          minAdjustmentMagnitude: policy.minAdjustmentMagnitude || 1,
-        };
-      }
-
-      function initializeAlarm(command, policy) {
-        const alarm = policy.alarms[0];
-        command.alarm = {
-          region: serverGroup.region,
-          comparisonOperator: alarm.comparisonOperator,
-          dimensions: alarm.dimensions,
-          disableEditingDimensions: alarm.disableEditingDimensions,
-          evaluationPeriods: alarm.evaluationPeriods,
-          period: alarm.period,
-          threshold: alarm.threshold,
-          namespace: alarm.namespace,
-          metricName: alarm.metricName,
-          statistic: alarm.statistic,
-          unit: alarm.unit,
-        };
-      }
-
-      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';
-        }
-
-        initializeStepPolicy(command, policy);
-
-        this.command = command;
-      };
-
-      function initializeStepPolicy(command, policy) {
-        const threshold = command.alarm.threshold;
-        command.step = {
-          cooldown: policy.cooldown || 300,
-          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;
-        });
-      }
-
-      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.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,88 +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">
-        <p>
-          <b>Note:</b> 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.
-        </p>
-        <alarm-configurer
-          alarm="ctrl.command.alarm"
-          multiple-alarms="ctrl.viewState.multipleAlarms"
-          server-group="ctrl.alarmServerGroup"
-          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 && !ctrl.command.alarm.name">
-        <h4 class="text-center">Select a metric</h4>
-      </div>
-      <div class="section-body" ng-if="ctrl.command.alarm.metricName">
-        <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"
-          step-adjustments="ctrl.command.step.stepAdjustments"
-          steps-changed="ctrl.stepsChanged"
-        ></step-policy-action>
-      </div>
-
-      <h4 class="section-heading">Additional Settings</h4>
-      <div class="section-body section-additional-settings">
-        <div class="row" ng-if="ctrl.viewState.adjustmentType !== 'instances'">
-          <div class="col-md-2 sm-label-right">Adjustment Step</div>
-          <div class="col-md-10 content-fields">
-            <span class="form-control-static select-placeholder">
-              <span ng-bind="ctrl.viewState.operator"></span>
-              instances in increments of at least
-            </span>
-            <input
-              type="number"
-              style="width: 60px"
-              class="form-control input-sm"
-              required
-              ng-model="ctrl.command.minAdjustmentMagnitude"
-            />
-            <span class="input-label"> instance(s) </span>
-          </div>
-        </div>
-        <div class="row" ng-if="ctrl.viewState.operator !== 'Remove'">
-          <div class="col-md-2 sm-label-right">Cooldown <help-field key="titus.autoscaling.cooldown"></help-field></div>
-          <div class="col-md-10 content-fields">
-            <input
-              type="number"
-              style="width: 60px"
-              class="form-control input-sm"
-              required
-              ng-model="ctrl.command.step.cooldown"
-            />
-            <span class="input-label"> seconds </span>
-          </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"
-      submitting="taskMonitor.submitting"
-      on-click="ctrl.save()"
-      is-new="ctrl.viewState.isNew"
-    ></submit-button>
-  </div>
-</div>