docs(cockpit): wording changes (#3720)

nerda-codes · web-flow · commit 0b976e96698b · 2024-09-19T15:31:15.000+02:00
diff --git a/changelog/april2024/2024-04-04-cockpit-added-metrics-degrissivity.mdx b/changelog/april2024/2024-04-04-cockpit-added-metrics-degrissivity.mdx
@@ -1,5 +1,5 @@
 ---
-title: Introducing volumes discounts for your external metrics!
+title: Introducing volumes discounts for your custom metrics!
 status: added
 author:
     fullname: 'Join the #observability channel on Slack.'
@@ -9,22 +9,22 @@ category: observability
 product: cockpit
 ---
 
-Check out our latest update: volume discounts for your external metrics, allowing you to enjoy a cost-efficient monitoring solution!
+Check out our latest update: volume discounts for your custom metrics, allowing you to enjoy a cost-efficient monitoring solution!
 
 **How it works:**
-The monthly pricing for external metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.**
+The monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.**
 
 | Levels       | Range                                    | Monthly pricing with volume discounts    |
 |--------------|------------------------------------------|------------------------------------------|
-| Level one    | From 0 to 10 billion external metrics    | €0.15 per million samples                |
-| Level two    | From 10 to 25 billion external metrics   | €0.13 per million samples                |
-| Level three  | From 25 to 50 billion external metrics   | €0.12 per million samples                |
-| Level four   | From 50 to 100 billion external metrics  | €0.11 per million samples                |
-| Level five   | From 100 to 200 billion external metrics | €0.10 per million samples                |
-| Level six    | From 200 billion external metrics and beyond              | €0.08 per million samples                |
+| Level one    | From 0 to 10 billion custom metrics    | €0.15 per million samples                |
+| Level two    | From 10 to 25 billion custom metrics   | €0.13 per million samples                |
+| Level three  | From 25 to 50 billion custom metrics   | €0.12 per million samples                |
+| Level four   | From 50 to 100 billion custom metrics  | €0.11 per million samples                |
+| Level five   | From 100 to 200 billion custom metrics | €0.10 per million samples                |
+| Level six    | From 200 billion custom metrics and beyond              | €0.08 per million samples                |
 
 
-Here is an example of how you would be billed for **sending 52 billion external metrics samples per month**:
+Here is an example of how you would be billed for **sending 52 billion custom metrics samples per month**:
 
 - 10 billion samples at €0.15 per million samples: €1.500
 - 15 billion samples at €0.13 per million samples: €1.950
diff --git a/changelog/may2024/2024-05-24-cockpit-added-orderable-data-source-for-cockpit.mdx b/changelog/may2024/2024-05-24-cockpit-added-orderable-data-source-for-cockpit.mdx
@@ -9,5 +9,5 @@ category: observability
 product: cockpit
 ---
 
-It is now possible to order and set up as many data sources as you want for your external data in Cockpit, in the Paris, Amsterdam, and Warsaw regions.
+It is now possible to order and set up as many data sources as you want for your custom data in Cockpit, in the Paris, Amsterdam, and Warsaw regions.
 
diff --git a/faq/cockpit.mdx b/faq/cockpit.mdx
@@ -6,7 +6,7 @@ content:
   h1: Cockpit
 hero: assets/scaleway-cockpit.webp
 dates:
-  validation: 2024-08-05
+  validation: 2024-09-10
 category: observability
 ---
 
@@ -28,41 +28,41 @@ Cockpit is billed based on [pricing plans](https://console.scaleway.com/cockpit/
 Pricing plans specify:
 
 - Retention time for your data:
-    * includes data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and your external data
+    * includes data from [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) and your custom data
 - Monitoring and alerting for your Scaleway data:
     * includes data from [Scaleway resources integrated with Cockpit only](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit)
 
-Additional costs apply for sending external data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources.
+Additional costs apply for sending custom data to Cockpit. This means that you will be billed for sending **data from Scaleway resources that are not integrated with Cockpit**, or data from any other external resources.
 
 Pricing plans are scoped per [Project](/identity-and-access-management/organizations-and-projects/concepts/#project).
 
-## How am I billed for using Cockpit with external data?
+## How am I billed for using Cockpit with custom data?
 
-External data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit.
+Custom data is any data that is external to Scaleway, or **data from Scaleway resources not integrated with Cockpit**. Refer to the [dedicated documentation page](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) to find out which resources are integrated with Cockpit.
 
-The retention time for your external data depends on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected.
+The retention time for your custom data depends on the [pricing plan](https://console.scaleway.com/cockpit/plans) you have selected.
 
-You will not be charged for **querying** external data.
+You will not be charged for **querying** custom data.
 
-- External metrics are billed €0.15 per million samples of metrics ingested, per month.
-- External logs are billed €0.35 per GB ingested, per month.
-- External traces are billed €0.35 per GB ingested, per month.
+- Custom metrics are billed €0.15 per million samples of metrics ingested, per month.
+- Custom logs are billed €0.35 per GB ingested, per month.
+- Custom traces are billed €0.35 per GB ingested, per month.
 
-**Starting April 2024, Scaleway will apply volume discounts to bill external metrics**. This means that the monthly pricing for external metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.**
+**Starting April 2024, Scaleway will apply volume discounts to bill custom metrics**. This means that the monthly pricing for custom metrics will be calculated in levels. **Scaleway applies six levels of volume discounts.**
 
-| Levels       | Range                                    | Monthly pricing with volume discounts    |
-|--------------|------------------------------------------|------------------------------------------|
-| Level one    | From 0 to 10 billion external metrics    | €0.15 per million samples                |
-| Level two    | From 10 to 25 billion external metrics   | €0.13 per million samples                |
-| Level three  | From 25 to 50 billion external metrics   | €0.12 per million samples                |
-| Level four   | From 50 to 100 billion external metrics  | €0.11 per million samples                |
-| Level five   | From 100 to 200 billion external metrics | €0.10 per million samples                |
-| Level six    | From 200 billion external metrics and beyond              | €0.08 per million samples                |
+| Levels       | Range                                        | Monthly pricing with volume discounts    |
+|--------------|----------------------------------------------|------------------------------------------|
+| Level one    | From 0 to 10 billion custom metrics          | €0.15 per million samples                |
+| Level two    | From 10 to 25 billion custom metrics         | €0.13 per million samples                |
+| Level three  | From 25 to 50 billion custom metrics         | €0.12 per million samples                |
+| Level four   | From 50 to 100 billion custom metrics        | €0.11 per million samples                |
+| Level five   | From 100 to 200 billion custom metrics       | €0.10 per million samples                |
+| Level six    | From 200 billion custom metrics and beyond   | €0.08 per million samples                |
 
 
-Here is an example of how you would be billed for **sending 52 billion external metrics samples per month**:
+Here is an example of how you would be billed for **sending 52 billion custom metrics samples per month**:
 
-Here is an example of how you would be billed for sending 52 billion external metrics samples per month:
+Here is an example of how you would be billed for sending 52 billion custom metrics samples per month:
 - 10 billion samples at €0.15 per million samples: €1.500
 - 15 billion samples at €0.13 per million samples: €1.950
 - 25 billion samples at €0.12 per million samples: €3.000
diff --git a/menu/navigation.json b/menu/navigation.json
@@ -3295,7 +3295,7 @@
                     "slug": "access-grafana-and-managed-dashboards"
                   },
                   {
-                    "label": "Create an external data source",
+                    "label": "Create a custom data source",
                     "slug": "create-external-data-sources"
                   },
                   {
@@ -3307,7 +3307,7 @@
                     "slug": "send-metrics-logs-to-cockpit"
                   },
                   {
-                    "label": "Delete an external data source",
+                    "label": "Delete a custom data source",
                     "slug": "delete-external-data-sources"
                   }
                 ],
diff --git a/observability/cockpit/api-cli/querying-logs-with-logcli.mdx b/observability/cockpit/api-cli/querying-logs-with-logcli.mdx
@@ -7,14 +7,14 @@ content:
   paragraph: Learn how to programmatically retrieve logs stored in Cockpit using LogCLI. Explore efficient querying methods to automate log retrieval from various data sources like Kubernetes clusters and Object Storage buckets.
 tags: cockpit observability logs logcli
 dates:
-  validation: 2024-06-19
+  validation: 2024-09-19
   posted: 2024-05-22
 categories:
   - observability
 ---
 
 
-This documentation page shows you how to retrieve your internal and external logs stored in Cockpit programmatically, using [LogCLI](https://grafana.com/docs/loki/latest/query/logcli/).
+This documentation page shows you how to retrieve your Scaleway and custom logs stored in Cockpit programmatically, using [LogCLI](https://grafana.com/docs/loki/latest/query/logcli/).
 
 Retrieving your logs programmatically can be useful in environments where automation, scalability, and integration with other systems are crucial. It enables advanced analytics, greater efficiency, and deeper insights than manual log retrieval through a user interface such as Grafana.
 
@@ -23,7 +23,7 @@ Retrieving your logs programmatically can be useful in environments where automa
   - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization
   - A Scaleway account logged into the [console](https://console.scaleway.com)
   - [Created a token](/observability/cockpit/how-to/create-token/) with the `query` permission for logs
-  - External and/or internal logs to query
+  - Custom and/or Scaleway logs to query
   - [Installed LogCLI](https://grafana.com/docs/loki/latest/query/logcli/#installation)
 
 
diff --git a/observability/cockpit/concepts.mdx b/observability/cockpit/concepts.mdx
@@ -58,11 +58,11 @@ Contact points define who is notified when an alert fires, according to the regi
 
 ## Data sources
 
-Data sources are regionalized backends that allow you to store and fetch your metrics, logs, and traces. By default, **internal data sources** are enabled if you are using [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) on your Project.
+Data sources are regionalized backends that allow you to store and fetch your metrics, logs, and traces. By default, **Scaleway data sources** are enabled if you are using [Scaleway resources integrated with Cockpit](/observability/cockpit/reference-content/cockpit-limitations/#product-integration-into-cockpit) on your Project.
 
-Internal data sources are **read-only**.
+Scaleway data sources are **read-only**.
 
-You can [create](/observability/cockpit/how-to/create-external-data-sources/) additional **external data sources** in the Paris, Amsterdam, and Warsaw regions, from your own external resources.
+You can [create](/observability/cockpit/how-to/create-external-data-sources/) additional **custom data sources** in the Paris, Amsterdam, and Warsaw regions, from your own external resources.
 
 ## Data types
 
diff --git a/observability/cockpit/how-to/activate-push-traces.mdx b/observability/cockpit/how-to/activate-push-traces.mdx
@@ -23,12 +23,12 @@ This page shows you how to create [traces](/observability/cockpit/concepts/#trac
 
 1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays.
 2. Click the **Data sources** tab.
-3. Click **+ Create external data sources**. A pop-up displays.
+3. Click **+ Create custom data sources**. A pop-up displays.
 4. Complete the required steps to create your trace:
     - Enter a name
     - Choose the **Traces** data type
     - Select a region to create your trace in
-5. Check the estimated cost, then click **Create external data source**.
+5. Check the estimated cost, then click **Create custom data source**.
 
 ### Retrieve traces push paths
 
diff --git a/observability/cockpit/how-to/create-external-data-sources.mdx b/observability/cockpit/how-to/create-external-data-sources.mdx
@@ -1,37 +1,35 @@
 ---
 meta:
-  title: How to create an external data source
-  description: Learn how to create an external data source and its data type using the Scaleway console. Follow the steps to choose a data type, select a region, and finalize the creation process.
+  title: How to create a custom data source
+  description: Learn how to create a custom data source and its data type using the Scaleway console. Follow the steps to choose a data type, select a region, and finalize the creation process.
 content:
-  h1: How to create an external data source
-  paragraph: Learn how to create an external data source and its data type using the Scaleway console. Follow the steps to choose a data type, select a region, and finalize the creation process.
+  h1: How to create a custom data source
+  paragraph: Learn how to create a custom data source and its data type using the Scaleway console. Follow the steps to choose a data type, select a region, and finalize the creation process.
 categories:
   - observability
 dates:
-  validation: 2024-06-19
+  validation: 2024-09-19
   posted: 2024-04-05
 ---
 
-This page shows you how to create an **external** [data source](/observability/cockpit/concepts/#data-sources) and its [data type](/observability/cockpit/concepts/#data-types), from the Scaleway console.
+This page shows you how to create a **custom** [data source](/observability/cockpit/concepts/#data-sources) and its [data type](/observability/cockpit/concepts/#data-types), from the Scaleway console.
 
 <Macro id="requirements" />
 
   - A Scaleway account logged into the [console](https://console.scaleway.com)
   - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization
 
-## Create an external data source
-
 1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays.
 2. Click the **Data sources** tab.
-3. Click **+ Create external data source**.
+3. Click **+ Create custom data source**.
 4. Enter a name for the data source.
 5. Choose the [data type](/observability/cockpit/concepts/#data-types) you want to create in the data source.
 6. Select the region for your data source.
     <Message type="tip">
       We recommend that you create your data sources in the same regions as the alert manager if you want to receive alerts for them.
     </Message>
-7. Click **Create external data source**.
+7. Click **Create custom data source**.
 
 <Message type="note">
-  If you are using Scaleway resources integrated with Cockpit, you can also view your internal data sources in the **Data sources** tab. Internal data sources are **read-only**.
+  If you are using Scaleway resources integrated with Cockpit, you can also view your Scaleway data sources in the **Data sources** tab. Scaleway data sources are **read-only**.
 </Message>
diff --git a/observability/cockpit/how-to/delete-external-data-sources.mdx b/observability/cockpit/how-to/delete-external-data-sources.mdx
@@ -1,26 +1,24 @@
 ---
 meta:
-  title: How to delete an external data source
-  description: Learn how to delete an external data source from the Scaleway console. Follow the steps to navigate to the data sources tab, select the data source, and confirm its deletion.
+  title: How to delete a custom data source
+  description: Learn how to delete a custom data source from the Scaleway console. Follow the steps to navigate to the data sources tab, select the data source, and confirm its deletion.
 content:
-  h1: How to delete an external data source
-  paragraph: Learn how to delete an external data source from the Scaleway console. Follow the steps to navigate to the data sources tab, select the data source, and confirm its deletion.
+  h1: How to delete a custom data source
+  paragraph: Learn how to delete a custom data source from the Scaleway console. Follow the steps to navigate to the data sources tab, select the data source, and confirm its deletion.
 categories:
   - observability
 dates:
-  validation: 2024-06-19
+  validation: 2024-09-19
   posted: 2024-04-13
 ---
 
-This page shows you how to delete an external [data source](/observability/cockpit/concepts/#data-sources) from the Scaleway console.
+This page shows you how to delete a custom [data source](/observability/cockpit/concepts/#data-sources) from the Scaleway console.
 
 <Macro id="requirements" />
 
   - A Scaleway account logged into the [console](https://console.scaleway.com)
   - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization
-  - [Created](/observability/cockpit/how-to/create-external-data-sources/) external data sources
-
-## Delete an external data source
+  - [Created](/observability/cockpit/how-to/create-external-data-sources/) custom data sources
 
 1. Click **Cockpit** in the Observability section of the [console](https://console.scaleway.com/) side menu. The **Cockpit** overview page displays.
 2. Click the **Data sources** tab.
diff --git a/observability/cockpit/how-to/send-metrics-logs-to-cockpit.mdx b/observability/cockpit/how-to/send-metrics-logs-to-cockpit.mdx
@@ -51,7 +51,7 @@ You can push logs with any Loki compatible agent such as the [Promtail](https://
     ## Sending Python logs to Cockpit
 
     <Message type="important">
-     You need external logs in the `fr-par` region to follow the procedure below. Find out [how to create external logs](/observability/cockpit/how-to/create-external-data-sources/).
+     You need custom logs in the `fr-par` region to follow the procedure below. Find out [how to create custom logs](/observability/cockpit/how-to/create-external-data-sources/).
     </Message>
 
     1. Open a terminal and run `pip install python-logging-loki` or `pip3 install python-logging-loki` if you are using Python 3, to install the [logging_loki](https://pypi.org/project/python-logging-loki/) package to send your Python logs.
@@ -101,7 +101,7 @@ You can push logs with any Loki compatible agent such as the [Promtail](https://
     5. Click **Load**.
     6. Enter a name for the dashboard or leave the default name.
     7. Select a folder in which to store the dashboard.
-    8. Select your external logs data source in the **Loki** drop-down. Make sure that the data source you select is in the `fr-par` region.
+    8. Select your custom logs data source in the **Loki** drop-down. Make sure that the data source you select is in the `fr-par` region.
     9. Click **Import**.
     10. Open a terminal and enter the following command.
         ```
diff --git a/observability/cockpit/index.mdx b/observability/cockpit/index.mdx
@@ -57,8 +57,8 @@ meta:
         label="Read more"
     />
     <DefaultCard
-        title="Send Kapsule logs and metrics to the Observability Cockpit with Fluent Bit"
-        url="/tutorials/k8s-fluentbit-observability/"
+        title="Send metrics to Cockpit using Grafana Alloy"
+        url="/observability/cockpit/how-to/send-metrics-with-grafana-alloy/"
         label="Read more"
     />
 </Grid>
diff --git a/observability/cockpit/quickstart.mdx b/observability/cockpit/quickstart.mdx
diff --git a/observability/cockpit/reference-content/understanding-cockpit-usage.mdx b/observability/cockpit/reference-content/understanding-cockpit-usage.mdx
diff --git a/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx b/tutorials/pushing-metrics-logs-from-scw-instance/index.mdx
diff --git a/tutorials/use-cockpit-with-terraform/index.mdx b/tutorials/use-cockpit-with-terraform/index.mdx

Original file line number	Diff line number	Diff line change
`@@ -3295,7 +3295,7 @@`
`3295`	`3295`	`"slug": "access-grafana-and-managed-dashboards"`
`3296`	`3296`	`},`
`3297`	`3297`	`{`
`3298`		`- "label": "Create an external data source",`
	`3298`	`+ "label": "Create a custom data source",`
`3299`	`3299`	`"slug": "create-external-data-sources"`
`3300`	`3300`	`},`
`3301`	`3301`	`{`
`@@ -3307,7 +3307,7 @@`
`3307`	`3307`	`"slug": "send-metrics-logs-to-cockpit"`
`3308`	`3308`	`},`
`3309`	`3309`	`{`
`3310`		`- "label": "Delete an external data source",`
	`3310`	`+ "label": "Delete a custom data source",`
`3311`	`3311`	`"slug": "delete-external-data-sources"`
`3312`	`3312`	`}`
`3313`	`3313`	`],`