Index: head/sysutils/node_exporter/Makefile =================================================================== --- head/sysutils/node_exporter/Makefile (revision 564756) +++ head/sysutils/node_exporter/Makefile (revision 564757) @@ -1,70 +1,73 @@ # Created by: Jev Björsell # $FreeBSD$ PORTNAME= node_exporter -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= dor.bsd@xm0.uk COMMENT= Prometheus exporter for machine metrics LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= promtool:net-mgmt/prometheus2 \ bash:shells/bash \ gsed:textproc/gsed USES= gmake go:modules shebangfix USE_GITHUB= yes GH_ACCOUNT= prometheus USE_RC_SUBR= node_exporter # The ttar script is used to run the tests. SHEBANG_FILES= ttar GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} # A "checkrules" target is being added in >0.17.0. TEST_TARGET= test TEST_ENV= PROMTOOL=${LOCALBASE}/bin/promtool BUILD_USER?= ${USER} LD_FLAG_X_PREFIX= -X ${GO_PKGNAME:H}/common/version LD_FLAG_STRING= -s \ ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" OPTIONS_DEFINE= DOCS + +# This Makefile includes the GH_TUPLE section. +.include "Makefile.modules" post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} # TestFileDescriptorLeak is being skipped at the moment because procfs(5) is # not properly detected. pre-test: # Prevent Go from attempting to use Git to redownload its dependencies. # They are already present in ${WRKSRC}/vendor. ${RM} ${WRKSRC}/go.mod ${REINPLACE_CMD} -e 's|sed|${LOCALBASE}/bin/gsed|g' ${WRKSRC}/ttar ${RM} -r ${WRKDIR}/src ${LN} -sf ${WRKSRC}/vendor ${WRKDIR}/src ${MKDIR} ${WRKSRC}/vendor/${GO_PKGNAME} ${LN} -sf ${WRKSRC}/collector ${WRKSRC}/vendor/${GO_PKGNAME}/collector # GOPATH has to have exactly one element in order to have the test # suite detect the node_exporter binary. "-v" is added here for us to # see skipped tests. ${REINPLACE_CMD} -E 's|(\$$\(GO\) test)|env GOPATH="${WRKDIR}" \1 -v|g' ${WRKSRC}/Makefile .include Index: head/sysutils/node_exporter/Makefile.modules =================================================================== --- head/sysutils/node_exporter/Makefile.modules (nonexistent) +++ head/sysutils/node_exporter/Makefile.modules (revision 564757) @@ -0,0 +1,41 @@ +GH_TUPLE= \ + alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \ + alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \ + alecthomas:units:f65c72e2690d:alecthomas_units/vendor/github.com/alecthomas/units \ + beevik:ntp:v0.3.0:beevik_ntp/vendor/github.com/beevik/ntp \ + beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ + cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ + coreos:go-systemd:d3cd4ed1dbcf:coreos_go_systemd/vendor/github.com/coreos/go-systemd \ + ema:qdisc:62d0308e3e00:ema_qdisc/vendor/github.com/ema/qdisc \ + go-kit:kit:v0.10.0:go_kit_kit/vendor/github.com/go-kit/kit \ + go-logfmt:logfmt:v0.5.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \ + go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + godbus:dbus:271e53dc4968:godbus_dbus/vendor/github.com/godbus/dbus \ + golang:crypto:5f87f3452ae9:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:6772e930b67b:golang_net/vendor/golang.org/x/net \ + golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ + golang:sys:22da62e12c0c:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ + hodgesds:perf-utils:v0.2.5:hodgesds_perf_utils/vendor/github.com/hodgesds/perf-utils \ + josharian:native:b6b71def0850:josharian_native/vendor/github.com/josharian/native \ + jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \ + jsimonetti:rtnetlink:8d122574c736:jsimonetti_rtnetlink/vendor/github.com/jsimonetti/rtnetlink \ + lufia:iostat:v1.1.0:lufia_iostat/vendor/github.com/lufia/iostat \ + mattn:go-xmlrpc:v0.0.3:mattn_go_xmlrpc/vendor/github.com/mattn/go-xmlrpc \ + matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + mdlayher:genetlink:v1.0.0:mdlayher_genetlink/vendor/github.com/mdlayher/genetlink \ + mdlayher:netlink:v1.2.1:mdlayher_netlink/vendor/github.com/mdlayher/netlink \ + mdlayher:wifi:84f0b9457fdd:mdlayher_wifi/vendor/github.com/mdlayher/wifi \ + mwitkow:go-conntrack:2f068394615f:mwitkow_go_conntrack/vendor/github.com/mwitkow/go-conntrack \ + pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ + prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \ + prometheus:exporter-toolkit:v0.5.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \ + prometheus:procfs:v0.3.0:prometheus_procfs/vendor/github.com/prometheus/procfs \ + protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ + siebenmann:go-kstat:4e8294f9e9d5:siebenmann_go_kstat/vendor/github.com/siebenmann/go-kstat \ + soundcloud:go-runit:06ad41a06c4a:soundcloud_go_runit/vendor/github.com/soundcloud/go-runit \ + uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ + uber-go:multierr:v1.6.0:uber_go_multierr/vendor/go.uber.org/multierr Property changes on: head/sysutils/node_exporter/Makefile.modules ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/node_exporter/distinfo =================================================================== --- head/sysutils/node_exporter/distinfo (revision 564756) +++ head/sysutils/node_exporter/distinfo (revision 564757) @@ -1,3 +1,83 @@ -TIMESTAMP = 1592327241 -SHA256 (prometheus-node_exporter-v1.0.1_GH0.tar.gz) = a841bf3e236376840be9e1d8e6c4a38196be6f3957b0982d1c7970a5e416b0ad -SIZE (prometheus-node_exporter-v1.0.1_GH0.tar.gz) = 2792033 +TIMESTAMP = 1612812974 +SHA256 (prometheus-node_exporter-v1.1.0_GH0.tar.gz) = 32f41d5f007712937c6f63722fb3da15761038c0b8e1a82cfb909e97eb1cb134 +SIZE (prometheus-node_exporter-v1.1.0_GH0.tar.gz) = 313066 +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-f65c72e2690d_GH0.tar.gz) = ece06024b01821e013bd7158dfe8ec8cc697f586ce8d3cfaa22edde8c2f022c3 +SIZE (alecthomas-units-f65c72e2690d_GH0.tar.gz) = 4925 +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.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148 +SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292 +SHA256 (coreos-go-systemd-d3cd4ed1dbcf_GH0.tar.gz) = 89fc7afa3593ee4d6f91087fa47d02ade4103882f0a33225faec7b922ce5ebc4 +SIZE (coreos-go-systemd-d3cd4ed1dbcf_GH0.tar.gz) = 67792 +SHA256 (ema-qdisc-62d0308e3e00_GH0.tar.gz) = 962dd5bd26c906a85d1b22cc2798dbd45149cb6e7113784b605d103c793efa4e +SIZE (ema-qdisc-62d0308e3e00_GH0.tar.gz) = 5362 +SHA256 (go-kit-kit-v0.10.0_GH0.tar.gz) = c0fac2e37b981e4c18e4f210b92e1393bd59dadd7c7fc043ec46d1c9834eba85 +SIZE (go-kit-kit-v0.10.0_GH0.tar.gz) = 274801 +SHA256 (go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 76727000951c187d058289d8e83d3e2ad480a5d44c7c83b025b78b7eb6bf0258 +SIZE (go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 11745 +SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 +SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 +SHA256 (godbus-dbus-271e53dc4968_GH0.tar.gz) = 28861a0a55fd49c6f965d9658fbcdd0614ed6ffb2e04aded8cb3b33e5e96020c +SIZE (godbus-dbus-271e53dc4968_GH0.tar.gz) = 59825 +SHA256 (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 8e905a4ce396416a8c8afd8075b93da404f77a9ec1475ad2814d289a1e21a0ee +SIZE (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 1721681 +SHA256 (golang-net-6772e930b67b_GH0.tar.gz) = fde23e272650c45d1538ff7fc0e88d3935f6bb2a45c8c4d595c0b9375301d52e +SIZE (golang-net-6772e930b67b_GH0.tar.gz) = 1251401 +SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610 +SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969 +SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393 +SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956 +SHA256 (golang-sys-22da62e12c0c_GH0.tar.gz) = 5a120a40c63be9383650b7757c00645b25d37a3b7daa523f2a85fac969e51b2a +SIZE (golang-sys-22da62e12c0c_GH0.tar.gz) = 1106889 +SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 +SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 +SHA256 (hodgesds-perf-utils-v0.2.5_GH0.tar.gz) = 86794be211c0f8c7918cb061894b423eec252365488c55ff8bf8e10beca25a60 +SIZE (hodgesds-perf-utils-v0.2.5_GH0.tar.gz) = 17512 +SHA256 (josharian-native-b6b71def0850_GH0.tar.gz) = 5b83b583dc8a4f5d76864d746af4fe48cbfb5e5196b26601c34686a745d1d35c +SIZE (josharian-native-b6b71def0850_GH0.tar.gz) = 1802 +SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f +SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507 +SHA256 (jsimonetti-rtnetlink-8d122574c736_GH0.tar.gz) = d207dca2d778b9153dc5fea9a685500bc16df352cb3d306a9a269bbbf1910ca1 +SIZE (jsimonetti-rtnetlink-8d122574c736_GH0.tar.gz) = 78347 +SHA256 (lufia-iostat-v1.1.0_GH0.tar.gz) = 99d7a873d0d240bd0b9f930630402a21ba8d93178bc246d602b5dbd0544d78cc +SIZE (lufia-iostat-v1.1.0_GH0.tar.gz) = 4641 +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-genetlink-v1.0.0_GH0.tar.gz) = 0c9cd5060767359881c7b706491b7a4b212c75cd0305722410fbf86cefa3cb23 +SIZE (mdlayher-genetlink-v1.0.0_GH0.tar.gz) = 15584 +SHA256 (mdlayher-netlink-v1.2.1_GH0.tar.gz) = ab6d48d14d322f5baf57c597bb9c0dd9eb7d27a403143367d3b4670139267f50 +SIZE (mdlayher-netlink-v1.2.1_GH0.tar.gz) = 56571 +SHA256 (mdlayher-wifi-84f0b9457fdd_GH0.tar.gz) = 63c574c6f32cba5c4bfc4d3570cfda8d1cadca3180e2b4c4d71fcb1654b0c3b0 +SIZE (mdlayher-wifi-84f0b9457fdd_GH0.tar.gz) = 83068 +SHA256 (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 5bb72eaf9a4ffd7d0353fa6944951d244df89d879ac36d4b9860fd159162dd81 +SIZE (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 17140 +SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 +SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415 +SHA256 (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1 +SIZE (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330 +SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12 +SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986 +SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6 +SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369 +SHA256 (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 721740ad90ac0d32e51c94d05b67a276cbed2c138e9af16587f98e8664750220 +SIZE (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 50475 +SHA256 (prometheus-procfs-v0.3.0_GH0.tar.gz) = 9d2c0f48911ec3c36b638e65012a36c171403f522ec83c2a9dbe0f87972d671b +SIZE (prometheus-procfs-v0.3.0_GH0.tar.gz) = 162214 +SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f +SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648 +SHA256 (siebenmann-go-kstat-4e8294f9e9d5_GH0.tar.gz) = a0b47628924b21857d21963653a69a958853091c295aaa4b95b8882f3a796212 +SIZE (siebenmann-go-kstat-4e8294f9e9d5_GH0.tar.gz) = 27579 +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 Index: head/sysutils/node_exporter/pkg-plist =================================================================== --- head/sysutils/node_exporter/pkg-plist (revision 564756) +++ head/sysutils/node_exporter/pkg-plist (revision 564757) @@ -1,21 +1,24 @@ bin/node_exporter %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/TIME.md %%PORTDOCS%%%%DOCSDIR%%/V0_16_UPGRADE_GUIDE.md %%PORTDOCS%%%%DOCSDIR%%/example-16-compatibility-rules-new-to-old.yml %%PORTDOCS%%%%DOCSDIR%%/example-16-compatibility-rules.yml %%PORTDOCS%%%%DOCSDIR%%/example-17-compatibility-rules-new-to-old.yml %%PORTDOCS%%%%DOCSDIR%%/example-17-compatibility-rules.yml %%PORTDOCS%%%%DOCSDIR%%/node-mixin/Makefile %%PORTDOCS%%%%DOCSDIR%%/node-mixin/README.md %%PORTDOCS%%%%DOCSDIR%%/node-mixin/alerts.jsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/alerts/alerts.libsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/config.libsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/dashboards.jsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/dashboards/dashboards.libsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/dashboards/node.libsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/dashboards/use.libsonnet +%%PORTDOCS%%%%DOCSDIR%%/node-mixin/go.mod +%%PORTDOCS%%%%DOCSDIR%%/node-mixin/go.sum %%PORTDOCS%%%%DOCSDIR%%/node-mixin/jsonnetfile.json %%PORTDOCS%%%%DOCSDIR%%/node-mixin/mixin.libsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/rules.jsonnet %%PORTDOCS%%%%DOCSDIR%%/node-mixin/rules/rules.libsonnet +%%PORTDOCS%%%%DOCSDIR%%/node-mixin/tools.go