Merge remote-tracking branch 'origin/main' into bobjwalker/m1-platform-hub-recommendations

Author: BobJWalker

src/pages/docs/approvals/jira-service-management/index.md

@@ -241,6 +241,22 @@ The following list assumes the linked change is in an **approved** state.
 
 **If at any time a `Planned end` is exceeded and the linked change request is not approved, the deployment will be terminated.**
 
+## Available Variables in a Deployment or Runbook
+
+:::div{.info}
+The following variables are only available in version 2025.4 and later
+:::
+
+| Variable | Notes |
+|--|--|
+| `Octopus.JiraServiceManagement.ChangeRequest.Number` | The number of the matched or created change request | 
+| `Octopus.JiraServiceManagement.ChangeRequest.Id` | The system identifier of the matched or created change request |
+| `Octopus.JiraServiceManagement.Connection.Id` |  |
+| `Octopus.JiraServiceManagement.Connection.Name` | |
+| `Octopus.JiraServiceManagement.Connection.BaseUrl` | |
+| `Octopus.JiraServiceManagement.Connection.Username` | |
+| `Octopus.JiraServiceManagement.Connection.Token` | |
+
 ## Known issues and limitations
 
 - Once an Issue is deemed to be related to a deployment, then only this Issue will be evaluated for 

src/pages/docs/approvals/servicenow/index.md

