Skip to content

Commit 3fb2e04

Browse files
Merge branch 'scaleway:main' into int-add-rdb
2 parents 828cb69 + 34a21a6 commit 3fb2e04

File tree

56 files changed

+674
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+674
-255
lines changed

console/account/how-to/log-in-to-the-console.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ A confirmation email is sent to your inbox, confirming that you have authenticat
4141
Scaleway provides Single Sign-On (SSO) options for a seamless login experience. You can use your Google or Microsoft account to log in to the console. To do so, make sure the email address associated with your Scaleway account matches the email address of your Google or Microsoft account.
4242

4343
1. Open your web browser and go to the [Scaleway console](https://console.scaleway.com).
44-
2. Click the **Log in with Google** or **Log in with Microsoft** button, depending on the account you want to use.
45-
3. You will be redirected to the respective login page of Google or Microsoft.
44+
2. Click the **Log in with Google** , **Log in with Microsoft**, or **Log in with GitHub** button, depending on the account you want to use.
45+
3. You will be redirected to the respective login page of Google, Microsoft or GitHub.
4646
4. If multifactor authentication (MFA) is activated, enter the authentication code.

console/account/troubleshooting/cannot-log-into-my-account.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ Once you have gathered all the required documents, the request has to be sent by
5959

6060
## SSO authentication is not working
6161

62-
If the email address of your Google or Microsoft account does not match the email address associated with your Scaleway account, you will not be able to log in using SSO. Make sure both email addresses are the same.
62+
If the email address of your Google, Microsoft, or GitHub account does not match the email address associated with your Scaleway account, you will not be able to log in using SSO. Make sure both email addresses are the same.

console/billing/additional-content/reading-an-invoice.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ content:
77
paragraph: This page explains how to read an invoice
88
tags: billing invoice payment
99
dates:
10-
validation: 2024-04-22
10+
validation: 2024-11-04
1111
posted: 2024-02-23
1212
categories:
1313
- billing
@@ -21,6 +21,6 @@ Your Scaleway invoice contains the following sections:
2121
- **Invoice status (2):** Displays the billing period, issuing and due dates of the invoice.
2222
- **Seller information (3):** Contact details of Scaleway SAS along with their VAT number.
2323
- **Customer details (4):** Includes postal address, email address, Organization ID, and for business accounts, the EU VAT number.
24-
- **Project table (5):** Provides information on invoiced Projects, including Project names, consumed resources, and total Project amounts based on consumption during the accounting period.
24+
- **Project table (5):** Provides information on invoiced Projects, including Project names, consumed resources, and total Project amounts based on consumption during the accounting period.
2525
Located below the Project table you find the **Consumption table**. This section details resource consumption, including Project names, services/operations consumed (e.g., Instances, Object Storage, Elastic Metal servers), consumption periods, total usage, and calculated prices based on consumption.
2626
- **Total invoice amount (6):** Calculated from the untaxed total of the invoice. For EU customers, the local VAT rate is applied to the untaxed total to determine the total due amount.
37.3 KB
Loading

faq/edge-services.mdx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@ category: network
1212

1313
## What is Edge Services?
1414

15-
Edge Services is a feature for Scaleway Load Balancers and Object Storage buckets, currently available in [Public Beta](https://www.scaleway.com/en/betas/). It provides a [caching service](/network/edge-services/how-to/configure-cache/) to improve performance by reducing load on your [origin](/network/edge-services/concepts/#origin), and a customizable and secure endpoint for accessing content via Edge Services, which can be set to a subdomain of your choice.
15+
Edge Services is a feature for Scaleway Load Balancers and Object Storage buckets. Creating Edge Services [pipelines](/network/edge-services/concepts/#pipeline) towards your Load Balancers or Object Storage buckets provides:
16+
-A [caching service](/network/edge-services/how-to/configure-cache/) to improve performance by reducing load on your [origin](/network/edge-services/concepts/#origin), and
17+
- A customizable and secure endpoint for accessing content via Edge Services, which can be set to a subdomain of your choice and secured with an SSL/TLS certificate.
18+
19+
<Lightbox src="scaleway-edge-services-pipeline.webp" alt="A diagram shows the elements and workflow of an Edge Services pipeline. The user connects to the customizable Edge Services endpoint (with its SSL/TLS certificate), which fetches content from the Edge Services cache, which itself fetches content to cache from an origin which is either an Object Storage bucket or Load Balancer" />
1620

1721
## Which products are compatible with Edge Services?
1822

1923
Edge Services is currently available for Scaleway [Object Storage buckets](/storage/object/) and Scaleway [Load Balancers](/network/load-balancer/).
2024

2125
## How much does Edge Services cost?
2226

23-
Since Edge Services is currently in Public Beta, it is free to use and not billed. On November 1st 2024, it will transition to General Availability, and pricing will be based on subscription plans. See our documentation for help with understanding the [transition to General Availability](/network/edge-services/reference-content/understanding-ga/).
27+
On November 1st 2024, Edge Services transitioned from Public Beta to General Availability, and became billable. Pricing is based on [monthly subscription plans](https://www.scaleway.com/en/pricing/network/#edge-services): three plans are available, each allowing a fixed number of pipelines, and a certain amount of egress cache data. Any consumption that exceeds the limits of the plan is charged at an additional rate.
28+
29+
Find out more about how Edge Service subscription plans and billing works on our [Understanding Edge Services pricing](/network/edge-services/reference-content/understanding-pricing/) page.
2430

2531
## If I customize my Edge Services endpoint with my own domain, can it serve content over HTTPS?
2632

identity-and-access-management/organizations-and-projects/additional-content/organization-quotas.mdx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,14 @@ Additional IP addresses and placement groups are available with our compute offe
377377
|---------------------------|:----------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------:|
378378
| Load Balancers | 50 | 50 |
379379

380+
## Edge Services
381+
382+
<Macro id="network-edge-services" />
383+
384+
| | [Payment method validated](/console/billing/how-to/add-payment-method/#how-to-add-a-credit-card) | Payment method and [identity validated](/console/account/how-to/verify-identity/) |
385+
|---------------------------|:----------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------:|
386+
| Edge Services pipelines | 20 | 20 |
387+
380388
## Domains and DNS
381389

382390
<Macro id="network-dns-cloud" />

labs/ipfs-naming/quickstart.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ content:
77
paragraph: This page shows you how to get started with Scaleway IPFS Naming.
88
tags: ipfs-naming ipfs naming labs web3
99
dates:
10-
validation: 2024-04-23
10+
validation: 2024-11-04
1111
posted: 2023-10-10
1212
categories:
1313
- labs

labs/ipfs-pinning/api-cli/getting-started-with-ipfs-cli.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ content:
77
paragraph: This page explains how to get started with Scaleway IPFS Pinning using the CLI
88
tags: ipfs-pinning ipfs-storage ipfs pinning storage labs web3
99
dates:
10-
validation: 2024-04-30
10+
validation: 2024-11-04
1111
posted: 2023-07-07
1212
categories:
1313
- storage

labs/ipfs-pinning/api-cli/volumes-operations.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ content:
77
paragraph: This page explains how to use the Scaleway IPFS Pinning API/CLI to manage volumes.
88
tags: ipfs ipfs-pinning pinning storage ipfs-storage volume labs web3
99
dates:
10-
validation: 2024-04-30
10+
validation: 2024-11-04
1111
posted: 2023-05-25
1212
categories:
1313
- labs
37.3 KB
Loading

0 commit comments

Comments
 (0)