Skip to content

Commit

Permalink
sysutils/node_exporter: update to 1.6.1
Browse files Browse the repository at this point in the history 
Changes in this release are:

    [CHANGE] Fix cpustat when some cpus are offline
    [CHANGE] Remove metrics of offline CPUs in CPU collector
    [CHANGE] Deprecate ntp collector
    [CHANGE] Remove bcache cache_readaheads_totals metrics
    [CHANGE] Deprecate supervisord collector
    [FEATURE] Enable uname collector on NetBSD
    [FEATURE] NetBSD support for the meminfo collector
    [FEATURE] NetBSD support for CPU collector
    [FEATURE] Add FreeBSD collector for netisr subsystem
    [FEATURE] Add softirqs collector
    [ENHANCEMENT] Add suspended as a node_zfs_zpool_state
    [ENHANCEMENT] Add administrative state of Linux network interfaces
    [ENHANCEMENT] Log current value of GOMAXPROCS
    [ENHANCEMENT] Add profiler options for perf collector
    [ENHANCEMENT] Allow root path as metrics path
    [ENHANCEMENT] Add cpu frequency governor metrics
    [ENHANCEMENT] Add new landing page
    [ENHANCEMENT] Reduce privileges needed for btrfs device stats
    [ENHANCEMENT] Add ZFS memory_available_bytes
    [ENHANCEMENT] Use SCSI_IDENT_SERIAL as serial in diskstats
    [ENHANCEMENT] Read missing from netlink netclass attributes from sysfs
    [BUGFIX] perf: fixes for automatically detecting the correct tracefs mountpoints
    [BUGFIX] Fix thermal_zone collector noise
    [BUGFIX] Fix a problem fetching the user wire count on FreeBSD
    [BUGFIX] interrupts: Fix fields on linux aarch64
    [BUGFIX] Remove metrics of offline CPUs in CPU collector
    [BUGFIX] Fix OpenBSD filesystem collector string parsing
    [BUGFIX] Fix bad reporting of node_cpu_seconds_total in OpenBSD

A full changelog with links to issues is available at
https://github.com/prometheus/node_exporter/blob/master/CHANGELOG.md

Additionally the following actions on the port were taken:
  - Switch the port over to GO_MODULES, making maintenance of the port simpler
  - Remove a patch for the BSD memory collector, as the patch was upstreamed

PR:		274327
  • Loading branch information
@clausecker
David O'Rourke authored and clausecker committed Oct 11, 2023
1 parent 0c72567 commit d48c30e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 186 deletions.
11 changes: 2 additions & 9 deletions sysutils/node_exporter/Makefile
View file
@@ -1,7 +1,6 @@
PORTNAME= node_exporter
PORTVERSION= 1.5.0
DISTVERSIONPREFIX=v
PORTREVISION= 7
DISTVERSION= 1.6.1
CATEGORIES= sysutils

MAINTAINER= dor.bsd@xm0.uk
Expand All @@ -12,11 +11,9 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE

USES= gmake go:modules shebangfix
USE_GITHUB= yes
GH_ACCOUNT= prometheus
USE_RC_SUBR= node_exporter

GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}
GO_MODULE= github.com/prometheus/${PORTNAME}
GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}"

