Skip to content

Commit 6d1557a

Browse files
authored
Merge branch 'main' into patch-1
2 parents a8404ee + ee675b5 commit 6d1557a

File tree

189 files changed

+7299
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+7299
-1360
lines changed

.github/workflows/staging.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ jobs:
139139
https://linkedin.com,
140140
googleapis.com,
141141
https://www.linkedin.com/company/k6io,
142-
https://staging.k6.io/slack
142+
https://staging.k6.io/slack,
143+
https://twitter.com/k6_io
143144
verbosity: "ERROR"
144145
markdown: false

.vale/Vocab/docs/accept.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
(?i)html
1313
(?i)http
1414
(?i)https
15+
(?i)iter
1516
(?i)json
1617
(?i)param
1718
(?i)params
@@ -204,4 +205,6 @@ webvital
204205
variadic
205206
shm
206207
srgb
207-
kwallet
208+
kwallet
209+
referer
210+
scrollable

gatsby-config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ const plugins = [
148148
excludes: ['/get-started/welcome', '/docs/get-started/welcome'],
149149
},
150150
},
151+
{
152+
resolve: `@tmttn/gatsby-plugin-linkedin-insight`,
153+
options: {
154+
partnerId: '4981058',
155+
includeInDevelopment: false,
156+
},
157+
},
151158
];
152159

153160
if (

gatsby-node.js

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,12 +1393,6 @@ const createRedirects = ({ actions }) => {
13931393
isPermanent: true,
13941394
});
13951395

1396-
createRedirect({
1397-
fromPath: '/results-visualization/influxdb-+-grafana/',
1398-
toPath: '/results-output/real-time/influxdb-grafana/',
1399-
isPermanent: true,
1400-
});
1401-
14021396
createRedirect({
14031397
fromPath: '/results-visualization/netdata/',
14041398
toPath: '/results-output/real-time/netdata/',
@@ -1547,12 +1541,6 @@ const createRedirects = ({ actions }) => {
15471541
isPermanent: true,
15481542
});
15491543

1550-
createRedirect({
1551-
fromPath: '/es/visualizacion-de-resultados/influxdb-+-grafana/',
1552-
toPath: '/es/visualizacion-de-resultados/influxdb-grafana/',
1553-
isPermanent: true,
1554-
});
1555-
15561544
createRedirect({
15571545
fromPath: '/using-k6/scenarios/arrival-rate',
15581546
toPath: '/using-k6/scenarios/concepts/open-vs-closed',
@@ -1591,6 +1579,36 @@ const createRedirects = ({ actions }) => {
15911579
isPermanent: true,
15921580
});
15931581

1582+
createRedirect({
1583+
fromPath: '/results-output/real-time/grafana-cloud',
1584+
toPath: '/results-output/real-time/grafana-cloud-prometheus/',
1585+
isPermanent: true,
1586+
});
1587+
1588+
createRedirect({
1589+
fromPath: '/es/visualizacion-de-resultados/influxdb-+-grafana/',
1590+
toPath: '/results-output/grafana-dashboards/',
1591+
isPermanent: true,
1592+
});
1593+
1594+
createRedirect({
1595+
fromPath: '/es/visualizacion-de-resultados/influxdb-grafana/',
1596+
toPath: '/results-output/grafana-dashboards/',
1597+
isPermanent: true,
1598+
});
1599+
1600+
createRedirect({
1601+
fromPath: '/results-output/real-time/influxdb-grafana/',
1602+
toPath: '/results-output/grafana-dashboards/',
1603+
isPermanent: true,
1604+
});
1605+
1606+
createRedirect({
1607+
fromPath: '/results-visualization/influxdb-+-grafana/',
1608+
toPath: '/results-output/grafana-dashboards/',
1609+
isPermanent: true,
1610+
});
1611+
15941612
const redirects = {
15951613
'/javascript-api/k6-http/cookiejar-k6-http':
15961614
'/javascript-api/k6-http/cookiejar/',
@@ -1640,7 +1658,7 @@ const createRedirects = ({ actions }) => {
16401658
'/getting-started/results-output/datadog':
16411659
'/results-visualization/datadog/',
16421660
'/getting-started/results-output/influxdb':
1643-
'/results-output/real-time/influxdb-grafana/',
1661+
'/results-output/real-time/influxdb/',
16441662
'/getting-started/results-output/json': '/results-visualization/json/',
16451663
'/getting-started/results-output/statsd': '/results-visualization/statsd/',
16461664
'/javascript-api/k6-metrics/counter-k6-metrics/counter-add-value-tags':

0 commit comments

Comments
 (0)