Skip to content

Commit 44616a8

Browse files
atissedrescalewayatissedrescaleway
committed
Merge branch 'main' into MTA-6240
# Conflicts: # blocks/mainLinks.json
2 parents 510c016 + b32db97 commit 44616a8

File tree

42 files changed

+971
-311
lines changed

Some content is hidden

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

42 files changed

+971
-311
lines changed

‎menu/navigation.json‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,6 +1418,10 @@
14181418
"label": "Use flexible IPs",
14191419
"slug": "use-flexips"
14201420
},
1421+
{
1422+
"label": "Migrate Local Storage volumes to Block Storage",
1423+
"slug": "migrate-local-storage-to-sbs"
1424+
},
14211425
{
14221426
"label": "Move an Instance to routed flexible IPs",
14231427
"slug": "migrate-routed-ips"
@@ -1923,10 +1927,6 @@
19231927
"label": "Use the scratch storage on H100 GPU Instances with Kapsule",
19241928
"slug": "use-scratch-storage-h100"
19251929
},
1926-
{
1927-
"label": "Migrate existing ENT1 pools to POP2 Instances",
1928-
"slug": "migrate-ent1-pools-to-pop2"
1929-
},
19301930
{
19311931
"label": "Deploy x86 and ARM images in Kubernetes",
19321932
"slug": "deploy-x86-arm-images"
@@ -2058,6 +2058,10 @@
20582058
{
20592059
"label": "Wildcard DNS routing",
20602060
"slug": "wildcard-dns"
2061+
},
2062+
{
2063+
"label": "Migrate end-of-life pools to newer Instances",
2064+
"slug": "migrate-end-of-life-pools-to-newer-instances"
20612065
}
20622066
],
20632067
"label": "Additional Content",
@@ -3727,6 +3731,10 @@
37273731
"label": "Send metrics and logs to your Cockpit",
37283732
"slug": "send-metrics-logs-to-cockpit"
37293733
},
3734+
{
3735+
"label": "Federate Scaleway metrics with your own Prometheus",
3736+
"slug": "federate-scaleway-metrics"
3737+
},
37303738
{
37313739
"label": "Delete a custom data source",
37323740
"slug": "delete-external-data-sources"
@@ -4627,6 +4635,10 @@
46274635
},
46284636
{
46294637
"items": [
4638+
{
4639+
"label": "Serverless overview",
4640+
"slug": "serverless-overview"
4641+
},
46304642
{
46314643
"label": "Functions runtimes",
46324644
"slug": "functions-runtimes"
@@ -4775,6 +4787,10 @@
47754787
},
47764788
{
47774789
"items": [
4790+
{
4791+
"label": "Serverless overview",
4792+
"slug": "serverless-overview"
4793+
},
47784794
{
47794795
"label": "Jobs limitations",
47804796
"slug": "jobs-limitations"

‎pages/billing/additional-content/understanding-savings-plans.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ There is currently one available savings plan type: the Compute savings plan.
120120
The **Compute savings plan** can be used with the following resources, simultaneously and across all regions:
121121

122122
- Instances 
123-
- Cost-optimized (DEV1, GP1, PLAY2, PRO2)
124-
- Production optimized (ENT1, POP2)
125-
- Workload optmized (POP2 HC) 
123+
- Cost-Optimized (DEV1, GP1, PLAY2, PRO2)
124+
- Production-Optimized (ENT1, POP2)
125+
- Workload-Optmized (POP2 HC, POP2-HM, POP2-HN) 
126126

127127
The following resources are **not** covered by the savings plan discount:
128128

‎pages/dedibox-ip-failover/how-to/configure-debian-ubuntu.mdx‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -26,102 +26,102 @@ This guide provides step-by-step instructions for configuring a Dedibox [failove
2626
## Failover IP configuration on Debian
2727

2828
1. Connect to your server using SSH and open the network configuration file `/etc/network/interfaces` in a text editor, such as `nano`:
29-
```bash
30-
nano /etc/network/interfaces
31-
```
29+
```bash
30+
nano /etc/network/interfaces
31+
```
3232
2. Add the failover IP to the configuration as shown in the following example:
33-
```bash
34-
# This file describes the network interfaces available on your system
35-
# and how to activate them. For more information, see interfaces(5).
36-
# The loopback network interface
37-
auto lo
38-
iface lo inet loopback
39-
# The primary network interface
40-
auto eth0
41-
iface eth0 inet static
42-
address 195.154.123.123
43-
netmask 255.255.255.0
44-
gateway 195.154.123.1
45-
auto eth0:0
46-
iface eth0:0 inet static
47-
address ip_failover
48-
netmask 255.255.255.255
49-
```
50-
<Message type="note">
51-
The interface name (`eth0` in this example) may vary depending on your OS version and system configuration. Use the `ifconfig` command to determine the name of your primary network interface.
52-
</Message>
33+
```bash
34+
# This file describes the network interfaces available on your system
35+
# and how to activate them. For more information, see interfaces(5).
36+
# The loopback network interface
37+
auto lo
38+
iface lo inet loopback
39+
# The primary network interface
40+
auto eth0
41+
iface eth0 inet static
42+
address 195.154.123.123
43+
netmask 255.255.255.0
44+
gateway 195.154.123.1
45+
auto eth0:0
46+
iface eth0:0 inet static
47+
address ip_failover
48+
netmask 255.255.255.255
49+
```
50+
<Message type="note">
51+
The interface name (`eth0` in this example) may vary depending on your OS version and system configuration. Use the `ifconfig` command to determine the name of your primary network interface.
52+
</Message>
5353

5454
3. Save the file and exit the editor. Bring up the interface using the following command:
55-
```bash
56-
ifup eth0:0
57-
```
55+
```bash
56+
ifup eth0:0
57+
```
5858

5959
## Failover IP configuration on Ubuntu (Netplan)
6060

6161
Since Ubuntu 18.04, Netplan has been the default network configuration system.
6262

6363
1. Disable cloud-init network configuration to prevent conflicts with Netplan:
64-
```bash
65-
sudo mkdir -p /etc/cloud/cloud.cfg.d
66-
echo 'network: {config: disabled}' | sudo tee /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
67-
```
68-
<Message type="important">
69-
This step is necessary to prevent cloud-init from overriding the Netplan configuration.
70-
</Message>
64+
```bash
65+
sudo mkdir -p /etc/cloud/cloud.cfg.d
66+
echo 'network: {config: disabled}' | sudo tee /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
67+
```
68+
<Message type="important">
69+
This step is necessary to prevent cloud-init from overriding the Netplan configuration.
70+
</Message>
7171

7272
2. Backup the existing Netplan configuration and create a new file:
73-
```bash
74-
sudo cp /etc/netplan/50-cloud-init.yaml /etc/netplan/01-myplan.yaml
75-
sudo mv /etc/netplan/50-cloud-init.yaml /etc/netplan/50-cloud-init.yaml-backup
76-
```
73+
```bash
74+
sudo cp /etc/netplan/50-cloud-init.yaml /etc/netplan/01-myplan.yaml
75+
sudo mv /etc/netplan/50-cloud-init.yaml /etc/netplan/50-cloud-init.yaml-backup
76+
```
7777
4. Edit the new Netplan configuration file `/etc/netplan/01-myplan.yaml` using `nano`:
78-
```yml
79-
network:
80-
renderer: networkd
81-
ethernets:
82-
enp5s0:
83-
critical: true
84-
dhcp-identifier: mac
85-
dhcp4: false
86-
dhcp6: false
87-
addresses:
88-
- 51.111.222.333/24 # Server main IP (/24)
89-
- 212.111.222.333/32 # Alternate IPs / IP redirects (/32)
90-
- 212.111.222.334/32
91-
- 212.111.222.335/32
92-
routes:
93-
- to: 0.0.0.0/0
94-
via: 62.210.0.1
95-
metric: 1
96-
on-link: true
97-
nameservers:
78+
```yml
79+
network:
80+
renderer: networkd
81+
ethernets:
82+
enp5s0:
83+
critical: true
84+
dhcp-identifier: mac
85+
dhcp4: false
86+
dhcp6: false
9887
addresses:
99-
- 51.159.69.156
100-
- 51.159.69.162
101-
enp6s0:
102-
dhcp4: true
103-
dhcp4-overrides:
104-
use-routes: false
105-
routes:
106-
- to: 10.88.0.0/13 # Use appropriate IP/gateway from DHCP
107-
via: 10.89.23.129
108-
version: 2
109-
```
110-
<Message type="tip">
111-
Ensure that indentation and formatting are correct to avoid YAML syntax errors.
112-
</Message>
88+
- 51.111.222.333/24 # Server main IP (/24)
89+
- 212.111.222.333/32 # Alternate IPs / IP redirects (/32)
90+
- 212.111.222.334/32
91+
- 212.111.222.335/32
92+
routes:
93+
- to: 0.0.0.0/0
94+
via: 62.210.0.1
95+
metric: 1
96+
on-link: true
97+
nameservers:
98+
addresses:
99+
- 51.159.69.156
100+
- 51.159.69.162
101+
enp6s0:
102+
dhcp4: true
103+
dhcp4-overrides:
104+
use-routes: false
105+
routes:
106+
- to: 10.88.0.0/13 # Use appropriate IP/gateway from DHCP
107+
via: 10.89.23.129
108+
version: 2
109+
```
110+
<Message type="tip">
111+
Ensure that indentation and formatting are correct to avoid YAML syntax errors.
112+
</Message>
113113
114114
5. Run the following command to test the configuration:
115-
```bash
116-
sudo netplan try
117-
```
115+
```bash
116+
sudo netplan try
117+
```
118118
6. If everything works as expected, apply the configuration:
119-
```bash
120-
sudo netplan apply
121-
```
122-
<Message type="important">
123-
If there is an error in your configuration, it might render your network inaccessible. You may need to revert changes using [KVM/IPMI](/dedibox-kvm-over-ip/quickstart/) access.
124-
</Message>
119+
```bash
120+
sudo netplan apply
121+
```
122+
<Message type="important">
123+
If there is an error in your configuration, it might render your network inaccessible. You may need to revert changes using [KVM/IPMI](/dedibox-kvm-over-ip/quickstart/) access.
124+
</Message>
125125

126126
## Troubleshooting
127127

‎pages/demos/index.mdx‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ content:
1212
description="Take a tour of the Scaleway console with interactive demos. Our step-by-step previews help you explore the interface and discover our products and features."
1313
/>
1414

15-
## Getting started
15+
## Getting started with the Scaleway console
1616

1717
<Grid>
1818
<DefaultCard
@@ -32,23 +32,46 @@ content:
3232
/>
3333
</Grid>
3434

35-
36-
## Browse all demos
37-
3835
<table>
3936
<tbody>
4037
<tr>
4138
<td>
42-
- [Partner Space: console overview](/partner-space/quickstart/#console-overview)
43-
- [Billing Space: console overview](/billing/quickstart/)
44-
- [Container Registry: console overview](/container-registry/quickstart/#console-overview)
45-
- [PostgreSQL and MySQL: console overview](/managed-databases-for-postgresql-and-mysql/quickstart/#console-overview)
46-
</td>
39+
- [Apple silicon: console overview](/apple-silicon/quickstart/#console-overview)
40+
- [Audit Trail: console overview](/audit-trail/quickstart/#console-overview)
41+
- [Billing space: console overview](/billing/quickstart/#console-overview)
42+
- [Block Storage: console overview](/block-storage/quickstart/#console-overview)
43+
- [Container Registry: console overview](/container-registry/quickstart/#console-overview)
44+
- [Containers: console overview](/serverless-containers/quickstart/#console-overview)
45+
- [Elastic Metal: console overview](/elastic-metal/quickstart/#console-overview)
46+
- [Functions: console overview](/serverless-functions/quickstart/#console-overview)
47+
- [IoT Hub: console overview](/iot-hub/quickstart/#console-overview)
48+
- [Jobs: console overview](/serverless-jobs/quickstart/#console-overview)
49+
</td>
50+
<td>
51+
- [Kubernetes: console overview](/kubernetes/quickstart/#console-overview)
52+
- [Local Storage: console overview](/local-storage/quickstart/#console-overview)
53+
- [MongoDB: console overview](/managed-mongodb-databases/quickstart/#console-overview)
54+
- [Object Storage: console overview](/object-storage/quickstart/#console-overview)
55+
- [PostgreSQL and MySQL: console overview](/managed-databases-for-postgresql-and-mysql/quickstart/#console-overview)
56+
- [Redis: console overview](/managed-databases-for-redis/quickstart/#console-overview)
57+
- [Secret Manager: console overview](/secret-manager/quickstart/#console-overview)
58+
- [SQL Databases: console overview](/serverless-sql-databases/quickstart/#console-overview)
59+
- [Topics and Events: console overview](/topics-and-events/quickstart/#console-overview)
60+
- [VPC: console overview](/vpc/quickstart/#console-overview)
61+
</td>
62+
</tr>
63+
</table>
64+
65+
## Advanced guides
66+
67+
<table>
68+
<tr>
4769
<td>
4870
- [How to purchase a savings plan](/billing/how-to/purchase-savings-plan/#purchasing-a-savings-plan)
4971
- [How to add a credit card](/billing/how-to/add-payment-method/#how-to-add-a-credit-card)
5072
- [How to log in as an IAM Member](/iam/how-to/log-in-as-a-member/)
5173
- [How to grant access to the Partner Space](/partner-space/how-to/grant-access-to-partner-space/)
74+
- [How to manage Members](/iam/how-to/manage-members/#interactive-demo)
5275
</td>
5376
</tr>
5477
</tbody>

‎pages/environmental-footprint/additional-content/environmental-footprint-integration.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The following tables provide details about the Scaleway products that currently
2121
|----------------------------|---------------------------------|
2222
| Elastic Metal | **Yes** |
2323
| Apple Silicon | **Yes** |
24-
| Instances | **Yes** |
24+
| CPU Instances | **Yes** |
2525

2626
## Planned product integration
2727

‎pages/generative-apis/reference-content/rate-limits.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ If you created a Scaleway account but did not register a valid payment method, s
3131
We actively monitor usage and will improve rates based on feedback.
3232
If you need to increase your rate limits:
3333
- [Verify your identity](/account/how-to/verify-identity/) to automatically increase your rate limit as described below
34-
- [Contact our support team](https://console.scaleway.com/support/create), providing details on the model used and specific use case, for additional increases.
35-
Note that for increases of up to x5 or x10, we highly recommend using dedicated deployments with [Managed Inference](https://console.scaleway.com/inference/deployments), which provides exactly the same features and API compatibility.
34+
- Use [Managed Inference](https://console.scaleway.com/inference/deployments), which provides dedicated capacity and does not enforce rate limits (you remain limited by the total provisioned capacity)
35+
- Contact your existing Scaleway account manager or our Sales team to discuss volume commitment for specific models that will allow us to increase your quota proportionally.
3636

3737
## Why do we set rate limits?
3838

‎pages/generative-apis/troubleshooting/fixing-common-issues.mdx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,25 @@ Below are common issues that you may encounter when using Generative APIs, their
111111
- The model goes into an infinite loop while processing the input (which is a known structural issue with several AI models)
112112

113113
### Solution
114+
For queries that are too long to process:
114115
- Set a stricter **maximum token limit** to prevent overly long responses.
115116
- Reduce the size of the input tokens, or split the input into multiple API requests.
116117
- Use [Managed Inference](/managed-inference/), where no query timeout is enforced.
117118

119+
For queries where the model enters an infinite loop (more frequent when using **structured output**):
120+
- Set `temperature` to the default value recommended for the model. These values can be found in the [Generative APIs Playground](https://console.scaleway.com/generative-api/models/fr-par/playground) when selecting the model. Avoid using temperature `0`, as this can lock the model into outputting only the next (and same) most probable token repeatedly.
121+
- Ensure the `top_p` parameter is not set too low (we recommend the default value of `1`).
122+
- Add a `presence_penalty` value in your request (`0.5` is a good starting value). This option will help the model choose different tokens than the one it is looping on, although it might impact accuracy for some tasks requiring repeated multiple similar outputs.
123+
- Use more recent models, which are usually more optimized to avoid loops, especially when using structured output.
124+
- Optimize the system prompt to provide clearer and simpler tasks. Currently, JSON output accuracy still relies on heuristics to constrain models to output only valid JSON tokens, and thus depends on the prompts given. As a counter-example, providing contradictory requirements to a model - such as `Never output JSON` in the system prompt and `response_format` as `json_schema" in the query - may lead to the model never outputting closing JSON brackets `}`.
125+
118126
## Structured output (e.g., JSON) is not working correctly
119127

120128
### Description
121129
- Structured output response contains invalid JSON
122130
- Structured output response is valid JSON but content is less relevant
131+
- Structured output response never ends (loop over characters such as `"`, `\t` or `\n`). For this issue, see the advice on infinite loops in [504 Gateway Timeout](#504-gateway-timeout).
132+
123133

124134
### Causes
125135
- Incorrect field naming in the request, such as using `"format"` instead of the correct `"response_format"` field.

0 commit comments

Comments
 (0)