@spinnaker/google 0.1.11 → 0.2.0

package/dist/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicySelector.component.d.ts

@@ -0,0 +1 @@
+export const GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT: "spinnaker.gce.autoScalingPolicy.selector.component";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/google",
   "license": "Apache-2.0",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.20.0",
+    "@spinnaker/core": "^0.22.0",
     "@uirouter/angularjs": "1.0.26",
     "angular": "1.6.10",
     "angular-ui-bootstrap": "2.5.0",
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@spinnaker/eslint-plugin": "^3.0.1",
-    "@spinnaker/scripts": "^0.2.5",
+    "@spinnaker/scripts": "^0.3.0",
     "@types/angular": "1.6.26",
     "@types/angular-mocks": "1.5.10",
     "@types/angular-ui-bootstrap": "0.13.41",
@@ -37,5 +37,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "d5ceedd9f745e6f1156f6b5e25275cc311d4f0ab"
+  "gitHead": "3efb67c7d040c3b549e9d3f589663f4e70c74390"
 }

package/src/autoscalingPolicy/IGceAutoscalingPolicy.ts

@@ -18,5 +18,5 @@ export interface IGceAutoscalingCpuUtilization {
 
 export enum GcePredictiveMethod {
   NONE = 'NONE',
-  STANDARD = 'STANDARD',
+  STANDARD = 'OPTIMIZE_AVAILABILITY',
 }

package/src/autoscalingPolicy/components/metricSettings/metricSettings.component.html

@@ -3,7 +3,7 @@
     <ng-form name="cpuUtilization">
       <div ng-if="$ctrl.showMetric('cpuUtilization')">
         <div class="row">
-          <div class="col-md-3 sm-label-right">
+          <div class="col-md-4 sm-label-right">
             Utilization Target (%)
             <help-field key="gce.serverGroup.scalingPolicy.cpuUtilization"></help-field>
           </div>
@@ -97,12 +97,13 @@
 <collapsible-section heading="Custom Metric Utilizations" expanded="true" subsection="true">
   <div class="section-body" ng-repeat="custom in $ctrl.policy.customMetricUtilizations track by $index">
     <hr ng-if="$index > 0" />
+
     <div class="row">
       <div class="col-md-3 sm-label-right">Metric Identifier</div>
-      <div class="col-md-2 content-fields">
+      <div class="col-md-3 content-fields">
         <input class="form-control input-sm" required ng-model="custom.metric" />
       </div>
-      <div class="col-md-offset-5 col-md-1">
+      <div class="col-md-offset-4 col-md-1">
         <button class="btn btn-sm btn-default" ng-click="$ctrl.deleteMetric('customMetricUtilizations', $index)">
           <span class="glyphicon glyphicon-trash visible-lg-inline"></span>
           <span class="visible-lg-inline">Delete</span>
@@ -110,32 +111,86 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-md-3 sm-label-right">
-        Utilization Target
-        <help-field key="gce.serverGroup.scalingPolicy.customMetricUtilizations"></help-field>
+      <div class="col-md-3 sm-label-right">Additional Filter Expression</div>
+      <div class="col-md-3 content-fields">
+        <input class="form-control input-sm" ng-model="custom.additionalFilter" />
       </div>
-      <div class="col-md-2 content-fields">
-        <input
-          type="number"
-          name="utilizationTarget"
-          class="form-control input-sm"
-          required
-          ng-model="custom.utilizationTarget"
-        />
-      </div>
-      <div class="col-md-2">
+    </div>
+
+    <div class="row">
+      <div class="col-md-3 sm-label-right">Metric Export Scope</div>
+      <div class="col-md-3">
         <select
           class="form-control input-sm"
-          style="margin: 0px"
-          ng-options="value as displayValue for (value, displayValue) in $ctrl.targetTypesToDisplayMap"
-          ng-model="custom.utilizationTargetType"
+          ng-options="value as displayValue for (value, displayValue) in $ctrl.metricScopeTypesToDisplayMap"
+          ng-model="custom.metricExportScope"
           required
-        >
-          <option value="">-- Target Type --</option>
-        </select>
+        ></select>
       </div>
-      <div class="col-md-5 error-message" ng-if="custom.utilizationTarget <= 0">
-        Utilization target must be greater than 0.0.
+    </div>
+
+    <div ng-if="$ctrl.isSingleTimeSeriesPerGroup('SINGLE_TIME_SERIES_PER_GROUP', $index)">
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Scaling Policy</div>
+        <div class="col-md-3">
+          <select
+            class="form-control input-sm"
+            ng-options="value as displayValue for (value, displayValue) in $ctrl.scalingpolicyTypesToDisplayMap"
+            ng-model="custom.scalingpolicy"
+            required
+          ></select>
+        </div>
+      </div>
+
+      <div ng-if="$ctrl.isScalingPolicySingleInstanceAssignment('SINGLE_INSTANCE_ASSIGNMENT', $index)">
+        <div class="row">
+          <div class="col-md-3 sm-label-right">Single Instance Assignment</div>
+          <div class="col-md-3 content-fields">
+            <input
+              type="number"
+              name="singleInstanceAssignment"
+              class="form-control input-sm"
+              required
+              ng-model="custom.singleInstaceAssignment"
+              min="0"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      ng-if="
+        !$ctrl.isScalingPolicySingleInstanceAssignment('SINGLE_INSTANCE_ASSIGNMENT', $index) ||
+        !$ctrl.isSingleTimeSeriesPerGroup('SINGLE_TIME_SERIES_PER_GROUP', $index)
+      "
+    >
+      <div class="row">
+        <div class="col-md-3 sm-label-right">
+          Utilization Target
+          <help-field key="gce.serverGroup.scalingPolicy.customMetricUtilizations"></help-field>
+        </div>
+        <div class="col-md-3 content-fields">
+          <input
+            type="number"
+            name="utilizationTarget"
+            class="form-control input-sm"
+            required
+            ng-model="custom.utilizationTarget"
+          />
+        </div>
+        <div class="col-md-3">
+          <select
+            class="form-control input-sm"
+            ng-options="value as displayValue for (value, displayValue) in $ctrl.targetTypesToDisplayMap"
+            ng-model="custom.utilizationTargetType"
+            required
+          >
+            <option value="">-- Target Type --</option>
+          </select>
+        </div>
+        <div class="col-md-5 error-message" ng-if="custom.utilizationTarget <= 0">
+          Utilization target must be greater than 0.0.
+        </div>
       </div>
     </div>
   </div>
@@ -143,9 +198,11 @@
     <span class="glyphicon glyphicon-plus-sign"></span> Add custom metric
   </button>
 </collapsible-section>
-<div class="col-md-12" ng-if="$ctrl.showNoMetricsWarning()">
-  <div class="alert alert-warning text-center">
-    <i class="fa fa-exclamation-triangle pull-left"></i>
-    <span>At least one metric is required.</span>
+<div class="row">
+  <div class="col-md-12" ng-if="$ctrl.showNoMetricsWarning()">
+    <div class="alert alert-warning text-center">
+      <i class="fa fa-exclamation-triangle pull-left"></i>
+      <span>At least one metric is required.</span>
+    </div>
   </div>
 </div>

package/src/autoscalingPolicy/components/metricSettings/metricSettings.component.js

@@ -30,6 +30,16 @@ module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONE
         DELTA_PER_MINUTE: 'Delta / minute',
       };
 
