Skip to content

Commit 971c192

Browse files
authored
Merge pull request #2744 from OctopusDeploy/main
Update to main current
2 parents 2722e71 + efe145c commit 971c192

File tree

14 files changed

+1049
-778
lines changed

14 files changed

+1049
-778
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"watch": "onchange 'src/**/*.{js,mjs,ts,astro,css}' 'public/docs/js/**/*.js' 'public/docs/css/**/*.css' -- prettier --write --plugin=prettier-plugin-astro {{changed}}"
2424
},
2525
"dependencies": {
26-
"@astrojs/mdx": "^4.2.3",
27-
"@pnpm/exe": "^10.8.0",
28-
"astro": "^5.6.1",
29-
"astro-accelerator-utils": "^0.3.40",
30-
"cspell": "^8.18.1",
31-
"glob": "^11.0.1",
26+
"@astrojs/mdx": "^4.3.0",
27+
"@pnpm/exe": "^10.11.1",
28+
"astro": "^5.9.0",
29+
"astro-accelerator-utils": "^0.3.43",
30+
"cspell": "^8.19.4",
31+
"glob": "^11.0.2",
3232
"gray-matter": "^4.0.3",
3333
"hast-util-from-selector": "^3.0.1",
3434
"html-to-text": "^9.0.5",
@@ -39,7 +39,7 @@
3939
"sharp": "^0.33.5"
4040
},
4141
"devDependencies": {
42-
"@playwright/test": "^1.51.1",
42+
"@playwright/test": "^1.52.0",
4343
"csv-parse": "^5.6.0",
4444
"npm-run-all": "^4.1.5",
4545
"onchange": "^7.1.0",

pnpm-lock.yaml

Lines changed: 851 additions & 645 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/pages/docs/octopus-cloud/disaster-recovery.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
layout: src/layouts/Default.astro
33
pubDate: 2023-01-01
4-
modDate: 2024-04-23
4+
modDate: 2025-06-06
55
title: Disaster recovery for Octopus Cloud
66
navTitle: Disaster recovery
7-
navOrder: 40
8-
description: How to work with your data and disaster recovery in an Octopus Cloud instance.
7+
navOrder: 90
8+
description: How to work with your data and disaster recovery in Octopus Cloud
99
---
1010

1111
This page describes the disaster recovery procedure and data imports/exports for Octopus Cloud.
1212

1313
## Disaster Recovery Procedure
1414

15-
Octopus Deploy hosts the cloud offering (Octopus Cloud) on Microsoft Azure utilizing several Azure services. Octopus Deploy shall endeavor to ensure business continuity of Octopus Cloud in the event of any disaster. Octopus Cloud disaster resiliency and recovery are largely determined by the disaster recovery measures that are provided by these services, in addition to the Customer's own disaster recovery preparations such as determining which restore point to use for the recovery. Depending upon the nature of the event, Octopus Deploy's response may be limited to assisting customers and Azure support to restore service.
15+
Octopus Deploy hosts the cloud offering (Octopus Cloud) on Microsoft Azure utilizing several Azure services. Octopus Deploy shall endeavor to ensure business continuity of Octopus Cloud in the event of any disaster. Octopus Cloud disaster resiliency and recovery are largely determined by the disaster recovery measures that are provided by these services, in addition to the Customer's own disaster recovery preparations such as determining which restore point to use for the recovery. Depending upon the nature of the event, Octopus Deploy's response may be limited to assisting customers and Azure support to restore service.
1616

17-
Consequently, this information is provided as guidance information only and does not form part of our Customer Agreement, nor does it affect or limit the operation of any force majeure releases. Customers should ensure that they have their own disaster recovery procedures in place following disaster recovery best practice.
17+
Consequently, this information is provided as guidance information only and does not form part of our Customer Agreement, nor does it affect or limit the operation of any force majeure releases. Customers should ensure that they have their own disaster recovery procedures in place following disaster recovery best practice.
1818

1919
### Customer instances
2020

@@ -31,9 +31,9 @@ For further information, customers should refer to [Microsoft's disaster recover
3131

3232
### Octopus Cloud administration portal (internal system)
3333

34-
The Octopus Cloud administration portal is used to manage customer instances.
34+
The Octopus Cloud administration portal is used to manage customer instances.
3535

36-
Note: The portal is hosted in a separate Azure region from customer instances and is not required to be online for continuity of service to customers. The disaster recovery measures taken, as detailed below, will allow the portal to be restored according to the following table:
36+
Note: The portal is hosted in a separate Azure region from customer instances and is not required to be online for continuity of service to customers. The disaster recovery measures taken, as detailed below, will allow the portal to be restored according to the following table:
3737

3838
| Level of Disaster | Impact | Data Redundancy | Data durability | RTO | RPO | Parties involved |
3939
|------------------------------------------------|----------------------------------------|----------------------------------------|-----------------|-------------------------------|---------------------------------------------|------------------------------|
@@ -48,7 +48,7 @@ For further information, customers should refer to [Microsoft's disaster recover
4848

4949
### Azure region failure
5050

51-
In the case of an Azure region wide disaster the time to restore services will vary depending on the nature of the disaster. For short duration outages the best strategy may be to wait for Microsoft to restore services within the region. In the case of region wide disasters affecting customer instances, for longer duration disasters restoration of services will entail provisioning a new customer instance in a new Azure region (in the same PII jurisdiction) and restoring the customer's database from the geo-redundant backup. For customer instances and the Octopus Cloud portal the time to restore operations is estimated to be 24 hrs once a new region is made available by Microsoft. The RPO in is 1 hr or to the customer specified restore point, as applicable. Note that there is not a geo-redundant copy of the Octopus Cloud File store, and the customer will need to re-build, upload, and/or regenerate any required packages and artifacts, as required by their deployments.
51+
In the case of an Azure region wide disaster the time to restore services will vary depending on the nature of the disaster. For short duration outages the best strategy may be to wait for Microsoft to restore services within the region. In the case of region wide disasters affecting customer instances, for longer duration disasters restoration of services will entail provisioning a new customer instance in a new Azure region (in the same PII jurisdiction) and restoring the customer's database from the geo-redundant backup. For customer instances and the Octopus Cloud portal the time to restore operations is estimated to be 24 hrs once a new region is made available by Microsoft. The RPO in is 1 hr or to the customer specified restore point, as applicable. Note that there is not a geo-redundant copy of the Octopus Cloud File store, and the customer will need to re-build, upload, and/or regenerate any required packages and artifacts, as required by their deployments.
5252

5353
### Definitions
5454

src/pages/docs/octopus-cloud/dynamic-worker.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
layout: src/layouts/Default.astro
33
pubDate: 2025-03-07
4-
modDate: 2025-03-07
4+
modDate: 2025-06-06
55
title: Dynamic workers
6-
navOrder: 45
7-
description: Describes what dynamic workers are, how they work, their limitations and other worker type options available for Octopus Cloud
6+
navTitle: Dynamic workers
7+
navOrder: 50
8+
description: What dynamic workers are, how they work, their limitations and other worker options available for Octopus Cloud
89
---
910

1011
[Workers](docs/infrastructure/workers) are machines that can execute tasks that don’t need to be run on the Octopus Server or individual deployment targets.

0 commit comments

Comments
 (0)