Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PRs from last week to Grafana docs #1393

Merged
merged 5 commits into from Nov 28, 2023
Merged

Conversation

heitortsergent
Copy link
Collaborator

@heitortsergent heitortsergent commented Nov 1, 2023

Bring in the changes we've merged to k6-docs in the last week to the Grafana docs version.

#1385, #1336, #1381.

@heitortsergent
Copy link
Collaborator Author

@ppcano @pablochacin tagging you both here cause there were updates to the xk6-disruptor docs that we merged to k6-docs last week. I tried to bring them over in this PR, if you want to review them and make sure everything looks good. :)

Copy link
Contributor

github-actions bot commented Nov 1, 2023

There's a version of the docs published here:

https://mdr-ci.staging.k6.io/docs/refs/pull/1393/merge

It will be deleted automatically in 30 days.

jdbaldry added a commit to grafana/writers-toolkit that referenced this pull request Nov 2, 2023
grafana/k6-docs#1393

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
docs/sources/v0.47.x/examples/oauth-authentication.md Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And VU: grafana/writers-toolkit#366.

It looks like it is commonly misspelt as 'vu' in this file but that's outside of the scope of this PR.
Perhaps lowercase is also an acceptable spelling though?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we use lowercase 'vu' when we're referring to the property name in scripts, since that's how it's supposed to be used. It would probably be good to add it as an acceptable spelling as well. 🤓

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah nice. And that shouldn't be wrapped in backticks to make it code?

Vale doesn't spellcheck code so we wouldn't need the dictionary entry in that case.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's a good point. I updated the one instance of vus in the paragraph to use backticks, the other one is in a table and I think we should keep that as regular text... I think most of the other tables where we have properties listed they are just regular text, not code.

jdbaldry added a commit to grafana/writers-toolkit that referenced this pull request Nov 2, 2023
* Add JMeter and Oauth to dictionary

grafana/k6-docs#1393

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Also add JUnit

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Also add VU

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add Jaeger, OTel, OpenTelemetry, and Zipkin to dictionary (#367)

* Add Jaeger, OTel, OpenTelemetry, and Zipkin to dictionary

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add Alertmanager and plural form to dictionary (#368)

* Add Alertmanager and plural form to dictionary

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Add adjective parts of speech for product names (#369)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
@heitortsergent heitortsergent merged commit 5f2d4dc into main Nov 28, 2023
6 checks passed
@heitortsergent heitortsergent deleted the missing-prs-from-grafana branch November 28, 2023 20:45
heitortsergent added a commit that referenced this pull request Dec 6, 2023
heitortsergent added a commit that referenced this pull request Dec 6, 2023
* chore: bring in changes from #1393 to next

* chore: backport to v0.48

* chore: remove test services

* chore: backport to v0.48

* chore: backport to v0.47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants