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

PMM-12155 Sync with upstream #46

Open
wants to merge 278 commits into
base: main
Choose a base branch
from
Open

Conversation

0leksii
Copy link

@0leksii 0leksii commented May 18, 2023

Sync with the latest version of upstream v1.5.0.

PMM changes:

adeptg and others added 30 commits December 7, 2022 16:11
Signed-off-by: Yury Vidineev <adeptg@gmail.com>
fix the docker link in the ISSUE_TEMPLATE
Signed-off-by: Ryan J. Geyer <me@ryangeyer.com>
Add note about the change to the experimental web flag.

Fixes: prometheus#2535

Signed-off-by: Ben Kochie <superq@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: James Bach <qweet.ing@gmail.com>
Signed-off-by: James Bach <james.bach@wise.com>
Signed-off-by: jalev <qweet.ing@gmail.com>
Signed-off-by: James Bach <james.bach@wise.com>
Signed-off-by: jalev <qweet.ing@gmail.com>
Signed-off-by: jalev <qweet.ing@gmail.com>
This change updates the perf-utils library to 0.6.0 which has some fixes
for automatically detecting the correct tracefs mountpoint if available.

Signed-off-by: Daniel Hodges <hodges.daniel.scott@gmail.com>
…ions

Add profiler options for perf collector
Add a check for missing/unreadable thermal zone stats and ignore if not
availlable.

Fixes: prometheus#2552

Signed-off-by: Ben Kochie <superq@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
…_missing

Fix thermal_zone collector noise
This collector works just fine without any further changes.

Signed-off-by: Benny Siegert <bsiegert@gmail.com>
Enable uname collector on NetBSD too
Bumps [github.com/mdlayher/netlink](https://github.com/mdlayher/netlink) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/mdlayher/netlink/releases)
- [Changelog](https://github.com/mdlayher/netlink/blob/main/CHANGELOG.md)
- [Commits](mdlayher/netlink@v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: github.com/mdlayher/netlink
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/josharian/native](https://github.com/josharian/native) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/josharian/native/releases)
- [Commits](josharian/native@v1.0.0...v1.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jia Xin <alexjx@gmail.com>
…les/github.com/josharian/native-1.1.0

build(deps): bump github.com/josharian/native from 1.0.0 to 1.1.0
…les/github.com/mdlayher/netlink-1.7.1

build(deps): bump github.com/mdlayher/netlink from 1.7.0 to 1.7.1
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.37.0 to 0.39.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.37.0...v0.39.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Ben Kochie <superq@gmail.com>
…les/github.com/prometheus/common-0.39.0

build(deps): bump github.com/prometheus/common from 0.37.0 to 0.39.0
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Synchronize common files from prometheus/prometheus
This depends on a recent change to golang.org/x/sys that adds a
unix.SysctlUvmexp function.

Signed-off-by: Benny Siegert <bsiegert@gmail.com>
NetBSD support for the meminfo collector
Signed-off-by: David O'Rourke <david.orourke@gmail.com>
occupyhabit and others added 23 commits March 23, 2024 16:22
Signed-off-by: occupyhabit <wangmengjiao@outlook.com>
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>
…ibrary (prometheus#2989)

Signed-off-by: coderwander <770732124@qq.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>
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>
* fix pressure metric collection fails on systems that do not expose a full CPU stat prometheus#3051 (prometheus#3054)

Signed-off-by: joey <zchengjoey@gmail.com>
Signed-off-by: Ben Kochie <superq@gmail.com>

* Release v1.8.2

* [BUGFIX] Fix CPU pressure metric collection prometheus#3054

Signed-off-by: Ben Kochie <superq@gmail.com>

---------

Signed-off-by: joey <zchengjoey@gmail.com>
Signed-off-by: Ben Kochie <superq@gmail.com>
Co-authored-by: chengjoey <30427474+chengjoey@users.noreply.github.com>
v1.8.2

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEoFiTUofnXYMugU5GxkayPJ4yRfEFAmaTvA0ACgkQxkayPJ4y
# RfFwLA//Scg51x8eagp8Cfr8jDbd4+cJiaoxPzzLejgRUr3iGXJcLojhPQjYom3V
# GbXSzdW3N1+Dy97aJaUFxBDhBoIWq3OO3qJo5oTntaOeCD3CVjTEmV5DXBgMZWyz
# V2wvle09fTLeCwXYFpfMgrI/3dkwEmqj5giV71YNMxg4Iy90x8Yx0HKIigBBRBnk
# oQoii30bky5qKZ2QN0Nv70ot0OdiupA977KzckC7Ep+uEOkvbjU//bqcxXZ94RBA
# 8l+vCkdLX7Rv/Y258zPDiy1FWQds9VpcvabvbL11cS6O0Dx7sv+ijtpdOTXrg+0n
# Yd+1inNbz04GANWfxwzCVwccT51OBkKWf7r/fa/Nw8/U8R+zOEtVPz5xB556w0ch
# NpMmQPY8hp4KAQpxyaCPjXVmMwOiKXq8m9xJ3XVCzVl2Z5ur9r9kfpGtPz0CkBO5
# DCZh1IBrLuLmN3FgYFTqI2gVzxsKO5GY5Q7N7uUmeN0RRARJZutTHZzDX0AKzfhT
# P4uyjR/T0JM5oYQGE1N5uMpsCpm40n78lD2tYHENKKHuP6J6TGB5J9YfKTXojPHt
# jG+4JIHDsnPHXDdWv7UYva/6RaLhi3rck+VOL9cc6zrNNDz+6+ATBDO0tlCQFaRa
# xGBio0mn9/L50Ov4kFGyrr9HwdUH/xCkqTUOTh7j1syBjaMmViw=
# =vEy9
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun Jul 14 17:52:45 2024 +06
# gpg:                using RSA key A058935287E75D832E814E46C646B23C9E3245F1
# gpg: Can't check signature: No public key

# Conflicts:
#	go.mod
#	go.sum
#	node_exporter.go
@BupycHuk BupycHuk requested a review from a team as a code owner September 16, 2024 13:31
@BupycHuk BupycHuk requested review from BupycHuk and JiriCtvrtka and removed request for dliakhov, pkadej and ritbl September 16, 2024 13:31
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.