Skip to content

Commit

Permalink
Merge branch 'master' into fix/issue238
Browse files Browse the repository at this point in the history
* master:
  fix: resolved eslint warnings (#373)
  Include k6-api status PATCH with info on how to stop test. Resolve #162. (#371)
  Adding Grafana Cloud to the Integration list
  • Loading branch information
ppcano committed Aug 12, 2021
2 parents a9336a0 + 0b2e4fb commit 586cc46
Show file tree
Hide file tree
Showing 24 changed files with 217 additions and 703 deletions.
30 changes: 14 additions & 16 deletions src/components/blocks/footer-column/footer-column.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@ const getClassNames = (docLayout) =>
styles.bottomLinkColumn,
);

export const FooterColumn = ({ title, items, docLayout }) => {
return (
<div className={`${getClassNames(docLayout)}`}>
<h3 className={styles.navColumnTitle}>{title}</h3>
<ul className={styles.navColumnList}>
{items.map((item) => (
<li className={styles.navColumnItem}>
<a className={styles.navColumnLink} href={`${item.url}`}>
{item.title}
</a>
</li>
))}
</ul>
</div>
);
};
export const FooterColumn = ({ title, items, docLayout }) => (
<div className={`${getClassNames(docLayout)}`}>
<h3 className={styles.navColumnTitle}>{title}</h3>
<ul className={styles.navColumnList}>
{items.map((item) => (
<li className={styles.navColumnItem}>
<a className={styles.navColumnLink} href={`${item.url}`}>
{item.title}
</a>
</li>
))}
</ul>
</div>
);
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,23 @@ export const EcosystemTitleGroup = ({
title,
description,
breadcrumbs = null,
}) => {
return (
<div className={styles.wrapper}>
<PageInfo
title={title}
description={description}
variant="wide"
className="container"
breadcrumbs={breadcrumbs}
/>
<a
className={classNames(styles.editLink, breadcrumbs && styles.low)}
href={EXTENSIONS_HREF}
target={'_blank'}
rel={'noreferrer'}
>
<Pencil />
Add your own extension
</a>
</div>
);
};
}) => (
<div className={styles.wrapper}>
<PageInfo
title={title}
description={description}
variant="wide"
className="container"
breadcrumbs={breadcrumbs}
/>
<a
className={classNames(styles.editLink, breadcrumbs && styles.low)}
href={EXTENSIONS_HREF}
target={'_blank'}
rel={'noreferrer'}
>
<Pencil />
Add your own extension
</a>
</div>
);
6 changes: 3 additions & 3 deletions src/components/pages/doc-page/glossary/glossary.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react';

import styles from './glossary.module.scss';

const Glossary = ({ children }) => {
return <div className={styles.wrapper}>{children}</div>;
};
const Glossary = ({ children }) => (
<div className={styles.wrapper}>{children}</div>
);

export default Glossary;
6 changes: 3 additions & 3 deletions src/components/shared/code/code-inline.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import './code-inline.scss';

const CodeInline = ({ children }) => {
return <span className="code-inline">{children}</span>;
};
const CodeInline = ({ children }) => (
<span className="code-inline">{children}</span>
);

export default CodeInline;
20 changes: 9 additions & 11 deletions src/components/shared/code/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,15 @@ const Code = ({ children, showLineNumbers, showHeightToggler }) => {
<span className={styles.lineNumber}>{i + 1}</span>
)}
<span className={styles.lineContent}>
{line.map((token, key) => {
return (
<span
{...getTokenProps({
token,
key,
})}
style={undefined}
/>
);
})}
{line.map((token, key) => (
<span
{...getTokenProps({
token,
key,
})}
style={undefined}
/>
))}
</span>
</div>
);
Expand Down
30 changes: 14 additions & 16 deletions src/components/shared/cta-doc/cta-doc--default/cta-doc--default.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,22 @@ import ButtonBg from '../svg/button-bg.inline.svg';

import styles from './cta-doc--default.module.scss';

export const CtaDocDefault = ({ title, description, Button }) => {
return (
<div className={'row'}>
<div className={'col-xl-12'}>
<div className={styles.wrapperLight}>
<div className={styles.inner}>
<div className={styles.content}>
<p className={styles.title}>{title}</p>
<p className={styles.description}>{description}</p>
</div>
export const CtaDocDefault = ({ title, description, Button }) => (
<div className={'row'}>
<div className={'col-xl-12'}>
<div className={styles.wrapperLight}>
<div className={styles.inner}>
<div className={styles.content}>
<p className={styles.title}>{title}</p>
<p className={styles.description}>{description}</p>
</div>

<div className={styles.buttonWrapper}>
<ButtonBg className={styles.buttonBg} />
<Button />
</div>
<div className={styles.buttonWrapper}>
<ButtonBg className={styles.buttonBg} />
<Button />
</div>
</div>
</div>
</div>
);
};
</div>
);
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,27 @@ import React from 'react';

import styles from './cta-doc--with-image.module.scss';

