You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Select the child projects you want to upgrade, and click **Update selected children**.
11
-
The overview will then change to show the progress and status for updating the various child projects.
9
+
Select the child projects you want to upgrade, and click **Update selected children**. The overview will then change to show the progress and status for updating the various child projects.
12
10
13
11
The outcome of the update will result in one of three statuses:
14
-
- Updated has completed
15
-
- Error while updating from upstream
16
-
- Encountered a merge conflict so abandoning update
12
+
13
+
* Updated has completed
14
+
* Error while updating from upstream
15
+
* Encountered a merge conflict so abandoning update
17
16
18
17
A merge conflict is something you currently need to handle manually in order to push future updates to the child project, which encountered a merge conflict upon updating.
19
18
@@ -23,44 +22,47 @@ A merge conflict is something you currently need to handle manually in order to
23
22
24
23
**Note:** Since the following documentation was outlined we've made quite a few improvements to the Baseline workflow. For the most part this documentation is still relevant and we are working on getting them updated with the latest details.
25
24
26
-
In order to resolve the conflict you need to go to the **child site** open up the SCM / Kudu site for the development environment. Click the “[link]” (see screenshot above) for the project (see screenshot above) and find clone url for the development site, which is similar to this: `https://dev-my-website-alias.scm.umbraco.io/c565ead8-7a27-4696-9ab4-dad7eba2cd2c.git` and remove everything after the last slash, so you have a url that looks like this: `https://dev-my-website-alias.scm.umbraco.io`
25
+
In order to resolve the conflict you need to go to the **child site** open up the SCM / Kudu site for the development environment. Click the “\[link]” (see screenshot above) for the project (see screenshot above) and find clone url for the development site, which is similar to this: `https://dev-my-website-alias.scm.umbraco.io/c565ead8-7a27-4696-9ab4-dad7eba2cd2c.git` and remove everything after the last slash, so you have a url that looks like this: `https://dev-my-website-alias.scm.umbraco.io`
27
26
28
27
29
28
30
-
You will be prompted to login to the SCM / Kudu site - use the credentials you normally use to login to the Umbraco Cloud portal.
31
-
Now click “Debug console” from the top menu and select “CMD”. This will take you to a command line interface from where you need to navigate to the repository folder: site / repository
29
+
You will be prompted to login to the SCM / Kudu site - use the credentials you normally use to login to the Umbraco Cloud portal. Now click “Debug console” from the top menu and select “CMD”. This will take you to a command line interface from where you need to navigate to the repository folder: site / repository
32
30
33
31
34
32
35
-
From here you need to merge the branch (upstream/master), which contains the updates which were fetched from the Baseline project.
36
-
In the console enter:
37
-
`git merge upstream/master`
33
+
From here you need to merge the branch (upstream/master), which contains the updates which were fetched from the Baseline project. In the console enter: `git merge upstream/master`
38
34
39
35
This will result in an output showing the files, which contains conflicts that you need to resolve in order to fully merge the two branches:
CONFLICT (content): Merge conflict in data/Revision/documents/77279e39-ed1f-428a-ad7e-258db5f9e6ee.courier
42
+
Automatic merge failed; fix conflicts and then commit the result.
43
+
```
46
44
47
45
In the above output two files are listed and we want to pick the ones that comes from the current project (the child) - in other words we want to keep our files, as these are content changes. We use the following commands to achieve that:
_Note_: If you wanted to select the files from the Baseline project instead of the ones from the current project, you should write “--theirs” instead of “--ours” in the command from above. “Ours” corresponds to the current project (the development site) and “Theirs” corresponds to the Baseline project.
54
54
55
55
Now you need to add the (modified) files to Git and finally commit the changes using the following commands:
56
56
57
-
git add .
58
-
git commit -m “Resolving merge conflicts”
57
+
```
58
+
git add .
59
+
git commit -m “Resolving merge conflicts”
60
+
```
59
61
60
-
The merge conflict has now been resolved, and you can update your local repository with the latest changes by pulling from the development site.
61
-
Please note that the changes from the commit haven’t been deployed to the website yet, as we have only applied the changes to the Git repository. In order to deploy the recent changes to the website you can push your local changes to the development site or you can use the Kudu api to trigger a deployment.
62
-
You can use the following command from the Kudu Debug Console to deploy the latest changes:
62
+
The merge conflict has now been resolved, and you can update your local repository with the latest changes by pulling from the development site. Please note that the changes from the commit haven’t been deployed to the website yet, as we have only applied the changes to the Git repository. In order to deploy the recent changes to the website you can push your local changes to the development site or you can use the Kudu api to trigger a deployment. You can use the following command from the Kudu Debug Console to deploy the latest changes:
If you prefer to use the Kudu REST API for triggering a deployment, you can find the details here: [https://github.com/projectkudu/kudu/wiki/REST-API#deployment](https://github.com/projectkudu/kudu/wiki/REST-API#deployment)
Copy file name to clipboardExpand all lines: umbraco-cloud/getting-started/the-umbraco-cloud-portal/sustainability-dashboard.md
+8-8
Original file line number
Diff line number
Diff line change
@@ -1,12 +1,12 @@
1
-
# Sustainability dashboard
1
+
# Sustainability Dashboard
2
2
3
3
The Sustainability Dashboard is designed to help users monitor and improve the environmental impact of their websites on Umbraco Cloud. The dashboard provides insights and metrics related to carbon footprint and sustainable practices, enabling organizations to align their digital presence with their sustainability goals.
4
4
5
5
## Key Features
6
6
7
-
-**Daily CO2 emission calculation**: The dashboard is updated daily with new CO2 emission estimates.
8
-
-**Historical data**: The dashboard tracks monthly and yearly CO2 emission estimates, allowing for trend analysis over time
9
-
-**Comparative analysis**: Users can compare CO2 emissions across their projects to identify high-impact areas and improvement opportunities.
7
+
***Daily CO2 emission calculation**: The dashboard is updated daily with new CO2 emission estimates.
8
+
***Historical data**: The dashboard tracks monthly and yearly CO2 emission estimates, allowing for trend analysis over time
9
+
***Comparative analysis**: Users can compare CO2 emissions across their projects to identify high-impact areas and improvement opportunities.
10
10
11
11
## CO2 emission calculation methodology
12
12
@@ -25,7 +25,7 @@ Environment CO2 emissions = Total CO2 emissions of backend compute infrastructur
25
25
26
26
### Cloud Carbon Footprint
27
27
28
-
Cloud Carbon Footprint(CCF) provides a comprehensive methodology for estimating CO2 emissions in their [documentation](https://www.cloudcarbonfootprint.org/docs/methodology/). We use CCF to calculate the Sum of environmental CO2 emissions.
28
+
Cloud Carbon Footprint(CCF) provides a comprehensive methodology for estimating CO2 emissions in their [documentation](https://www.cloudcarbonfootprint.org/docs/methodology/). We use CCF to calculate the Sum of environmental CO2 emissions.
29
29
30
30
```math
31
31
CCF CO2 emissions = Operational emissions + Embodied emissions
@@ -41,18 +41,18 @@ Embodied emissions = Estimated metric tons CO2 emissions from the manufacturing
41
41
For websites on shared infrastructure in Umbraco Cloud, we calculate a usage coefficient to improve the accuracy of CO2 emission estimates. This coefficient divides the CO2 emissions of the shared pool among the websites using it.
42
42
43
43
The usage coefficient for a website is based on metrics such as:
44
+
44
45
* CPU
45
46
* Memory usage
46
47
47
-
The usage coefficient for a database is based on DTUs used etc.
48
+
The usage coefficient for a database is based on DTUs used etc.
48
49
49
50
```math
50
51
Website CO2 emissions = Usage coefficient * CCF CO2 emissions
51
52
Usage coefficient = Website resource usage / Total pool usage
52
53
```
53
54
54
-
**Website Resource Usage**: For compute resources we evaluate metrics such as CPU, memory or disk, for storage resources DTUs and disk are considered.
55
-
**Total Pool Usage**: The total resource usage of the shared pool of resources.
55
+
**Website Resource Usage**: For compute resources we evaluate metrics such as CPU, memory or disk, for storage resources DTUs and disk are considered. **Total Pool Usage**: The total resource usage of the shared pool of resources.
Copy file name to clipboardExpand all lines: umbraco-cloud/set-up/going-live.md
+2-3
Original file line number
Diff line number
Diff line change
@@ -15,9 +15,8 @@ Working with Umbraco Forms, allows you to set up email workflows that enable you
15
15
When you create a project on Umbraco Cloud, the generated project URL is based on the project's name and that might not be the preferred URL for your website. Therefore, you have the option to add your hostname.
16
16
17
17
{% hint style="info" %}
18
-
Before adding a hostname, you need to update your DNS host domain registrar DNS entries to resolve to `umbraco.io`. We recommend setting a CNAME record for your site using the `dns.umbraco.io` Umbraco Cloud DNS record.
19
-
You can read more about how to do this under [Manage Hostnames](project-settings/manage-hostnames/).
20
-
{% endhint %}
18
+
Before adding a hostname, you need to update your DNS host domain registrar DNS entries to resolve to `umbraco.io`. We recommend setting a CNAME record for your site using the `dns.umbraco.io` Umbraco Cloud DNS record. You can read more about how to do this under [Manage Hostnames](project-settings/manage-hostnames/).
19
+
{% endhint %}
21
20
22
21
## [Deploy to Live](../deployment/cloud-to-cloud.md)
Copy file name to clipboardExpand all lines: umbraco-cloud/set-up/project-settings/README.md
+2-3
Original file line number
Diff line number
Diff line change
@@ -87,14 +87,13 @@ The Connections section provides connection details for your Umbraco Cloud datab
87
87
88
88
The Automatic Upgrades section handles minor and patch upgrades for the Umbraco components used by Umbraco Cloud. By default, new projects are opt-in for these upgrades.
89
89
90
-
From this page, you can manage whether your site is automatically upgraded to the latest minor version(s) of the Cloud products. To learn more about automatic upgrades, visit the [Upgrades](../../product-upgrades/README.md) section.
90
+
From this page, you can manage whether your site is automatically upgraded to the latest minor version(s) of the Cloud products. To learn more about automatic upgrades, visit the [Upgrades](../../product-upgrades/) section.
Below are the values per region in a [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) (Classless Inter-Domain Routing) notation. The expanded IP ranges can be calculated by using [online tooling](https://www.ipaddressguide.com/cidr).
21
+
The static outbound IP ranges vary per region. Below are the values per region in a [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) (Classless Inter-Domain Routing) notation. The expanded IP ranges can be calculated by using [online tooling](https://www.ipaddressguide.com/cidr).
0 commit comments