Attachment 215032 Details for Bug 246791 – node_exporter: Update to 1.0.0

[patch] node_exporter: Update to 1.0.0

node_exporter-1.0.0.diff (text/plain), 5.89 KB, created by David O'Rourke on 2020-05-29 18:11:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David O'Rourke

Created: 2020-05-29 18:11:32 UTC

Size: 5.89 KB

patch

obsolete

>Index: sysutils/node_exporter/Makefile
>===================================================================
>--- sysutils/node_exporter/Makefile	(revision 536980)
>+++ sysutils/node_exporter/Makefile	(working copy)
>@@ -2,11 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	node_exporter
>-PORTVERSION=	0.18.1
>+PORTVERSION=	1.0.0
> DISTVERSIONPREFIX=v
> CATEGORIES=	sysutils
> 
>-MAINTAINER=	ports@ecadlabs.com
>+MAINTAINER=	dor.bsd@xm0.uk
> COMMENT=	Prometheus exporter for machine metrics
> 
> LICENSE=	APACHE20
>@@ -40,7 +40,7 @@
> 		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
> GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>+OPTIONS_DEFINE=	DOCS
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>@@ -48,10 +48,6 @@
> 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
> 
>-post-install-EXAMPLES-on:
>-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/text_collector_examples
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} ./text_collector_examples ${STAGEDIR}${EXAMPLESDIR}
>-
> # TestFileDescriptorLeak is being skipped at the moment because procfs(5) is
> # not properly detected.
> pre-test:
>Index: sysutils/node_exporter/distinfo
>===================================================================
>--- sysutils/node_exporter/distinfo	(revision 536980)
>+++ sysutils/node_exporter/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1560802738
>-SHA256 (prometheus-node_exporter-v0.18.1_GH0.tar.gz) = 9ddf187c462f2681ab4516410ada0e6f0f03097db6986686795559ea71a07694
>-SIZE (prometheus-node_exporter-v0.18.1_GH0.tar.gz) = 2110072
>+TIMESTAMP = 1590769126
>+SHA256 (prometheus-node_exporter-v1.0.0_GH0.tar.gz) = 2d82dac251e789b75879ebf1ebe94d1dc15c59ffa28ffe4e15b8d2ff63190607
>+SIZE (prometheus-node_exporter-v1.0.0_GH0.tar.gz) = 2779482
>Index: sysutils/node_exporter/files/node_exporter.in
>===================================================================
>--- sysutils/node_exporter/files/node_exporter.in	(revision 536980)
>+++ sysutils/node_exporter/files/node_exporter.in	(working copy)
>@@ -38,7 +38,7 @@
> pidfile=/var/run/node_exporter.pid
> command="/usr/sbin/daemon"
> procname="%%PREFIX%%/bin/node_exporter"
>-command_args="-p ${pidfile} -T ${name} \
>+command_args="-f -p ${pidfile} -T ${name} \
>     /usr/bin/env ${procname} \
>     --web.listen-address=${node_exporter_listen_address} \
>     --collector.textfile.directory=${node_exporter_textfile_dir} \
>Index: sysutils/node_exporter/pkg-message
>===================================================================
>--- sysutils/node_exporter/pkg-message	(revision 536980)
>+++ sysutils/node_exporter/pkg-message	(working copy)
>@@ -1,6 +1,28 @@
> [
>-{ type: install
>+{
>+  type: upgrade
>   message: <<EOM
>+Text collector examples have been moved to a new repository at
>+https://github.com/prometheus-community/node-exporter-textfile-collector-scripts.
>+
>+The netdev collector CLI argument `--collector.netdev.ignored-devices` was
>+renamed to `--collector.netdev.device-blacklist`.
>+
>+Additional label `mountaddr` added to NFS device metrics to distinguish mounts
>+from the same URL, but different IP addresses.
>+
>+Metrics `node_cpu_scaling_frequency_min_hrts` and
>+`node_cpu_scaling_frequency_max_hrts` of the cpufreq collector were renamed to
>+`node_cpu_scaling_frequency_min_hertz` and
>+`node_cpu_scaling_frequency_max_hertz`.
>+
>+Collectors that are enabled, but are unable to find data to collect, now return
>+`0` for `node_scrape_collector_success`.
>+EOM
>+}
>+{
>+  type: install
>+  message: <<EOM
> If upgrading from a version of node_exporter <0.15.0 you'll need to update any
> custom command line flags that you may have set as it now requires a
> double-dash (--flag) instead of a single dash (-flag).
>Index: sysutils/node_exporter/pkg-plist
>===================================================================
>--- sysutils/node_exporter/pkg-plist	(revision 536980)
>+++ sysutils/node_exporter/pkg-plist	(working copy)
>@@ -6,20 +6,16 @@
> %%PORTDOCS%%%%DOCSDIR%%/example-16-compatibility-rules.yml
> %%PORTDOCS%%%%DOCSDIR%%/example-17-compatibility-rules-new-to-old.yml
> %%PORTDOCS%%%%DOCSDIR%%/example-17-compatibility-rules.yml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/README.md
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/apt.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/btrfs_stats.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/deleted_libraries.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/directory-size.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/inotify-instances
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/ipmitool
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/md_info.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/md_info_detail.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/mellanox_hca_temp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/ntpd_metrics.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/nvme_metrics.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/pacman.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/smartmon.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/smartmon.sh
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/storcli.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_collector_examples/yum.sh
>+%%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/jsonnetfile.json
>+%%PORTDOCS%%%%DOCSDIR%%/node-mixin/mixin.libsonnet
>+%%PORTDOCS%%%%DOCSDIR%%/node-mixin/rules.jsonnet
>+%%PORTDOCS%%%%DOCSDIR%%/node-mixin/rules/rules.libsonnet

Actions: View | Diff

Attachments on bug 246791: 215032 | 215626