@@ -273,7 +273,6 @@ The expected ServiceNow value doesn't always align with the displayed value. In
 
 For a full list of available fields and values refer to the [ServiceNow docs](https://developer.servicenow.com/dev.do#!/reference/api/utah/rest/change-management-api).
 
-
 ### Respecting change windows
 
 :::div{.warning}
@@ -293,6 +292,24 @@ The following list assumes the linked change is in an **approved** state.
 
 **If at any time a `Planned end date` is exceeded and the linked change request is not approved, the deployment will be terminated.**
 
+## Available Variables in a Deployment or Runbook
+
+:::div{.info}
+The following variables are only available in version 2025.4 and later
+:::
+
+| Variable | Notes |
+|--|--|
+| `Octopus.ServiceNow.ChangeRequest.Number` | The number of the matched or created change request | 
+| `Octopus.ServiceNow.ChangeRequest.SysId` | The system identifier of the matched or created change request |
+| `Octopus.ServiceNow.Connection.Id` |  |
+| `Octopus.ServiceNow.Connection.Name` | |
+| `Octopus.ServiceNow.Connection.BaseUrl` | |
+| `Octopus.ServiceNow.Connection.OAuthClientId` | |
+| `Octopus.ServiceNow.Connection.OAuthClientSecret` | |
+| `Octopus.ServiceNow.Connection.Username` | |
+| `Octopus.ServiceNow.Connection.Password` | |
+
 ## Known Issues and limitations
 
 - Once a CR is deemed to be related to a deployment, then only this CR will be evaluated for the deployment to proceed. If the CR is incorrect, you will need to cancel the deployment, close the CR and try the deployment again.

src/pages/docs/kubernetes/targets/kubernetes-agent/index.md

@@ -79,11 +79,11 @@ The Kubernetes agent follows [semantic versioning](https://semver.org/), so a ma
 | ---------------- | ------------------------ | -------------------- |
 | 1.0.0 - 1.16.1   | **2024.2.6580** or newer | **1.26** to **1.29** |
 | 1.17.0 - 1.19.2  | **2024.2.6580** or newer | **1.27** to **1.30** |
-| 1.20.0 - 1.21.0 | **2024.2.6580** or newer | **1.28** to **1.31** |
+| 1.20.0 - 1.21.0  | **2024.2.6580** or newer | **1.28** to **1.31** |
 | 1.22.0 - 1.\*.\* | **2024.2.6580** or newer | **1.29** to **1.32** |
 | 2.0.0 - 2.2.1    | **2024.2.9396** or newer | **1.26** to **1.29** |
 | 2.3.0 - 2.8.2    | **2024.2.9396** or newer | **1.27** to **1.30** |
-| 2.9.0 - 2.11.3  | **2024.2.9396** or newer | **1.28** to **1.31** |
+| 2.9.0 - 2.11.3   | **2024.2.9396** or newer | **1.28** to **1.31** |
 | 2.12.0 - 2.25.1  | **2024.2.9396** or newer | **1.29** to **1.32** |
 | 2.26.0 - 2.\*.\* | **2024.2.9396** or newer | **1.30** to **1.33** |
 
@@ -243,12 +243,29 @@ MII...
 -----END CERTIFICATE-----
 ```
 
-Once encoded, this string can be provided as part of the agent installation helm command via the `agent.serverCertificate` helm value.
+Once encoded, this string can be provided as part of the agent installation helm command via the `global.serverCertificate` (or `agent.ServerCertificate`) helm value.
 
 To include this in the installation command, add the following to the generated installation command:
 
 ```bash
---set agent.serverCertificate="<base64-encoded-cert>"
+--set global.serverCertificate="<base64-encoded-cert>"
+```
+
+You can also opt to use an existing secret containing your certificate under the `octopus-server-certificate.pem` key with the following addition:
+
+```bash
+--set global.serverCertificateSecretName="octopus-server-certificate"
+```
+
+The referenced secret should take the form:
+
+```yaml
+apiVersion: v1
+kind: Secret
+metadata:
+  name: octopus-server-certificate
+data:
+  octopus-server-certificate.pem: "<base64-encoded-cert>"
 ```
 
 ## Agent tooling

src/pages/docs/octopus-ai/mcp/index.mdx

@@ -11,7 +11,7 @@ navOrder: 2
 
 ### Octopus MCP Server
 
-The upcoming Octopus MCP ([Model Context Protocol](https://modelcontextprotocol.io/)) server represents a significant leap forward in AI integration capabilities. Built on Anthropic's open standard for connecting AI assistants to external data sources and tools, the MCP server will enable AI assistants like Claude to interact directly with your Octopus Deploy infrastructure.
+The Octopus MCP ([Model Context Protocol](https://modelcontextprotocol.io/)) server represents a significant leap forward in AI integration capabilities. Built on Anthropic's open standard for connecting AI assistants to external data sources and tools, the MCP server enables AI assistants like Claude to interact directly with your Octopus Deploy infrastructure.
 
 The Octopus MCP server provides similar capabilities to the Octopus AI Assistant, but provides further benefits:
 
@@ -22,12 +22,18 @@ The MCP server provides tools designed to solve key use-cases within change mana
 
 The MCP server architecture ensures that your deployment data remains secure while enabling powerful AI-assisted workflows. All interactions are logged and auditable, maintaining the compliance and governance standards your organization requires.
 
-We are releasing the MCP server as an open source tool that anyone can contribute to. It is available for free on Github at [https://github.com/OctopusDeploy/mcp-server](https://github.com/OctopusDeploy/mcp-server)
+The Octopus MCP Server is open source, and anyone can contribute to it. It's available for free on Github at [https://github.com/OctopusDeploy/mcp-server](https://github.com/OctopusDeploy/mcp-server)
 
 :::div{.info}
 This project is currently in Early Access, and subject to breaking changes.
 :::
 
+## Security
+
+The Octopus MCP Server works by communicating with your Octopus instance's REST API via a secure HTTPS connection. It leverages Octopus Server's existing API Key security mechanism, ensuring all interactions are authenticated, authorized for the permissions associated with the API Key, and audited.
+
+To learn more, read our [Octopus REST API](/docs/octopus-rest-api) documentation.
+
 ## 🚀 Installation
 
 ### Requirements

src/pages/docs/octopus-cloud/index.mdx

@@ -22,31 +22,32 @@ We recommend Octopus Cloud over Octopus Server for the following reasons:
 
 ## Minimize downtime and increase resilience
 
-- We take care of any issues that arise so you don't have to worry about downtime, data loss, or disruptions
-  - Our 24x7 monitoring and alerting and proactive issue detection means problems get addressed before they impact your operations
-  - Automatic recovery with comprehensive [disaster recovery](https://octopus.com/docs/octopus-cloud/disaster-recovery#disaster-recovery-procedure) procedures means your data is safe and quickly recoverable in case of a failure
+- We take care of any issues that arise so you don't have to worry about downtime, data loss, or disruptions.
+  - Our 24x7 monitoring and alerting and proactive issue detection means problems get addressed before they impact your operations.
+  - Automatic recovery with comprehensive [disaster recovery](https://octopus.com/docs/octopus-cloud/disaster-recovery#disaster-recovery-procedure) procedures means your data is safe and quickly recoverable in case of a failure.
 
 ## Secure and compliant out-of-the-box
 
-- Peace of mind with internationally recognized security standards, ensuring business compliance and protecting your reputation
-  - ISO 27001 and SOC II certifications with regular audits, ensuring your deployments and data are safe and secure
-  - Data and application layer isolation per customer, so there are no noisy neighbors or cross-talk
-  - OpenID Connect (OIDC) support so you can integrate with other services securely and without needing to manage credentials
-  - Network security and static IP addresses
-  - Flexibility of hosting region choices
+- Peace of mind with internationally recognized security standards, ensuring business compliance and protecting your reputation.
+  - ISO 27001 and SOC II certifications with regular audits, ensuring your deployments and data are safe and secure.
+  - Data and application layer isolation per customer, so there are no noisy neighbors or cross-talk.
+  - OpenID Connect (OIDC) support so you can integrate with other services securely and without needing to manage credentials.
+  - Network security and static IP addresses.
+  - Flexibility of hosting region choices.
+  - With IP allow listing, you can control who can reach Octopus Cloud, securing your entry points and enhancing compliance. With Azure Private Links, communication is routed via a secure, private network path, ensuring the data doesn’t traverse the public internet. When combined, these controls eliminate external exposure, reduce attack surface, and align with stringent compliance and security policies.
 
 ## Increase team efficiency
 
-- Stay ahead of the competition with less time maintaining software and more time shipping new features
-  - Automatic upgrades to the latest version of Octopus, including improvements, bug fixes, security enhancements, and [new features](https://octopus.com/whatsnew) before they’re released on Octopus Server
-  - Expert support by experienced Octopus Support and Cloud Operations teams who swiftly resolve issues and provide regular maintenance
+- Stay ahead of the competition with less time maintaining software and more time shipping new features.
+  - Automatic upgrades to the latest version of Octopus, including improvements, bug fixes, security enhancements, and [new features](https://octopus.com/whatsnew) before they’re released on Octopus Server.
+  - Expert support by experienced Octopus Support and Cloud Operations teams who swiftly resolve issues and provide regular maintenance.
 
 ## Effortlessly scale your deployments
 
-- Your teams can scale their use without the hassle of resource management and additional infrastructure costs
-  - We provide appropriate resources and automatic scaling for seamless performance
-  - Ample bandwidth and storage resources to handle your data and traffic without additional costs
-  - Windows and Linux dynamic workers provide flexible and scalable deployment options
+- Your teams can scale their use without the hassle of resource management and additional infrastructure costs.
+  - We provide appropriate resources and automatic scaling for seamless performance.
+  - Ample bandwidth and storage resources to handle your data and traffic without additional costs.
+  - Windows and Linux dynamic workers provide flexible and scalable deployment options.
 
 :::figure
 ![Octopus Cloud architecture diagram](/docs/img/octopus-cloud/images/octopus-cloud-architecture-diagram.png)

src/pages/docs/octopus-rest-api/examples/bulk-operations/index.md

@@ -15,4 +15,7 @@ All the scripts in this section will include:
 - A list of what would've changed (when what-if is `True`), or what just changed (when what-if is `False`).
 - A "limiter" parameter that will limit the number of changes per run.  If you have 25 items to change, and the limit is set to 5, it will only change five items per run.  You'd need to run the script five times to change all 25 items.  This was added so you can do some test runs and spot-check the results.
 
-Provided sample bulk operations are:
+Provided sample bulk operations are:
+
+- [Bulk add a project to a list of tenants](/docs/octopus-rest-api/examples/bulk-operations/bulk-add-projects-to-tenants)
+- [Rerun all canceled deployments and runbook runs after node shutdown](/docs/octopus-rest-api/examples/bulk-operations/rerun-deployments-and-runbooks-after-node-shutdown)

src/pages/docs/platform-hub/process-templates/troubleshooting.md

@@ -3,32 +3,78 @@ layout: src/layouts/Default.astro
 pubDate: 2025-09-23
 modDate: 2025-09-23
 title: Troubleshooting
-subtitle: Common issues that you may run into
+subtitle: Known issues that you may run into
 icon: fa-solid fa-layer-group
 navTitle: Troubleshooting
 navSection: Process Templates
-description: Common issues and their fixes for process templates
+description: Known issues and limitations for process templates
 navOrder: 151
 ---
 
 ## Troubleshooting common issues
 
 You may run into a few issues when setting up your process templates. We've put together this page to help you diagnose and fix common issues.
 
+:::div{.warning}
+Process Templates is in Public Preview for all Enterprise Tier Customers. Below are known limitations with the public preview.
+:::
+
 ### Step support
 
-We have support for most Octopus steps, except for the following:
+Process templates currently supports most Octopus steps.  It currently doesn't support the following:
 
 1. Deploy a Bicep Template
 2. AWS S3 Create Bucket
 3. AWS ECS
 4. All Custom Step Templates
 5. All Community Step Templates
 
+This document will be updated as additional step support is added.
+
 ### Parameters and Variables
 
 If you are migrating an existing process to be used as a process template, you may run into a few issues when using parameters and variables in scripts. When copying a script from a step in a project into a process template step, you must convert project variables to use process template parameters. System variables will still work as normal.
 
+For example, consider this script that directly references project and system variables via `OctopusParameters`.  
+
+```
+$packagePath = $OctopusParameters["Octopus.Action.Package[Trident.Database].ExtractedPath"]
+$connectionString = $OctopusParameters["Project.Connection.String"]
+$environmentName = $OctopusParameters["Octopus.Environment.Name"]
+$reportPath = $OctopusParameters["Project.Database.Report.Path"]
+
+cd $packagePath
+$appToRun = ".\Octopus.Trident.Database.DbUp"
+$generatedReport = "$reportPath\UpgradeReport.html"
+
+& $appToRun --ConnectionString="$connectionString" --PreviewReportPath="$reportPath"
+
+New-OctopusArtifact -Path "$generatedReport" -Name "$environmentName.UpgradeReport.html"
+```
+
+The following variables should be updated to reference process templates parameters instead of project variables:
+
+1. `$packagePath`
+2. `$connectionString`
+3. `$reportPath`
+
+The `$environmentName` variable is fine, as system variables will continue to work as normal.  The updated script will be:
+
+```
+$packagePath = $OctopusParameters["Octopus.Action.Package[Template.Database.Package].ExtractedPath"]
+$connectionString = $OctopusParameters["Template.Database.ConnectionString"]
+$environmentName = $OctopusParameters["Octopus.Environment.Name"]
+$reportPath = $OctopusParameters["Template.Database.ChangeReportDirectory"]
+
+cd $packagePath
+$appToRun = ".\Octopus.Trident.Database.DbUp"
+$generatedReport = "$reportPath\UpgradeReport.html"
+
+& $appToRun --ConnectionString="$connectionString" --PreviewReportPath="$reportPath"
+
+New-OctopusArtifact -Path "$generatedReport" -Name "$environmentName.UpgradeReport.html"
+```
+
 ### Parameter scoping
 
 Project supplied values for parameters will always take precedence over process template supplied ones.
@@ -75,11 +121,18 @@ When deploying to the **Development** environment, **Account-124** would be used
 
 - You cannot configure **Edit YAML** on the **Configure and apply Kubernetes resource** step.
 - You cannot configure cloud target discovery on steps. You must use project variables when consuming a process template in a project instead.
-- You cannot pick the project Git repository source on any step.
+- When referencing a file from a Git repo, for example, script, manifest, Kustomize, etc., you cannot pick the project Git repository as the source.  You must supply the Git repository URL.  The URL can be passed in via a parameter or hardcoded in the template itself.  Hardcoding is not recommended.
 
 ### Cloning process templates
 
-You cannot clone a process template in Platform Hub through the Octopus UI. If you need to copy a deployment process from a process template, you can copy the OCL definition of the deployment process, and use it in another file to copy an existing process.
+You cannot clone a process template in Platform Hub through the Octopus UI.  The process for cloning a process template is:
+
+1. Clone the process template OCL file in the Platform Hub Git repository.
+2. Change the name of the cloned OCL file to the desired name.  
+3. Change the name of the process template in the OCL file.
+4. Commit and push the changes.
+5. Refresh the process template list in the Octopus Deploy UI and find the newly created template.
+6. Publish the template and configure the Spaces that have access to it.
 
 ### Platform Hub account limitations
 
@@ -95,7 +148,12 @@ Platform Hub accounts cannot be used in the following situations:
 
 ### Public API
 
-We do not currently have support for creating or managing process templates through the API, CLI or the Terraform provider. You should use the Octopus UI as much as possible to create or manage your process templates.
+We do not currently have support for creating or managing process templates through the API, CLI or the Terraform provider.  
+
+- Process templates are stored as code in the configured Git repository.  The OCL files store all relevant information about the template - including the parameters, the steps, name, description and other settings.  
+- The published versions and Spaces configured are stored and managed via the database.
+
+We recommend all users use the Octopus Deploy UI to manage process templates during the public preview.  Any processes or workflows you build outside of the Octopus Deploy UI is subject to change and without warning.  
 
 ### GitHub Connections