Merge branch 'main' into experimental/fs

grafana · Oct 6, 2023 · 73a3f9c · 73a3f9c
2 parents 8d1bed4 + 0cb25f0
commit 73a3f9c
Show file tree

Hide file tree

Showing 66 changed files with 570 additions and 237 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -11,4 +11,3 @@ src/data/markdown/docs/40 xk6-disruptor/04 Examples/02 Inject HTTP faults into P
 src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/100 Test-for-functional-behavior.md
 src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/200 Test for performance.md
 src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/400 Reuse and re-run tests.md
-
diff --git a/.vale/Vocab/docs/accept.txt b/.vale/Vocab/docs/accept.txt
@@ -63,6 +63,8 @@ Capitan
 charset
 contentful
 corejs
+croc
+crocs
 cron
 crypto
 Ctrl

diff --git a/gatsby-node.js b/gatsby-node.js
@@ -1362,14 +1362,14 @@ const createRedirects = ({ actions }) => {
   createRedirect({
     fromPath: '/cloud/cloud-faq/private-load-zones/',
     toPath:
-      'https://grafana.com/docs/grafana-cloud/k6/author-run/cloud-scripting-extras/load-zones/',
+      'https://grafana.com/docs/grafana-cloud/k6/author-run/private-load-zone-v2/',
     isPermanent: true,
   });
 
   createRedirect({
     fromPath: '/cloud/creating-and-running-a-test/private-load-zones/',
     toPath:
-      'https://grafana.com/docs/grafana-cloud/k6/author-run/cloud-scripting-extras/load-zones/',
+      'https://grafana.com/docs/grafana-cloud/k6/author-run/private-load-zone-v2/',
     isPermanent: true,
   });
 
@@ -1693,6 +1693,11 @@ const createRedirects = ({ actions }) => {
     toPath: '/testing-guides/automated-performance-testing/',
     isPermanent: true,
   });
+  createRedirect({
+    fromPath: '/examples/advanced-api-flow/',
+    toPath: '/examples/api-crud-operations/',
+    isPermanent: true,
+  });
 
   const redirects = {
     '/javascript-api/k6-http/cookiejar-k6-http/':

diff --git a/src/data/doc-examples/links.json b/src/data/doc-examples/links.json
@@ -55,10 +55,10 @@
       "to": "/examples/data-uploads"
     },
     {
-      "title": "Advanced API example",
-      "description": "This example covers the usage of different k6 APIs for API load testing.",
+      "title": "API CRUD Operations",
+      "description": "This example covers the usage of different k6 APIs for API CRUD operations testing.",
       "url": "",
-      "to": "/examples/advanced-api-flow"
+      "to": "/examples/api-crud-operations"
     },
     {
       "title": "Generating UUIDs",
@@ -201,4 +201,4 @@
       "url": "https://k6.io/blog/extending-k6-with-xk6"
     }
   ]
-}
+}
diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM.md b/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM.md
@@ -3,6 +3,12 @@ title: 'Cloud APM'
 excerpt: 'How to export metrics from k6 Cloud to APM platforms'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your APM and k6 metrics.
+
+</Blockquote>
+
 Cloud tests can export their metrics in near real-time to application performance monitoring (APM) platforms.
 By combining k6 Cloud with an APM, you can correlate and query testing metrics with other system metrics.
 

diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/01 Grafana Cloud.md b/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/01 Grafana Cloud.md
@@ -3,6 +3,12 @@ title: 'Grafana Cloud'
 excerpt: 'How to export metrics from k6 Cloud to Grafana Cloud'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your APM and k6 metrics.
