@spinnaker/titus 0.4.8 → 0.5.3

package/dist/serverGroup/details/scalingPolicy/upsert/TitusScalingPolicyCommandBuilderService.d.ts

@@ -0,0 +1,9 @@
+import { IAmazonServerGroup, IScalingPolicy, IStepPolicyDescription, ITargetTrackingPolicy, IUpsertAlarmDescription, IUpsertScalingPolicyCommand } from '@spinnaker/amazon';
+declare type PolicyType = 'Step' | 'TargetTracking';
+export declare const TitusScalingPolicyCommandBuilder: {
+    buildAlarm: (policy: IScalingPolicy, region: string) => IUpsertAlarmDescription;
+    buildStepPolicy: (policy: IScalingPolicy, threshold: number, cooldown: number) => IStepPolicyDescription;
+    buildNewCommand: (type: PolicyType, serverGroup: IAmazonServerGroup, policy: ITargetTrackingPolicy) => IUpsertScalingPolicyCommand;
+    prepareCommandForUpsert: (command: IUpsertScalingPolicyCommand, isRemove: boolean) => IUpsertScalingPolicyCommand;
+};
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/titus",
   "license": "Apache-2.0",
-  "version": "0.4.8",
+  "version": "0.5.3",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,9 +13,9 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/amazon": "^0.8.5",
-    "@spinnaker/core": "^0.9.1",
-    "@spinnaker/docker": "^0.0.105",
+    "@spinnaker/amazon": "^0.8.9",
+    "@spinnaker/core": "^0.11.2",
+    "@spinnaker/docker": "^0.0.109",
     "@spinnaker/mocks": "1.0.7",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
@@ -44,5 +44,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "7a3e89eee4e351ae7177bc77de642c9fd54788ff"
+  "gitHead": "de4f3f2b9379e8e4ec9ab20bfe69a4e566a48cf3"
 }

package/src/serverGroup/details/scalingPolicy/upsert/TitusScalingPolicyCommandBuilderService.ts

