CLPRO-2902: Sync node_exporter with upstream #4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avoid metrics with inconsistent help-texts. The earlier behaviour has
been preserved in the sense that the first encountered instance is still
used to generate metrics, whereas the subsequent inconsistent ones are
ignored along with a few peripheral changes.
```
# HELP node_scrape_collector_duration_seconds node_exporter: Duration of a collector scrape.
#TYPE node_scrape_collector_duration_seconds gauge
node_scrape_collector_duration_seconds{collector="textfile"} 0.0004005
# HELP node_scrape_collector_success node_exporter: Whether a collector succeeded.
# TYPE node_scrape_collector_success gauge
node_scrape_collector_success{collector="textfile"} 1
# HELP node_textfile_mtime_seconds Unixtime mtime of textfiles successfully read.
# TYPE node_textfile_mtime_seconds gauge
node_textfile_mtime_seconds{file="/Users/rexagod/repositories/misc/node_exporter/ne-bar.prom"} 1.710812009e+09
node_textfile_mtime_seconds{file="/Users/rexagod/repositories/misc/node_exporter/ne-foo.prom"} 1.710811982e+09
# HELP node_textfile_scrape_error 1 if there was an error opening or reading a file, 0 otherwise
# TYPE node_textfile_scrape_error gauge
node_textfile_scrape_error 1
# HELP promhttp_metric_handler_errors_total Total number of internal errors encountered by the promhttp metric handler.
# TYPE promhttp_metric_handler_errors_total counter
promhttp_metric_handler_errors_total{cause="encoding"} 0
promhttp_metric_handler_errors_total{cause="gathering"} 0
# HELP promhttp_metric_handler_requests_in_flight Current number of scrapes being served.
# TYPE promhttp_metric_handler_requests_in_flight gauge
promhttp_metric_handler_requests_in_flight 1
# HELP promhttp_metric_handler_requests_total Total number of scrapes by HTTP status code.
# TYPE promhttp_metric_handler_requests_total counter
promhttp_metric_handler_requests_total{code="200"} 0
promhttp_metric_handler_requests_total{code="500"} 0
promhttp_metric_handler_requests_total{code="503"} 0
# HELP tau_infrastructure_performing_maintenance_task At what timestamp a given task started or stopped, the last time it was run.
# TYPE tau_infrastructure_performing_maintenance_task gauge
tau_infrastructure_performing_maintenance_task{main_task="nightly",start_or_stop="start",sub_task="main"} 1.64728080198446e+09
```
Fixes: prometheus#2317
Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
* os_release.go: Added support end parsing support. Fixes: prometheus#2977 Signed-off-by: Jonathan Davies <jpds@protonmail.com> * os_release_test.go: Added TestParseOSSupportEnd. Signed-off-by: Jonathan Davies <jpds@protonmail.com> --------- Signed-off-by: Jonathan Davies <jpds@protonmail.com>
When the zfs collector fails on FreeBSD it doesn't log which `mib` triggered the issue. This makes diagnostics hard. Incompatibilities in the list of supported mibs is not uncommon with major os updates. By adding this change, it'll be easier for users to report the specific mib that is triggering the failure. Related to prometheus#2847 Signed-off-by: Daniel Kimsey <90741+dekimsey@users.noreply.github.com>
Signed-off-by: looklose <shishuaiqun@yeah.net>
…prometheus#2933) Signed-off-by: machine424 <ayoubmrini424@gmail.com>
…ibrary (prometheus#2989) Signed-off-by: coderwander <770732124@qq.com>
prometheus#2987) Signed-off-by: Jonathan Davies <jpds@protonmail.com>
…2996) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.23.0. - [Commits](golang/net@v0.20.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ple requests happen (prometheus#2995) Signed-off-by: John Guo <john@johng.cn>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
* Update Go to 1.22. * Update Go modules. * Use new version collector. * Use standard library slices package. Signed-off-by: Ben Kochie <superq@gmail.com>
Ensure identical build flags embedded in both files. Signed-off-by: Chris Cleeland <chris.cleeland@gmail.com>
* [CHANGE] exec_bsd: Fix labels for `vm.stats.sys.v_syscall` sysctl prometheus#2895 * [CHANGE] diskstats: Ignore zram devices on linux systems prometheus#2898 * [CHANGE] textfile: Avoid inconsistent help-texts prometheus#2962 * [CHANGE] os: Removed caching of modtime/filename of os-release file prometheus#2987 * [FEATURE] xfrm: Add new collector prometheus#2866 * [FEATURE] watchdog: Add new collector prometheus#2880 * [ENHANCEMENT] cpu_vulnerabilities: Add mitigation information label prometheus#2806 * [ENHANCEMENT] nfsd: Handle new `wdeleg_getattr` attribute prometheus#2810 * [ENHANCEMENT] netstat: Add TCPOFOQueue to default netstat metrics prometheus#2867 * [ENHANCEMENT] filesystem: surface device errors prometheus#2923 * [ENHANCEMENT] os: Add support end parsing prometheus#2982 * [ENHANCEMENT] zfs: Log mib when sysctl read fails on FreeBSD prometheus#2975 * [ENHANCEMENT] fibre_channel: update procfs to take into account optional attributes prometheus#2933 * [BUGFIX] cpu: Fix debug log in cpu collector prometheus#2857 * [BUGFIX] hwmon: Fix hwmon nil ptr prometheus#2873 * [BUGFIX] hwmon: Fix hwmon error capture prometheus#2915 * [BUGFIX] zfs: Revert "Add ZFS freebsd per dataset stats prometheus#2925 * [BUGFIX] ethtool: Sanitize ethtool metric name keys prometheus#2940 * [BUGFIX] fix: data race of NetClassCollector metrics initialization prometheus#2995 Signed-off-by: Ben Kochie <superq@gmail.com>
…ags (prometheus#2979) Signed-off-by: Sam Leiken <sam.k.leiken@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
* Sign node exporter darwin binary with rcodesign Prevents SIGKILL issues on macs Signed-off-by: Alper Polat <gitperr@gmail.com> * Be explicit about checking for the binary Co-authored-by: Ben Kochie <superq@gmail.com> Signed-off-by: Alper Polat <101826653+gitperr@users.noreply.github.com> * Also attempt to sign darwin-amd64 Signed-off-by: Alper Polat <gitperr@gmail.com> --------- Signed-off-by: Alper Polat <gitperr@gmail.com> Signed-off-by: Alper Polat <101826653+gitperr@users.noreply.github.com> Co-authored-by: Ben Kochie <superq@gmail.com>
Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a magnitude of 10e6, and showed incorrect values for node_cpu_seconds_total. Fixes: prometheus#1837 Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
Check that the PSI metrics are returned in order to avoid nil pointer dereference. * Update fixutre to match real-world samples. Fixes: prometheus#3015 Signed-off-by: Ben Kochie <superq@gmail.com>
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963 * [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008 * [BUGFIX] Fix pressure collector nil reference prometheus#3016 Signed-off-by: Ben Kochie <superq@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
…theus#3038) Bumps [github.com/mdlayher/wifi](https://github.com/mdlayher/wifi) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/mdlayher/wifi/releases) - [Commits](mdlayher/wifi@v0.1.0...v0.2.0) --- updated-dependencies: - dependency-name: github.com/mdlayher/wifi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…prometheus#3034) Bumps [github.com/jsimonetti/rtnetlink](https://github.com/jsimonetti/rtnetlink) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/jsimonetti/rtnetlink/releases) - [Commits](jsimonetti/rtnetlink@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: github.com/jsimonetti/rtnetlink dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…us#3036) Bumps [github.com/beevik/ntp](https://github.com/beevik/ntp) from 1.3.1 to 1.4.3. - [Release notes](https://github.com/beevik/ntp/releases) - [Changelog](https://github.com/beevik/ntp/blob/main/RELEASE_NOTES.md) - [Commits](beevik/ntp@v1.3.1...v1.4.3) --- updated-dependencies: - dependency-name: github.com/beevik/ntp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.0...v1.19.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kangjie Xu <kanxu@ebay.com> Co-authored-by: Kangjie Xu <kanxu@ebay.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Running "go test" in the collector directory, without the fixtures available, results in multiple panics, including `SIGSEGV`. Most of these are due to incorrect error handling. This cleans them up. Signed-off-by: Benny Siegert <bsiegert@gmail.com>
…full CPU stat prometheus#3051 (prometheus#3054) Signed-off-by: joey <zchengjoey@gmail.com>
* filesystem: Refactor mountinfo parsing Migrate mountinfo parsing to procfs library. This fixes incorrect parsing introduced by PR prometheus#3387. Fixes: prometheus#3450 Signed-off-by: Ben Kochie <superq@gmail.com> * Update fixtures for new infiniband procfs feature. Signed-off-by: Ben Kochie <superq@gmail.com> --------- Signed-off-by: Ben Kochie <superq@gmail.com>
* [BUGFIX] filesystem: Fix mount points being collected multiple times prometheus#3376 * [BUGFIX] filesystem: Refactor mountinfo parsing prometheus#3452 * [BUGFIX] meminfo: Add Zswap/Zswapped metrics prometheus#3453 Signed-off-by: Ben Kochie <superq@gmail.com>
Fix typo in Zswap metric name. Signed-off-by: Ben Kochie <superq@gmail.com>
…3461) Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.14.1 to 0.15.0. - [Release notes](https://github.com/prometheus/exporter-toolkit/releases) - [Commits](prometheus/exporter-toolkit@v0.14.1...v0.15.0) --- updated-dependencies: - dependency-name: github.com/prometheus/exporter-toolkit dependency-version: 0.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](opencontainers/selinux@v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-version: 1.13.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…theus#3465) Bumps [github.com/mdlayher/wifi](https://github.com/mdlayher/wifi) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/mdlayher/wifi/releases) - [Commits](mdlayher/wifi@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: github.com/mdlayher/wifi dependency-version: 0.7.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Pass a filtered list of disks to test in the MacOS/Darwin end-to-end test to avoid CI runner changes from disturbing the output. Signed-off-by: Ben Kochie <superq@gmail.com>
…rometheus#3464) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.67.1 to 0.67.2. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/CHANGELOG.md) - [Commits](prometheus/common@v0.67.1...v0.67.2) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-version: 0.67.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s#3466) * build(deps): bump vmactions/openbsd-vm from 1.2.0 to 1.2.1 Bumps [vmactions/openbsd-vm](https://github.com/vmactions/openbsd-vm) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/vmactions/openbsd-vm/releases) - [Commits](vmactions/openbsd-vm@1e7cc4f...bed57f7) --- updated-dependencies: - dependency-name: vmactions/openbsd-vm dependency-version: 1.2.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update OpenBSD versions Update OpenBSD package versions to match new OpenBSD release. Signed-off-by: Ben Kochie <superq@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Ben Kochie <superq@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ben Kochie <superq@gmail.com>
…1.0 (prometheus#3463) Bumps [github.com/jsimonetti/rtnetlink/v2](https://github.com/jsimonetti/rtnetlink) from 2.0.5 to 2.1.0. - [Release notes](https://github.com/jsimonetti/rtnetlink/releases) - [Commits](jsimonetti/rtnetlink@v2.0.5...v2.1.0) --- updated-dependencies: - dependency-name: github.com/jsimonetti/rtnetlink/v2 dependency-version: 2.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rometheus#3462) Bumps [github.com/prometheus/procfs](https://github.com/prometheus/procfs) from 0.19.0 to 0.19.2. - [Release notes](https://github.com/prometheus/procfs/releases) - [Commits](prometheus/procfs@v0.19.0...v0.19.2) --- updated-dependencies: - dependency-name: github.com/prometheus/procfs dependency-version: 0.19.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update common Prometheus files Signed-off-by: prombot <prometheus-team@googlegroups.com> * Fixup linting issues. Signed-off-by: Ben Kochie <superq@gmail.com> --------- Signed-off-by: prombot <prometheus-team@googlegroups.com> Signed-off-by: Ben Kochie <superq@gmail.com> Co-authored-by: Ben Kochie <superq@gmail.com>
…3476) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.37.0 to 0.38.0. - [Commits](golang/sys@v0.37.0...v0.38.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-version: 0.38.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add hwcounters for infiniband --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
* Add collector for hung_task_detect_count --------- Signed-off-by: ScarletBlizzard <mesushkov@gmail.com>
…us#3481) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.43.0 to 0.45.0. - [Commits](golang/crypto@v0.43.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yehor Komarov <ekomarov@ivi.ru>
…tests output on success
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated the repository to match the current prometheus/node_exporter master branch.
Implementation Details:
Fetched latest upstream/master.
Re-applied our custom "Unix Socket" logic.
Re-applied Ubuntu 22 fixes.
Restored CloudLinux specific RPM packaging files.