fix(monitored deploy): add deploymentId parameter (#3255)

Monitors need an ability to correlate calls to their API.
This adds a `deploymentId` parameter to all requests (which is really the `stageId` for the `createServerGroup` stage)
This allows the monitor to correlate e.g. `evaluateHealth @ 20%` and `evaluateHealth @ 50%` to the same cluster
Especially if multiple shards are deployed in the same pipeline

orca-deploymentmonitor/src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/models/RequestBase.java

@@ -16,20 +16,59 @@
 
 package com.netflix.spinnaker.orca.deploymentmonitor.models;
 
+import com.netflix.spinnaker.orca.deploymentmonitor.DeploymentMonitorService;
 import com.netflix.spinnaker.orca.pipeline.model.Stage;
 import java.util.Map;
 import lombok.Data;
 
 @Data
 public class RequestBase {
+  /** Name of the application which is being deployed */
   private String application;
+
+  /**
+   * The execution ID of this deployment This ID will stay the same through the execution of this
+   * pipeline (e.g. {@link DeploymentMonitorService#notifyStarting}, {@link
+   * DeploymentMonitorService#notifyCompleted}, and {@link DeploymentMonitorService#evaluateHealth})
+   * will all receive the same executionId For example, if there are 3 clusters deployed in a given
+   * pipeline with the monitored strategy all will get the same execution ID
+   */
   private String executionId;
+
+  /**
+   * Stage ID for this request -this ID is always unique. A call to {@link
+   * DeploymentMonitorService#notifyStarting} and {@link DeploymentMonitorService#evaluateHealth}
+   * for the same cluster deployment will have a different stageId HOWEVER, it will stay the same
+   * for multiple calls to {@link DeploymentMonitorService#evaluateHealth} for the same
+   * percentage/step of the same deployment
+   */
   private String stageId;
+
+  /**
+   * ID of this deployment This ID will stay the same across all calls to the monitor for a given
+   * cluster deployment
+   */
+  private String deploymentId;
+
+  /** Previous server group name */
   private String oldServerGroup;
+
+  /** New server group name */
   private String newServerGroup;
+
+  /** Account the new server group is being deployed to */
   private String account;
+
+  /** Region/location the new server group is being deployed to */
   private String region;
+
+  /** Cloud provider used to deploy the new server group */
   private String cloudProvider;
+
+  /**
+   * Parameters, as specified by the user in their pipeline configuration This is an opaque map -
+   * Spinnaker doesn't use this information
+   */
   private Map<String, Object> parameters;
 
   public RequestBase() {}
@@ -42,6 +81,7 @@ protected void fromStage(Stage stage) {
     application = stage.getExecution().getApplication();
     executionId = stage.getExecution().getId();
     stageId = stage.getId();
+    deploymentId = stage.getParentStageId();
 
     MonitoredDeployInternalStageData stageData =
         stage.mapTo(MonitoredDeployInternalStageData.class);