+      this.metricScopeTypesToDisplayMap = {
+        TIME_SERIES_PER_INSTANCE: 'Time series per instance',
+        SINGLE_TIME_SERIES_PER_GROUP: 'Single time series per group',
+      };
+
+      this.scalingpolicyTypesToDisplayMap = {
+        UTILIZATION_TARGET: 'Utilization target',
+        SINGLE_INSTANCE_ASSIGNMENT: 'singleInstanceAssignment',
+      };
+
       this.addMetric = (metricType) => {
         if (multipleAllowedFor[metricType]) {
           this.policy[metricType] = this.policy[metricType] || [];
@@ -54,6 +64,14 @@ module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONE
         return !emptyOrUndefined(metric);
       };
 
+      this.isSingleTimeSeriesPerGroup = (scopeType, index) => {
+        if (this.policy.customMetricUtilizations[index].metricExportScope === scopeType) return true;
+      };
+
+      this.isScalingPolicySingleInstanceAssignment = (policyType, index) => {
+        if (this.policy.customMetricUtilizations[index].scalingpolicy === policyType) return true;
+      };
+
       this.showNoMetricsWarning = () => {
         return _.every(
           metricTypes.map((type) => {

package/src/autoscalingPolicy/components/scalingSchedules/scalingSchedules.component.html

@@ -0,0 +1,84 @@
+<ng-form name="scalingSchedulesForm">
+  <div class="section-body" ng-repeat="schedule in $ctrl.policy.scalingSchedules track by $index">
+    <ng-form name="scalingSchedule">
+      <hr ng-if="$index > 0" />
+
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Name</div>
+        <div class="col-md-3 content-fields">
+          <input class="form-control input-sm" required ng-model="schedule.scheduleName" />
+        </div>
+        <div class="col-md-offset-4 col-md-1">
+          <button class="btn btn-sm btn-default" ng-click="$ctrl.deleteSchedule('scalingSchedules', $index)">
+            <span class="glyphicon glyphicon-trash visible-lg-inline"></span>
+            <span class="visible-lg-inline">Delete</span>
+          </button>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Description</div>
+        <div class="col-md-3 content-fields">
+          <input class="form-control input-sm" ng-model="schedule.scheduleDescription" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Enabled</div>
+        <input type="checkbox" class="col-md-1" ng-model="schedule.enabled" value="{schedule.enabled}" />
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Minimum required instances</div>
+        <div class="col-md-3 content-fields">
+          <input
+            type="number"
+            name="minimumRequiredInstances"
+            class="form-control input-sm"
+            min="0"
+            required
+            ng-model="schedule.minimumRequiredInstances"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">
+          CRON Expression
+          <help-field key="gce.serverGroup.scalingPolicy.cronExpression"></help-field>
+        </div>
+        <div class="col-md-3 content-fields">
+          <input class="form-control input-sm" required ng-model="schedule.scheduleCron" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Time Zone</div>
+        <div class="col-md-3">
+          <gce-timezone-select
+            available-timezones="$ctrl.timezones"
+            selected-timezone="$ctrl.policy.scalingSchedules[$index].timezone"
+            select-timezone="$ctrl.selectTimezone"
+            target="$index"
+          ></gce-timezone-select>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 sm-label-right">Duration (seconds)</div>
+        <div class="col-md-3 content-fields">
+          <input
+            type="number"
+            name="duration"
+            class="form-control input-sm"
+            required
+            ng-model="schedule.duration"
+            min="301"
+          />
+        </div>
+        <div class="col-md-4 error-message" ng-if="scalingSchedule.duration.$error.min">
+          Must be greater than 300 seconds.
+        </div>
+      </div>
+    </ng-form>
+  </div>
+  <div class="schedule-container">
+    <button class="add-new col-md-12" ng-click="$ctrl.addSchedule('scalingSchedules')">
+      <span class="glyphicon glyphicon-plus-sign"></span> Add Scaling Schedule
+    </button>
+  </div>
+</ng-form>

package/src/autoscalingPolicy/components/scalingSchedules/scalingSchedules.component.js

@@ -0,0 +1,59 @@
+'use strict';
+
+import { module } from 'angular';
+import _ from 'lodash';
+import timezones from './standardTimezone.json';
+
+export const GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT =
+  'spinnaker.deck.gce.autoscalingPolicy.scalingSchedules.component';
+export const name = GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT; // for backwards compatibility
+module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT, []).component(
+  'gceAutoscalingPolicyScalingSchedules',
+  {
+    bindings: {
+      policy: '=',
+      updatePolicy: '<',
+    },
+    templateUrl: require('./scalingSchedules.component.html'),
+    controller: function () {
+      const multipleAllowedFor = {
+        scalingSchedules: true,
+      };
+
+      this.timezones = timezones;
+
+      this.addSchedule = (scheduleType) => {
+        if (multipleAllowedFor[scheduleType]) {
+          this.policy[scheduleType] = this.policy[scheduleType] || [];
+          this.policy[scheduleType].push({});
+        } else if (emptyOrUndefined(this.policy[scheduleType])) {
+          this.policy[scheduleType] = {};
+        }
+      };
+
+      this.deleteSchedule = (scheduleType, index) => {
+        if (multipleAllowedFor[scheduleType]) {
+          this.policy[scheduleType].splice(index, 1);
+        } else {
+          // sending an empty object to the API deletes the policy.
+          this.policy[scheduleType] = {};
+        }
+      };
+
+      this.selectTimezone = (timezone, index) => {
+        const { scalingSchedules } = this.policy;
+        const schedule = scalingSchedules[index];
+        scalingSchedules[index] = { ...schedule, timezone };
+
+        this.updatePolicy({
+          ...this.policy,
+          scalingSchedules: [...scalingSchedules],
+        });
+      };
+
+      function emptyOrUndefined(value) {
+        return _.isEqual(value, {}) || _.isUndefined(value);
+      }
+    },
+  },
+);