@@ -0,0 +1,119 @@
+import { cloneDeep } from 'lodash';
+
+import {
+  IAmazonServerGroup,
+  IScalingPolicy,
+  IScalingPolicyAlarmView,
+  IStepAdjustment,
+  IStepPolicyDescription,
+  ITargetTrackingPolicy,
+  IUpsertAlarmDescription,
+  IUpsertScalingPolicyCommand,
+} from '@spinnaker/amazon';
+
+type PolicyType = 'Step' | 'TargetTracking';
+
+export const TitusScalingPolicyCommandBuilder = {
+  buildAlarm: (policy: IScalingPolicy, region: string): IUpsertAlarmDescription => {
+    const alarm = policy?.alarms[0] as IScalingPolicyAlarmView;
+    return {
+      comparisonOperator: alarm.comparisonOperator,
+      region,
+      dimensions: alarm.dimensions,
+      disableEditingDimensions: alarm.disableEditingDimensions,
+      evaluationPeriods: alarm.evaluationPeriods,
+      metricName: alarm.metricName,
+      namespace: alarm.namespace,
+      period: alarm.period,
+      statistic: alarm.statistic,
+      threshold: alarm.threshold,
+      unit: alarm.unit,
+    } as IUpsertAlarmDescription;
+  },
+
+  buildStepPolicy: (policy: IScalingPolicy, threshold: number, cooldown: number): IStepPolicyDescription => {
+    const stepAdjustments = policy.stepAdjustments.map((adjustment) => {
+      const step = {
+        scalingAdjustment: Math.abs(adjustment.scalingAdjustment),
+      } as IStepAdjustment;
+
+      if (adjustment.metricIntervalUpperBound !== undefined) {
+        step.metricIntervalUpperBound = adjustment.metricIntervalUpperBound + threshold;
+      }
+      if (adjustment.metricIntervalLowerBound !== undefined) {
+        step.metricIntervalLowerBound = adjustment.metricIntervalLowerBound + threshold;
+      }
+
+      return step;
+    });
+
+    return {
+      cooldown: cooldown || 600,
+      estimatedInstanceWarmup: cooldown || 600,
+      metricAggregationType: 'Average',
+      stepAdjustments,
+    };
+  },
+
+  buildNewCommand: (
+    type: PolicyType,
+    serverGroup: IAmazonServerGroup,
+    policy: ITargetTrackingPolicy,
+  ): IUpsertScalingPolicyCommand => {
+    const command = {
+      adjustmentType: type === 'Step' ? policy.adjustmentType : null,
+      cloudProvider: serverGroup.cloudProvider,
+      credentials: serverGroup.account,
+      jobId: serverGroup.disabledDate,
+      name: policy.id,
+      region: serverGroup.region,
+      scalingPolicyID: policy.id,
+      serverGroupName: serverGroup.name,
+    } as IUpsertScalingPolicyCommand;
+
+    if (type === 'Step') {
+      command.alarm = TitusScalingPolicyCommandBuilder.buildAlarm(policy, serverGroup.region);
+      command.minAdjustmentMagnitude = policy.minAdjustmentMagnitude || 1;
+      command.step = TitusScalingPolicyCommandBuilder.buildStepPolicy(
+        policy,
+        command.alarm.threshold,
+        command.cooldown,
+      );
+    }
+
+    if (type === 'TargetTracking') {
+      command.targetTrackingConfiguration = { ...policy.targetTrackingConfiguration };
+    }
+
+    return command;
+  },
+
+  prepareCommandForUpsert: (command: IUpsertScalingPolicyCommand, isRemove: boolean): IUpsertScalingPolicyCommand => {
+    const commandToSubmit = cloneDeep(command);
+
+    if (commandToSubmit.adjustmentType !== 'PercentChangeInCapacity') {
+      delete commandToSubmit.minAdjustmentMagnitude;
+    }
+
+    if (commandToSubmit.step) {
+      // adjust metricIntervalLowerBound/UpperBound for each step based on alarm threshold
+      commandToSubmit.step.stepAdjustments.forEach((step) => {
+        if (isRemove) {
+          step.scalingAdjustment = 0 - step.scalingAdjustment;
+          delete commandToSubmit.step.estimatedInstanceWarmup;
+        }
+        if (step.metricIntervalLowerBound !== undefined) {
+          step.metricIntervalLowerBound -= commandToSubmit.alarm.threshold;
+        }
+        if (step.metricIntervalUpperBound !== undefined) {
+          step.metricIntervalUpperBound -= commandToSubmit.alarm.threshold;
+        }
+      });
+    } else {
+      if (isRemove) {
+        command.simple.scalingAdjustment = 0 - command.simple.scalingAdjustment;
+      }
+    }
+    return commandToSubmit;
+  },
+};

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

@@ -107,6 +107,10 @@ module(TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_UPSERT_UPSERTSCALINGPOLICY_CONTRO
         this.boundsChanged();
       };
 
+      this.alarmChanged = (newAlarm) => {
+        this.command.alarm = newAlarm;
+      };
+
       this.adjustmentTypeChanged = (action, type) => {
         this.viewState.operator = action;
         this.viewState.adjustmentType = type;

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

@@ -13,16 +13,18 @@
           see a metric below, click "Configure available metrics" in the server group details to set up forwarding from
           Atlas to CloudWatch.
         </p>
-        <aws-alarm-configurer
-          command="ctrl.command"
-          modal-view-state="ctrl.viewState"
+        <alarm-configurer
+          alarm="ctrl.command.alarm"
+          multiple-alarms="ctrl.viewState.multipleAlarms"
           server-group="ctrl.alarmServerGroup"
-          bounds-changed="ctrl.boundsChanged()"
-        ></aws-alarm-configurer>
+          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">
+      <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">