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

more info about how to scrape k0s internals #3915

Closed
wants to merge 24 commits into from
Closed

more info about how to scrape k0s internals #3915

wants to merge 24 commits into from

Conversation

fenio
Copy link

@fenio fenio commented Jan 10, 2024

Description

There was ongoing discussion in #2321 about how to scrape internals of k0s.
No one in the end created actual PR so I decided to do it on my own as I hit exact same problem.

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

I'm fine with rewriting it and do some changes as English is not my native language but please DO include some extra info about how to enable these metrics and scraping of them.

@fenio fenio requested a review from a team as a code owner January 10, 2024 17:35
Copy link
Member

@twz123 twz123 left a comment

Choose a reason for hiding this comment

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

Thanks for taking care of this!

Left some nits. Please also note the linter comments, and your commit needs to be signed-off.

docs/system-monitoring.md Outdated Show resolved Hide resolved
docs/system-monitoring.md Outdated Show resolved Hide resolved
docs/system-monitoring.md Outdated Show resolved Hide resolved
@fenio
Copy link
Author

fenio commented Jan 11, 2024

Thanks for taking care of this!

Left some nits. Please also note the linter comments, and your commit needs to be signed-off.

I've just accepted your suggestions. Is it now fine or do I have to do some extra to sign it off?
When I was accepting these changes there was "sign off" on a button so I guess it's enough?

@twz123
Copy link
Member

twz123 commented Jan 11, 2024

There's still the first commit 809a772 that's not signed off.

Also, the linter warnings on line 56 and 58 need to be addressed.

@fenio
Copy link
Author

fenio commented Jan 11, 2024

Believe me I spent some time and I'm not seeing a way to sign it off....
With previous changes I had button to do that.

And speaking about last lint warning. It's basically because I didn't declare programming language for this change:

absent(apiserver_audit_event_total{job="kube-scheduler"})

I didn't do that cause it's not shell... not yaml. Well let me try to mark it as promql.

@fenio
Copy link
Author

fenio commented Jan 11, 2024

But after all I just wanted to distinguish it from rest of the text. If there's a better way to do it and not mark it as a code at the same time I'm happy with whatever solution.

@jnummelin
Copy link
Member

I believe we've used text as the marker in few other places.

To sign-off, I believe it would be easiest if you squash all the commits as one and then use something like git commit -s --amend to ad the signoff statement into the commit

Bartosz Fenski and others added 21 commits January 16, 2024 19:22
Co-authored-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Co-authored-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Co-authored-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
K0s ships airgap image bundles for all the supported architectures.
Whenever an image is not available for a given platform, the bundle
generation will fail and give an appropriate CI signal. No need for a
separate check.

Signed-off-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Niklas Wagner <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [github.com/k0sproject/version](https://github.com/k0sproject/version) from 0.4.2 to 0.5.0.
- [Release notes](https://github.com/k0sproject/version/releases)
- [Commits](k0sproject/version@v0.4.2...v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/k0sproject/version
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [markdown](https://github.com/Python-Markdown/markdown) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/Python-Markdown/markdown/releases)
- [Changelog](https://github.com/Python-Markdown/markdown/blob/master/docs/changelog.md)
- [Commits](Python-Markdown/markdown@3.5.1...3.5.2)

---
updated-dependencies:
- dependency-name: markdown
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
This is for advanced use cases and users that need to control things like ASN, routing and peering. Allows also users to override any k0s managed startup args.

Signed-off-by: Jussi Nummelin <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.16.1...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.3 to 9.5.4.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.3...9.5.4)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [github.com/k0sproject/version](https://github.com/k0sproject/version) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/k0sproject/version/releases)
- [Commits](k0sproject/version@v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/k0sproject/version
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [github.com/go-playground/validator/v10](https://github.com/go-playground/validator) from 10.16.0 to 10.17.0.
- [Release notes](https://github.com/go-playground/validator/releases)
- [Commits](go-playground/validator@v10.16.0...v10.17.0)

---
updated-dependencies:
- dependency-name: github.com/go-playground/validator/v10
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
This removes the cache hack that was used to share the prebuilt image
bundles with the integration tests. The upload/download action is now
reasonably fast.

Signed-off-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Removes the need to make manual changes for k0sctl version bumps.
The version is obtained from hack/tool/go.mod which is updated
automatically by dependabot. All the other suites that use k0sctl
now get their k0sctl version by reading it from hack/tool/go.mod.

Signed-off-by: Kimmo Lehto <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Kimmo Lehto <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Signed-off-by: Kimmo Lehto <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
twz123 and others added 3 commits January 16, 2024 19:22
This removes the necessity to generate the empty asset file in the
Makefile. Switch between the empty and generated files at compile time
via the noembedbins go build tag.

Signed-off-by: Tom Wieczorek <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.16.3 to 0.17.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.16.3...v0.17.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Bartosz Fenski <[email protected]>
@fenio
Copy link
Author

fenio commented Jan 16, 2024

I tried to sign off changes again but apparently I rebased and signed bunch of unrelated stuff.
Maybe it will be easier to start from scratch. I'll close this PR and create another one and sign it off properly.
Sorry for the mess.

@fenio fenio closed this Jan 16, 2024
@fenio
Copy link
Author

fenio commented Jan 16, 2024

I hope this will work #3938

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.

5 participants