+
+</Blockquote>
+
 With this integration, you can export test result metrics from the k6 Cloud to a Prometheus instance hosted by [Grafana Cloud](https://grafana.com/products/cloud/).
 After that, you can use Grafana to query, visualize, and correlate k6 metrics with all your other metrics.
 

diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/02 Azure Monitor.md b/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/02 Azure Monitor.md
@@ -3,6 +3,12 @@ title: 'Azure Monitor'
 excerpt: 'How to export metrics from k6 Cloud to Azure Monitor'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your APM and k6 metrics.
+
+</Blockquote>
+
 You can export test result metrics from the k6 Cloud to [Azure Monitor](https://azure.microsoft.com/en-us/services/monitor/),
 and use Azure Monitor to store and analyze all your data from your Azure and other environments.
 

diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/03 DataDog.md b/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/03 DataDog.md
@@ -4,6 +4,12 @@ head_title: 'Datadog integration with k6 Cloud'
 excerpt: 'How to export metrics from k6 Cloud to Datadog'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your APM and k6 metrics.
+
+</Blockquote>
+
 With this integration, you can export test-result metrics from the k6 Cloud to [Datadog](https://www.datadoghq.com/), where you can visualize and correlate k6 metrics with other monitored metrics.
 
 > ⭐️  &nbsp;[Cloud APM](/cloud/integrations/cloud-apm/) integrations are available on Pro and Enterprise plans, as well as the annual Team plan and Trial.

diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/04 New Relic.md b/src/data/markdown/docs/03 cloud/04 Integrations/05 Cloud APM/04 New Relic.md
@@ -3,6 +3,12 @@ title: 'New Relic'
 excerpt: 'How to export metrics from k6 Cloud to New Relic'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your APM and k6 metrics.
+
+</Blockquote>
+
 With this integration, you can export test result metrics from the k6 Cloud to the [New Relic](https://newrelic.com/) data platform.
 
 > ⭐️  &nbsp;[Cloud APM](/cloud/integrations/cloud-apm/) integrations are available on Pro and Enterprise plans, as well as the annual Team plan and Trial.

diff --git a/src/data/markdown/docs/03 cloud/04 Integrations/07 Prometheus Remote Write.md b/src/data/markdown/docs/03 cloud/04 Integrations/07 Prometheus Remote Write.md
@@ -4,6 +4,12 @@ slug: '/cloud/integrations/prometheus-remote-write/'
 excerpt: 'How to export metrics from k6 Cloud to a Prometheus instance using the Prometheus remote-write integration'
 ---
 
+<Blockquote mod="attention" title="">
+
+This feature is being deprecated. If you're using [Grafana Cloud k6](https://grafana.com/products/cloud/k6/), we recommend using [Data source plugins for Grafana](https://grafana.com/grafana/plugins/data-source-plugins/) to visualize and correlate your Prometheus and k6 metrics.
+
+</Blockquote>
+
 With the Prometheus remote write integration, you can export metrics from k6 Cloud to a self-hosted or managed Prometheus instance.
 If you want to export local results over the remote write protocol, refer to [Prometheus remote write](https://k6.io/docs/results-output/real-time/prometheus-remote-write/).
 

diff --git a/src/data/markdown/docs/03 cloud/07 Cloud reference/999 Release notes.md b/src/data/markdown/docs/03 cloud/07 Cloud reference/999 Release notes.md
@@ -108,7 +108,7 @@ excerpt: 'On this page, you can find the product release notes of k6 Cloud.'
 
 ### v3.4.3.internal `(2022-4-26)`
 - Internal: improve cloud service stability and reliability.
-- Fix: [private load zones](/cloud/creating-and-running-a-test/private-load-zones/) authentication.
+- Fix: private load zones(/cloud/creating-and-running-a-test/private-load-zones/) authentication.
 
 ### `v0.3.0` [Grafana k6 Cloud App](https://grafana.com/grafana/plugins/grafana-k6-app/) `(2022-4-25)`
 

diff --git a/src/data/markdown/docs/05 Examples/01 Examples/02 http-authentication.md b/src/data/markdown/docs/05 Examples/01 Examples/02 http-authentication.md
@@ -118,7 +118,7 @@ Here's an example script to demonstrate how to sign a request to fetch an object
 
 ```javascript
 import http from 'k6/http';
-import { AWSConfig, SignatureV4 } from 'https://jslib.k6.io/aws/0.9.0/signature.js';
+import { AWSConfig, SignatureV4 } from 'https://jslib.k6.io/aws/0.10.0/signature.js';
 
 const awsConfig = new AWSConfig({
     region: __ENV.AWS_REGION,

diff --git a/src/data/markdown/docs/05 Examples/01 Examples/10 advanced-api-flow.md b/src/data/markdown/docs/05 Examples/01 Examples/10 advanced-api-flow.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ src/data/markdown/docs/40 xk6-disruptor/04 Examples/02 Inject HTTP faults into P
		src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/100 Test-for-functional-behavior.md
		src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/200 Test for performance.md
		src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/400 Reuse and re-run tests.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,8 @@ Capitan @@
     charset
     contentful
     corejs
+    croc
+    crocs
     cron
     crypto
     Ctrl
@@ Expand Down @@