Merge branch 'main' into patch-1

Author: bennycode

CONTRIBUTING/README.md

@@ -43,23 +43,28 @@ If you don't want to build with Docker (refer to repo README), you'll need the f
 
 To build locally:
 
-1. Clone the project
+1. Clone the project.
+
   ```bash
   git clone [email protected]:grafana/k6-docs.git
   cd k6-docs
-  npm install  # or yarn install
   ```
+
 2. Use the version manager to install a version of node compatible with the version in `package.json`.
+
  ```bash
   nvm install 16.16
   nvm use 16.16
   ```
+
 3. Install dependencies (only necessary the first time).
+
   ```bash
   npm install  # or yarn install
   ```
 
-4. Run the docs locally:
+4. Run the docs locally.
+
   ```bash
   npm start  # or yarn start
   ```

src/components/shared/seo/seo.view.js

@@ -18,7 +18,6 @@ export const SEO = ({
   facebook,
   pageTranslations = null,
   pageVersions = null,
-  version = LATEST_VERSION,
 } = {}) => {
   const {
     site: {
@@ -49,11 +48,6 @@ export const SEO = ({
   const currentUrl = slug && slug !== '*' ? getPageHref(docs, slug) : docs;
   const currentRobotsContent = useRef('index, follow');
   let versionedCanonicalUrl = currentUrl;
-  let currentLanguage = 'en';
-
-  if ((slug && slug.startsWith('es/')) || (slug && slug.startsWith('/es/'))) {
-    currentLanguage = 'es';
-  }
 
   // set canonical path to latest version URL if it's available
   if (pageVersions && typeof pageVersions[LATEST_VERSION] !== 'undefined') {
@@ -125,8 +119,7 @@ export const SEO = ({
       <meta name={'twitter:card'} content={'summary'} />
       <meta name={'twitter:creator'} content={authorTwitterAccount} />
 
-      <meta name="docsearch:language" content={currentLanguage} />
-      <meta name="docsearch:version" content={version} />
+      <meta name="category" content="Documentation" />
 
       {/* Canonical links for versioned pages */}
       <link href={versionedCanonicalUrl} rel="canonical" />

src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/100 Test-for-functional-behavior.md

@@ -66,13 +66,23 @@ After the test finishes, k6 reports the [default result summary](/results-output
   ...
 ```
 
-To make sure you're getting the right response, you could log the response body to the console as follows:
+As an optional step, you can log the response body to the console to make sure you're getting the right response.
+
+<CodeGroup labels={["api-test.js"]} lineNumbers={[]} showCopyButton={[true]}>
 
 ```javascript
-const res = http.post(url, payload, params);
-console.log(res.body);
+export default function () {
+  ...
+
+  const res = http.post(url, payload, params);
+
+  // Log the request body
+  console.log(res.body);
+}
 ```
 
+</CodeGroup>
+
 ## Add response checks
 
 Once you're sure the request is well-formed, add a [check](/using-k6/checks) that validates whether the system responds with the expected status code.
@@ -111,6 +121,12 @@ Once you're sure the request is well-formed, add a [check](/using-k6/checks) tha
   
   </CodeGroup>
 
+1. Run the script again.
+
+  ```bash
+  k6 run api-test.js
+  ```
+
 1. Inspect the result output for your check.
    It should look something like this.
 

src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/200 Test for performance.md

@@ -11,7 +11,7 @@ In this tutorial, learn how to:
 - Use [thresholds](/using-k6/thresholds) to assert for performance criteria
 - Configure load increases through [scenarios](/using-k6/scenarios)
 
-These examples build on the script from the previous section.
+These examples build on the script from the [previous section](/examples/tutorials/get-started-with-k6/test-for-functional-behavior/).
 
 ## Context: meet service-level objectives
 
@@ -24,33 +24,34 @@ The service must meet these SLOs under different types of usual traffic.
 ## Assert for performance with thresholds
 
 To codify the SLOs, add [_thresholds_](/using-k6/thresholds) to test that your system performs to its goal criteria.
-Thresholds are set in options.
+
+Thresholds are set in the [`options`](/using-k6/k6-options/) object.
 
 
 ```javascript
 export const options = {
-  //define thresholds
+  // define thresholds
   thresholds: {
     http_req_failed: ['rate<0.01'], // http errors should be less than 1%
     http_req_duration: ['p(99)<1000'], // 99% of requests should be below 1s
   },
 };
 ```
 
-Add this [`options`](/using-k6/k6-options/) object with thresholds to your script `api-test.js`. 
+Add this `options` object with thresholds to your script `api-test.js`. 
 
 
 <CodeGroup labels={["api-test.js"]} lineNumbers={[true]} showCopyButton={[true]}
 heightTogglers={[true]}>
 
 ```javascript
-// Import necessary modules
+// import necessary modules
 import { check } from "k6";
 import http from "k6/http";
 
-//define configuration
+// define configuration
 export const options = {
-  //define thresholds
+  // define thresholds
   thresholds: {
     http_req_failed: ['rate<0.01'], // http errors should be less than 1%
     http_req_duration: ["p(99)<1000"], // 99% of requests should be below 1s
@@ -75,21 +76,20 @@ export default function () {
 
   // check that response is 200
   check(res, {
-    "login response was 200": (res) => res.status == 200,
+    "response code was 200": (res) => res.status == 200,
   });
 }
 
 ```
 
 </CodeGroup>
 
-Run the test as usual: 
+Run the test. 
 
 ```bash
 k6 run api-test.js
 ```
 
-
 Inspect the console output to determine whether performance crossed a threshold.
 
 ```
@@ -98,7 +98,7 @@ Inspect the console output to determine whether performance crossed a threshold.
 ✗ http_req_failed................: 0.00% ✓ 0        ✗ 1
 ```
 
-
+The ✓ and ✗ symbols indicate whether the performance thresholds passed or failed.
 
 ## Test performance under increasing load
 
@@ -110,7 +110,7 @@ Scenarios schedule load according to the number of VUs, number of iterations, VU
 
 ### Run a smoke test
 
-Start small. Run a [smoke test](/test-types/smoke-testing "a small test to confirm the script works properly") to see your script can handle minimal load.
+Start small. Run a [smoke test](/test-types/smoke-testing "a small test to confirm the script works properly") to check that your script can handle a minimal load.
 
 To do so, use the [`--iterations`](/using-k6/k6-options/reference/#iterations) flag with an argument of 10 or fewer.
 
@@ -123,19 +123,22 @@ Good thing you ran the test early!
 
 ### Run a test against an average load
 
-Now increase the load.
-
 Generally, traffic doesn't arrive all at once.
 Rather, it gradually increases to a peak load.
 To simulate this, testers increase the load in _stages_.
 
-Since this is a learning environment, the stages are still quite short.
-Add the following _scenario_ to your options `object` and rerun the test.
-Where the smoke test defined the load in terms of iterations, this configuration uses the [`ramping-vus` executor](/using-k6/scenarios/executors/ramping-vus/) to express load through virtual users and duration.
+Add the following `scenario` property to your `options` object and rerun the test.
 
-```json
+```javascript
+export const options = {
+  // define thresholds
+  thresholds: {
+    http_req_failed: ['rate<0.01'], // http errors should be less than 1%
+    http_req_duration: ['p(99)<1000'], // 99% of requests should be below 1s
+  },
+  // define scenarios
   scenarios: {
-    //arbitrary name of scenario
+    // arbitrary name of scenario
     average_load: {
       executor: "ramping-vus",
       stages: [
@@ -148,8 +151,12 @@ Where the smoke test defined the load in terms of iterations, this configuration
       ],
     },
   }
+};
 ```
 
+Since this is a learning environment, the stages are still quite short.
+Where the smoke test defined the load in terms of iterations, this configuration uses the [`ramping-vus` executor](/using-k6/scenarios/executors/ramping-vus/) to express load through virtual users and duration.
+
 Run the test with no command-line flags: 
 
 ```bash
@@ -159,7 +166,6 @@ k6 run api-test.js
 The load is small, so the server should perform within thresholds.
 However, this test server may be under load by many k6 learners, so the results are unpredictable.
 
-
 <Blockquote mod="note" title="To visualize results...">
 
 At this point, it'd be nice to have a graphical interface to visualize metrics as they occur.
@@ -176,13 +182,13 @@ In this case, run the test until the availability (error rate) threshold is cros
 
 To do this:
 
-1. Configure the threshold to abort when it fails.
+1. Add the `abortOnFail` property to `http_req_failed`.
 
   ```javascript
   http_req_failed: [{ threshold: "rate<0.01", abortOnFail: true }], // http errors should be less than 1%, otherwise abort the test
   ```
 
-1. Configure the load to ramp the test up until it fails.
+1. Update the `scenarios` property to ramp the test up until it fails.
 
   ```javascript
   export const options = {
@@ -191,7 +197,7 @@ To do this:
       http_req_duration: ['p(99)<1000'], 
     },
     scenarios: {
-      //arbitrary name of scenario:
+      // define scenarios
       breaking: {
         executor: "ramping-vus",
         stages: [
@@ -211,20 +217,24 @@ To do this:
   ```
 
 Here is the full script.
-Copy and run it with `k6 run api-test.js`.
 
 <CodeGroup labels={["api-test.js"]} lineNumbers={[true]} showCopyButton={[true]}
 heightTogglers={[true]}>
 
 ```javascript
-// Import necessary modules
+// import necessary modules
 import { check } from "k6";
 import http from "k6/http";
 
-//define configuration
+// define configuration
 export const options = {
+  // define thresholds
+  thresholds: {
+    http_req_failed: [{ threshold: "rate<0.01", abortOnFail: true }], // availability threshold for error rate
+    http_req_duration: ["p(99)<1000"], // Latency threshold for percentile
+  },
+  // define scenarios
   scenarios: {
-    //arbitrary name of scenario:
     breaking: {
       executor: "ramping-vus",
       stages: [
@@ -240,11 +250,6 @@ export const options = {
       ],
     },
   },
-  //define thresholds
-  thresholds: {
-    http_req_failed: [{ threshold: "rate<0.01", abortOnFail: true }], // availability threshold for error rate
-    http_req_duration: ["p(99)<1000"], // Latency threshold for percentile
-  },
 };
 
 export default function () {
@@ -265,21 +270,26 @@ export default function () {
 
   // check that response is 200
   check(res, {
-    "login response was 200": (res) => res.status == 200,
+    "response code was 200": (res) => res.status == 200,
   });
 }
 
 ```
 
 </CodeGroup>
 
+Run the test. 
+
+```bash
+k6 run api-test.js
+```
+
 Did the threshold fail? If not, add another stage with a higher target and try again. Repeat until the threshold aborts the test:
 
 ```bash
 ERRO[0010] thresholds on metrics 'http_req_duration, http_req_failed' were breached; at least one has abortOnFail enabled, stopping test prematurely 
 ```
 
-
 ## Next steps
 
 In this tutorial, you used [thresholds](/using-k6/thresholds/) to assert performance and [Scenarios](/using-k6/scenarios) to schedule different load patterns. To learn more about the usual load patterns and their goals, read [Load Test Types](/test-types/load-test-types/)