docs(add): feedback sophie

Author: nerda-codes

macros/cockpit/grafana-users-deprecation.mdx

@@ -4,6 +4,6 @@ macro: grafana-users-deprecation
 
 <Message type="iam">
  **Cockpit Grafana integration with IAM** <br /><br />
- From October 1st, 2025, you will be able to log in to Grafana using your Scaleway credentials. Legacy Grafana credentials will be deprecated by January 20th, 2026.
+ From October 15th, 2025, you will be able to log in to Grafana using your Scaleway credentials. Legacy Grafana user credentials will be deprecated by January 20th, 2026.
  Learn more about the transition in the [dedicated documentation](/cockpit/reference-content/grafana-authentication-with-iam/)
 </Message>

pages/cockpit/reference-content/grafana-authentication-with-iam.mdx

@@ -2,11 +2,11 @@
 title: Authenticating to Cockpit's Grafana using IAM
 description: Learn how to transition from Grafana credentials authentication to Scaleway IAM to access your Cockpit's Grafana
 dates:
-  validation: 2025-08-20
-  posted: 2025-08-20
+  validation: 2025-08-26
+  posted: 2025-08-26
 ---
 
-Starting **October 1st, 2025**, Cockpit will be integrated with **Scaleway IAM**, allowing you to authenticate to your Cockpit's Grafana using your **Scaleway credentials** instead of Grafana credentials.
+Starting **October 15th, 2025**, Cockpit will be integrated with **Scaleway IAM**, allowing you to authenticate to your Cockpit's Grafana using your **Scaleway credentials** instead of Grafana credentials.
 
 This page explains how to prepare for the transition.
 
@@ -24,28 +24,34 @@ We are simplifying authentication and improving security by:
 
 | Event | Date |
 |------|------|
-| IAM authentication becomes available | **October 1st, 2025** |
-| Creating new Grafana users disabled | **October 1st, 2025** |
+| IAM authentication becomes available | **October 15th, 2025** |
+| Creating new Grafana users disabled | **October 15th, 2025** |
 | Legacy Grafana user login deprecation | **January 20th, 2026** |
 
+Grafana users not linked to Scaleway IAM will be deprecated. Refer to the table below to find out until when you can perform which actions.
+
+| Action | Available until |
+|--------|-----------------|
+| Logging in using Grafana user credentials | **January 20th, 2026** |
+| Generate passwords for existing Grafana users | **January 20th, 2026** |
+| Create new Grafana users | **Disabled after October 15th, 2025** |
 
 ## What is changing?
 
 ### New login method
 
-From **October 1st**, you will be able to log in using your Scaleway credentials via the Scaleway console or saved links.
+From **October 15th**, you will be able to log in using your Scaleway credentials via the Scaleway console or saved links.
 
 ### New dashboard URLs
 
-To support both login methods during the transition, Grafana dashboards will have **new URLs**:
+To support both login methods during the transition, Grafana dashboards will have a **new URL**:
 
 - **Old URL:**
   `https://<project_id>.dashboard.obs.fr-par.scw.cloud`
 
 - **New URL (IAM-authenticated):**
   `https://<project_id>.dashboard.cockpit.scaleway.com`
-  or
-  `https://<project_id>.dashboard.cockpit.scw.cloud`
+
 
 Both links will be functional until **January 20th, 2026**, after which only the new IAM-based URLs will remain valid.
 
@@ -55,10 +61,14 @@ Users must:
 
 - Be **Members** of your Scaleway Organization
 - Have access to the Scaleway Project where the Cockpit is located
-- Have been granted either the `ObservabilityReadOnly` or the `ObservabilityFullAccess` IAM permission set
+- Have been granted either the `ObservabilityReadOnly`, the `AllProductsFullAccess`, or the `ObservabilityFullAccess` IAM permission set
 
 You can manage Members and permission sets in the [IAM section of the Scaleway console](https://console.scaleway.com/iam/members).
 
+    <Message type="tip">
+     Make sure that you review and manage permissions sets granted to current Members of your Organization, to either revoke or grant access accordingly.
+    </Message>
+
 
 ## How to access your Cockpit's Grafana
 
@@ -71,24 +81,16 @@ Access to Grafana using the Scaleway console remains the same as before.
 
 ### From a saved/shared link
 
-You can also access your Cockpit's Grafana using bookmarked links, alerts, or runbooks.
+You can also access your Cockpit's Grafana using bookmarked links if you cannot access the Scaleway console.
 
 1. Open the new IAM-compatible URL. The Scaleway login page displays.
 2. Log in using your Scaleway credentials. Your Grafana dashboard displays.
 
-## What will happen to existing Grafana users?
-
-Grafana users not linked to Scaleway IAM will be deprecated. Refer to the table below to find out until when you can perform which actions.
-
-| Action | Available until |
-|--------|-----------------|
-| Log in using Grafana credentials | **January 20th, 2026** |
-| Generate passwords for existing Grafana users | **January 20th, 2026** |
-| Create new Grafana users | **Disabled after October 1st, 2025** |
-
 ## How to prepare for this transition
 
-If you have users who are not in your Scaleway Organization, we recommend the following:
+1. Make sure that you review and manage permissions sets granted to current Members of your Organization, to either revoke or grant access accordingly.
+
+    If you have Grafana users who are not in your Scaleway Organization:
 
-- [Invite them as Members](/iam/how-to/manage-members/#how-to-create-a-member) to your Organization
-- Assign the `ObservabilityReadOnly` or the `ObservabilityFullAccess` permission sets only to the Projects they need to access
+2. [Invite them as Members](/iam/how-to/manage-members/#how-to-create-a-member) to your Organization.
+3. Assign the `ObservabilityReadOnly` or the `ObservabilityFullAccess` permission sets only to the Projects they need to access.

pages/cockpit/troubleshooting/resetting-grafana-password-via-the-api.mdx

@@ -7,6 +7,7 @@ dates:
   posted: 2023-04-03
 ---
 import Requirements from '@macros/iam/requirements.mdx'
+import GrafanaUsersDeprecation from '@macros/cockpit/grafana-users-deprecation.mdx'
 
 
 This page shows you how to reset your Grafana user's password through the Scaleway console.