export const CtaDocWithImage = ({ title, description, image, Button }) => {
return (
<div className={'row'}>
<div className={'col-xl-12'}>
<div className={styles.wrapperGradient}>
<div className={styles.outer}>
<div className={`row ${styles.inner}`}>
<div className={`col-md-6 col-12 ${styles.hook}`}>
<div className={styles.imgWrapper}>
<Img fluid={image} className={styles.img} />
</div>
export const CtaDocWithImage = ({ title, description, image, Button }) => (
<div className={'row'}>
<div className={'col-xl-12'}>
<div className={styles.wrapperGradient}>
<div className={styles.outer}>
<div className={`row ${styles.inner}`}>
<div className={`col-md-6 col-12 ${styles.hook}`}>
<div className={styles.imgWrapper}>
<Img fluid={image} className={styles.img} />
</div>
<div className={`col-md-6 col-12 ${styles.hook}`}>
<div className={styles.cloudText}>
<p className={styles.title}>{title}</p>
<p>{description}</p>
<Button />
</div>
</div>
<div className={`col-md-6 col-12 ${styles.hook}`}>
<div className={styles.cloudText}>
<p className={styles.title}>{title}</p>
<p>{description}</p>
<Button />
</div>
</div>
</div>
</div>
</div>
</div>
);
};
</div>
);
14 changes: 7 additions & 7 deletions src/contexts/i18n-provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ import React from 'react';
import { useLocale } from './locale-provider';

export const I18nContext = React.createContext(null);
export const useI18n = () => {
return React.useContext(I18nContext);
};
export const useI18n = () => React.useContext(I18nContext);

export default function I18nProvider({ children }) {
const { locale } = useLocale();

const i18nContextValue = React.useMemo(() => {
return {
const i18nContextValue = React.useMemo(
() => ({
t: (key) => {
let msgLocalized = localizedMessages[locale][key];
if (!msgLocalized) {
// eslint-disable-next-line no-console
console.warn(`i18n/[${locale}]: no localized message for ${key}`);
msgLocalized = localizedMessages.en[key];
if (!msgLocalized) {
Expand All @@ -24,8 +23,9 @@ export default function I18nProvider({ children }) {
}
return msgLocalized;
},
};
}, [locale]);
}),
[locale],
);

return (
<I18nContext.Provider value={i18nContextValue}>
Expand Down
13 changes: 6 additions & 7 deletions src/contexts/locale-provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import { I18N_CONFIG } from 'i18n/i18n-config';
import React, { useState, useEffect, useMemo, useRef, useContext } from 'react';

export const LocaleContext = React.createContext(null);
export const useLocale = () => {
return useContext(LocaleContext);
};
export const useLocale = () => useContext(LocaleContext);

export default function LocaleProvider({ urlLocale = 'en', children }) {
let initLocale =
Expand All @@ -31,8 +29,8 @@ export default function LocaleProvider({ urlLocale = 'en', children }) {
}
}, [urlLocale]);

const localeContextValue = useMemo(() => {
return {
const localeContextValue = useMemo(
() => ({
get locale() {
return curLocaleRef.current;
},
Expand All @@ -44,8 +42,9 @@ export default function LocaleProvider({ urlLocale = 'en', children }) {
curLocaleRef.current = locale;
setRenderKey({});
},
};
}, [renderKey, urlLocale]);
}),
[renderKey, urlLocale],
);

return (
<LocaleContext.Provider value={localeContextValue}>
Expand Down
40 changes: 39 additions & 1 deletion src/data/markdown/translated-guides/en/07 Misc/04 k6 REST API.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: 'k6 REST API'
excerpt: ''
excerpt: 'With this API you can see and control different execution aspects like
number of VUs, Max VUs, pause or resume the test, list groups, set and get the
setup data and more.'
hideFromSidebar: true
---

Expand Down Expand Up @@ -582,3 +584,39 @@ curl -X PUT \
This endpoint parses the JSON request body and sets the result as Setup data.

For more detail about the setup stage please go to [Test life cycle](/using-k6/test-life-cycle).

## Stop Test

**PATCH** `http://localhost:6565/v1/status`

<CodeGroup labels={["cURL Request", "Response"]}>

```bash
curl -X PATCH \
http://localhost:6565/v1/status \
-H 'Content-Type: application/json' \
-d '{
"data": {
"type": "status",
"id": "default",
"attributes": {
"stopped": true
}
}
}'
```

```json
{
"data": {
"type": "status",
"id": "default",
"attributes": {
"stopped": true
}
}
}
```
</CodeGroup>

This call parses the JSON request body to update the status and stop a running test.
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ k6 run --execution-segment "3/4:1" --execution-segment-sequence "0,1/4,2/4,3

Sin embargo -en este momento el modo de ejecución distribuido de k6 no es del todo funcional. Las limitaciones actuales son:

- k6 no proporciona un coordinador de pruebas o instancia maestra para coordinar la ejecución distribuida de la prueba. Como alternativa, se puede utilizar la API REST de k6 y --paused para sincronizar la ejecución de las múltiples instancias de k6.
- k6 no proporciona un coordinador de pruebas o instancia maestra para coordinar la ejecución distribuida de la prueba. Como alternativa, se puede utilizar la [API REST de k6](/misc/k6-rest-api) y --paused para sincronizar la ejecución de las múltiples instancias de k6.
- Cada instancia de k6 evalúa los umbrales de forma independiente, excluyendo los resultados de las otras instancias de k6. Si desea desactivar la ejecución de umbrales, utilice --no-thresholds.
- k6 informa de las métricas individualmente para cada instancia. Dependiendo de cómo almacene los resultados de las pruebas de carga, tendrá que agregar algunas métricas para calcularlas correctamente.

Expand Down
Loading

0 comments on commit 586cc46

Please sign in to comment.