OPTIONS_DEFINE= DOCS
Expand All @@ -29,10 +26,6 @@ LD_FLAG_STRING= -s \
${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
LD_FLAG_X_PREFIX= -X ${GO_PKGNAME:H}/common/version

# This Makefile includes the GH_TUPLE section.
# Generated with: env M2T_GITHUB=$M2T_GITHUB make gomod-vendor > out
.include "Makefile.modules"

post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/docs && \
Expand Down
58 changes: 0 additions & 58 deletions sysutils/node_exporter/Makefile.modules
View file

This file was deleted.

114 changes: 5 additions & 109 deletions sysutils/node_exporter/distinfo
View file
@@ -1,109 +1,5 @@
TIMESTAMP = 1674666613
SHA256 (prometheus-node_exporter-v1.5.0_GH0.tar.gz) = 67c6d59359d8c484e1e28d0a52a971eebe687f083c5fbb35c5e651543e5d0ea4
SIZE (prometheus-node_exporter-v1.5.0_GH0.tar.gz) = 329004
SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
SHA256 (alecthomas-units-b94a6e3cc137_GH0.tar.gz) = 85363142a53436bea696d297e5b5fcda6bc6a8104b1d7ba0db88ffee455b72e2
SIZE (alecthomas-units-b94a6e3cc137_GH0.tar.gz) = 6012
SHA256 (beevik-ntp-v0.3.0_GH0.tar.gz) = 6a398b24ee7c4204f73881299a1860976b2a8d6f77c11895e2d06c6c657b5584
SIZE (beevik-ntp-v0.3.0_GH0.tar.gz) = 10977
SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352
SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244
SHA256 (coreos-go-systemd-v22.5.0_GH0.tar.gz) = b56f4a5aa5cd8a5a2e8b323fb8e76b4a45c6ea6a319a42d9bb2851c54e97a3a1
SIZE (coreos-go-systemd-v22.5.0_GH0.tar.gz) = 75550
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (dennwc-btrfs-3097362dc072_GH0.tar.gz) = 4678537915fe156a9e5af1ff3660540e76a9a16d3c3df7a6397fafa743869255
SIZE (dennwc-btrfs-3097362dc072_GH0.tar.gz) = 41427
SHA256 (dennwc-ioctl-v1.0.0_GH0.tar.gz) = db8030218064b9b26cfe64bb271cd8b60cdd5e30c60f5e3f16baf779d363a3d1
SIZE (dennwc-ioctl-v1.0.0_GH0.tar.gz) = 974
SHA256 (ema-qdisc-62d0308e3e00_GH0.tar.gz) = 962dd5bd26c906a85d1b22cc2798dbd45149cb6e7113784b605d103c793efa4e
SIZE (ema-qdisc-62d0308e3e00_GH0.tar.gz) = 5362
SHA256 (go-kit-log-v0.2.1_GH0.tar.gz) = b37718967f9cbdb3eea4aa2fa9420b7d329b6bab7f9b85f970db197257226152
SIZE (go-kit-log-v0.2.1_GH0.tar.gz) = 30579
SHA256 (go-logfmt-logfmt-v0.5.1_GH0.tar.gz) = a9a93f7cbb92a53a587fda196bc040264a625e76064495e95cb3e907f9a93499
SIZE (go-logfmt-logfmt-v0.5.1_GH0.tar.gz) = 12115
SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
SHA256 (godbus-dbus-v5.1.0_GH0.tar.gz) = 2f4939ab13a20178584ef534293abc5b6744bb5b6232432050c5a3ab2ab85fd7
SIZE (godbus-dbus-v5.1.0_GH0.tar.gz) = 74080
SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
SHA256 (golang-crypto-56aed061732a_GH0.tar.gz) = ecb9f20a7451ed525c2176c13925f9b148c0729a7ed983dbec734d82a03f5b64
SIZE (golang-crypto-56aed061732a_GH0.tar.gz) = 1631954
SHA256 (golang-net-v0.2.0_GH0.tar.gz) = 4b9ba62a6464360897d4143fba14edd4db87453de1cbc3a66d1c00c640661ee6
SIZE (golang-net-v0.2.0_GH0.tar.gz) = 1243742
SHA256 (golang-oauth2-f21342109be1_GH0.tar.gz) = fe59459a7152b6dbfbe26961f1a02ecf2e17dd591a9398f917ad1c15a11f2bcc
SIZE (golang-oauth2-f21342109be1_GH0.tar.gz) = 104310
SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
SHA256 (golang-sync-v0.1.0_GH0.tar.gz) = 81056c07b5dc1077f2d6ac0f7ce3d4ef199a3ff85c319ab03dcff22fa9ba2183
SIZE (golang-sync-v0.1.0_GH0.tar.gz) = 19356
SHA256 (golang-sys-v0.2.0_GH0.tar.gz) = d6d331640754c227ce83b981052b41521bcf89ac38060c59806a754f0f88080c
SIZE (golang-sys-v0.2.0_GH0.tar.gz) = 1410639
SHA256 (golang-text-v0.4.0_GH0.tar.gz) = 71988b75b6da29772aa1feb65727aa7de3698d2f718f9ea073cd3613e280f5f5
SIZE (golang-text-v0.4.0_GH0.tar.gz) = 8361656
SHA256 (google-go-cmp-v0.5.9_GH0.tar.gz) = 41a074c2fcfc72f813736f8ca8e3116e260a6b79af407d9da0d4c5e4c3f61acf
SIZE (google-go-cmp-v0.5.9_GH0.tar.gz) = 104427
SHA256 (hashicorp-go-envparse-v0.1.0_GH0.tar.gz) = 43145bea3ebce840db30293679f592665d3b10184b2ccf425f71e425b6b928e5
SIZE (hashicorp-go-envparse-v0.1.0_GH0.tar.gz) = 11860
SHA256 (hodgesds-perf-utils-v0.5.1_GH0.tar.gz) = 594dd4f5e16708ae39c2f1e63acdf5dddaa303b7cc8141daf58e03828376a6f1
SIZE (hodgesds-perf-utils-v0.5.1_GH0.tar.gz) = 29165
SHA256 (illumos-go-kstat-173c9b0a9973_GH0.tar.gz) = 712226c19137a7aaaa42ac457e4637e2d0976944799f89f8ccab44b7af0b2c6a
SIZE (illumos-go-kstat-173c9b0a9973_GH0.tar.gz) = 27291
SHA256 (josharian-native-v1.0.0_GH0.tar.gz) = 0edb42adb5f7405d33920e21acba412b00bf9a8fbe97075924fd57c58ca6cad1
SIZE (josharian-native-v1.0.0_GH0.tar.gz) = 1803
SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
SHA256 (jsimonetti-rtnetlink-v1.3.0_GH0.tar.gz) = 0e0d626b5d9afa3afbce0583a2e02d0ced350a8f18a5f6ae175e2cfddef99112
SIZE (jsimonetti-rtnetlink-v1.3.0_GH0.tar.gz) = 97300
SHA256 (kr-pretty-v0.3.1_GH0.tar.gz) = e6fa7db2708320e66a1645bf6b234e524e73f4163ca0519b8608616e48f5d206
SIZE (kr-pretty-v0.3.1_GH0.tar.gz) = 10227
SHA256 (lufia-iostat-v1.2.1_GH0.tar.gz) = 92b42ee88a7213710c76cc7b61414e387de9a53a28fe768a9e7de428820ab43c
SIZE (lufia-iostat-v1.2.1_GH0.tar.gz) = 5381
SHA256 (mattn-go-xmlrpc-v0.0.3_GH0.tar.gz) = 4b1eef421a5f79cc0e6c8e7939de3c5fc1f0d8b27ede560c4d89e580e22e2564
SIZE (mattn-go-xmlrpc-v0.0.3_GH0.tar.gz) = 4930
SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
SHA256 (mdlayher-ethtool-0e16326d06d1_GH0.tar.gz) = d826e2335aa541aafc25e813e422be30e964c7a4224cf3cc700261833c9ba631
SIZE (mdlayher-ethtool-0e16326d06d1_GH0.tar.gz) = 17905
SHA256 (mdlayher-genetlink-v1.2.0_GH0.tar.gz) = a9ab4abaade6558645f99ed2abc81bfecdae21bf0dce8a3a3c620b128a13d507
SIZE (mdlayher-genetlink-v1.2.0_GH0.tar.gz) = 15981
SHA256 (mdlayher-netlink-v1.7.0_GH0.tar.gz) = 39f3f6881e235d7195ccc3ae5f7a2369c414fb0ebd1283784a9653cb62eb411b
SIZE (mdlayher-netlink-v1.7.0_GH0.tar.gz) = 50336
SHA256 (mdlayher-socket-v0.4.0_GH0.tar.gz) = ce6b0766a447f09d3a7012747a9f35b85e36c9bb20d04c81f6f279822a48f328
SIZE (mdlayher-socket-v0.4.0_GH0.tar.gz) = 18764
SHA256 (mdlayher-wifi-a44c70b6d3c8_GH0.tar.gz) = e53d876ea7169be0ea7b440256fe6b84535f33da80b7b4a6fa64b47fb4cd53b3
SIZE (mdlayher-wifi-a44c70b6d3c8_GH0.tar.gz) = 14669
SHA256 (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 5bb72eaf9a4ffd7d0353fa6944951d244df89d879ac36d4b9860fd159162dd81
SIZE (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 17140
SHA256 (opencontainers-selinux-v1.10.2_GH0.tar.gz) = fe9c574d08911418fd0ee3d8dae21f0d1bdb38716ab56071e150819887344b58
SIZE (opencontainers-selinux-v1.10.2_GH0.tar.gz) = 908255
SHA256 (prometheus-client_golang-v1.14.0_GH0.tar.gz) = e774de79b48fcaf27a5b6bbeb6da0e814fee33c5050550625ef9b33f77835049
SIZE (prometheus-client_golang-v1.14.0_GH0.tar.gz) = 236318
SHA256 (prometheus-client_model-v0.3.0_GH0.tar.gz) = c71dc6402fe2414dec82c48173fe8d5aa9fc7c43af2f1f1f48d05c1652b965b9
SIZE (prometheus-client_model-v0.3.0_GH0.tar.gz) = 14941
SHA256 (prometheus-common-v0.37.0_GH0.tar.gz) = 0ad5a62cb421952d92c97645d2aba8987d2a0de44c9c1fff607c016dca87b768
SIZE (prometheus-common-v0.37.0_GH0.tar.gz) = 148934
SHA256 (prometheus-exporter-toolkit-v0.8.2_GH0.tar.gz) = f5b32491fc9daca575c4989f6ab2f347ded21d1ca3994503128b97a0211517fd
SIZE (prometheus-exporter-toolkit-v0.8.2_GH0.tar.gz) = 62245
SHA256 (prometheus-procfs-v0.8.0_GH0.tar.gz) = bb99fc8ee03c40374bd2f78b7907f1353bd57bd34fd080a9664d99983f24aeed
SIZE (prometheus-procfs-v0.8.0_GH0.tar.gz) = 194809
SHA256 (protocolbuffers-protobuf-go-v1.28.1_GH0.tar.gz) = df0b3dceeff0e1b6d029e60f076edd0d852cb8f3c2fe4fe3fe40164f16ec9b6b
SIZE (protocolbuffers-protobuf-go-v1.28.1_GH0.tar.gz) = 1280756
SHA256 (safchain-ethtool-v0.2.0_GH0.tar.gz) = 7fa7e7d306653ce00b8ee7e2f2461473644cf8a73453c6cfb5390af28c1a8934
SIZE (safchain-ethtool-v0.2.0_GH0.tar.gz) = 11423
SHA256 (siebenmann-go-kstat-173c9b0a9973_GH0.tar.gz) = 712226c19137a7aaaa42ac457e4637e2d0976944799f89f8ccab44b7af0b2c6a
SIZE (siebenmann-go-kstat-173c9b0a9973_GH0.tar.gz) = 27291
SHA256 (soundcloud-go-runit-06ad41a06c4a_GH0.tar.gz) = 9a7a79ce49245b52f1cc90ccb1dfe8e34116ea33ea6c252e2bc641d27be93c06
SIZE (soundcloud-go-runit-06ad41a06c4a_GH0.tar.gz) = 3170
SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1
SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
SHA256 (uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717
SIZE (uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369
TIMESTAMP = 1696869041
SHA256 (go/sysutils_node_exporter/node_exporter-v1.6.1/v1.6.1.mod) = a0809a9aa7204b6ce15d2b4b6e8cf267ec21987687bd5751c52d43441b703fa2
SIZE (go/sysutils_node_exporter/node_exporter-v1.6.1/v1.6.1.mod) = 2537
SHA256 (go/sysutils_node_exporter/node_exporter-v1.6.1/v1.6.1.zip) = 0c8d801c75d210e0352f9fbf5ba163603d03621c14103724240851ec194e8d9c
SIZE (go/sysutils_node_exporter/node_exporter-v1.6.1/v1.6.1.zip) = 521898
10 changes: 0 additions & 10 deletions sysutils/node_exporter/files/patch-collector_memory__bsd.go
View file

This file was deleted.

0 comments on commit d48c30e

Please sign in to comment.