Attachment 205604 Details for Bug 239067 – net-mgmt/prometheus2: Update to 2.11.0

[patch] net-mgmt/prometheus2: Update to 2.11.0

prometheus-2.11.0.diff (text/plain), 4.90 KB, created by David O'Rourke on 2019-07-09 16:29:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David O'Rourke

Created: 2019-07-09 16:29:14 UTC

Size: 4.90 KB

patch

obsolete

>Index: net-mgmt/prometheus2/Makefile
>===================================================================
>--- net-mgmt/prometheus2/Makefile	(revision 506280)
>+++ net-mgmt/prometheus2/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	prometheus
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.10.0
>+DISTVERSION=	2.11.0
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	dor.bsd@xm0.uk
>@@ -11,12 +11,14 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		go gmake
>+USES=		go:modules gmake
> USE_GITHUB=	yes
> USE_RC_SUBR=	prometheus
> 
> GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
> 
>+OPTIONS_DEFINE=	DOCS
>+
> PROMETHEUS_USER?=	prometheus
> PROMETHEUS_GROUP?=	prometheus
> 
>@@ -55,19 +57,11 @@
> 		${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}"
>+GO_TARGET=	${PROMETHEUS_BINARIES:S/^/.\/cmd\//}
> 
>-do-build:
>-.for bin in ${PROMETHEUS_BINARIES}
>-	( cd ${GO_WRKSRC}/cmd/${bin} ; \
>-		${SETENV} ${MAKE_ENV} ${GO_ENV} \
>-		${GO_CMD} install ${GO_BUILDFLAGS} )
>-.endfor
>-
>-do-install:
>-.for bin in ${PROMETHEUS_BINARIES}
>-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${bin} ${STAGEDIR}${PREFIX}/bin
>-.endfor
>+post-install:
> 	${INSTALL_DATA} \
> 		${WRKSRC}/documentation/examples/prometheus.yml \
> 		${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample
>@@ -82,4 +76,9 @@
> 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} \
> 	)
> 
>+post-install-DOCS-on:
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC}/docs && \
>+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
>+
> .include <bsd.port.mk>
>Index: net-mgmt/prometheus2/distinfo
>===================================================================
>--- net-mgmt/prometheus2/distinfo	(revision 506280)
>+++ net-mgmt/prometheus2/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558923211
>-SHA256 (prometheus-prometheus-v2.10.0_GH0.tar.gz) = 0362f4aa2fb44cc2c572df140da742bdf99fe9f338157a83f6634694fd693000
>-SIZE (prometheus-prometheus-v2.10.0_GH0.tar.gz) = 11752395
>+TIMESTAMP = 1562676113
>+SHA256 (prometheus-prometheus-v2.11.0_GH0.tar.gz) = b83f490a59292f00ab9679b008e2876ccc3a0c153916e2c141566395c7dcc7ee
>+SIZE (prometheus-prometheus-v2.11.0_GH0.tar.gz) = 12133603
>Index: net-mgmt/prometheus2/pkg-message
>===================================================================
>--- net-mgmt/prometheus2/pkg-message	(revision 506280)
>+++ net-mgmt/prometheus2/pkg-message	(working copy)
>@@ -1,3 +1,44 @@
>+[
>+{
>+  message: <<EOF
>+The `prometheus_tsdb_wal_reader_corruption_errors` metric was renamed to
>+`prometheus_tsdb_wal_reader_corruption_errors_total`.
>+EOF
>+  maximum_version: "2.11"
>+  type: upgrade
>+}
>+{
>+  message: <<EOF
>+The `prometheus_tsdb_storage_blocks_bytes_total` metric is now
>+`prometheus_tsdb_storage_blocks_bytes`.
>+EOF
>+  maximum_version: "2.8"
>+  type: upgrade
>+}
>+{
>+  message: <<EOF
> The `storage.tsdb.retention` flag has been deprecated in Prometheus 2.7.0.
> Users of this flag will want to update their configuration to use the newer
> `storage.tsdb.retention.time` flag.
>+EOF
>+  maximum_version: "2.7"
>+  type: upgrade
>+}
>+{
>+  message: <<EOF
>+Users of `marathon_sd` should now use `auth_token` and `auth_token_file` for
>+token-based authentication instead of `bearer_token` and `bearer_token_file`
>+respectively.
>+Metric names for the HTTP server metrics were changed.
>+EOF
>+  maximum_version: "2.3"
>+  type: upgrade
>+}
>+{
>+  message: <<EOF
>+The `file_sd` mtime metric was renamed.
>+EOF
>+  maximum_version: "2.2"
>+  type: upgrade
>+}
>+]
>Index: net-mgmt/prometheus2/pkg-plist
>===================================================================
>--- net-mgmt/prometheus2/pkg-plist	(revision 506280)
>+++ net-mgmt/prometheus2/pkg-plist	(working copy)
>@@ -9,6 +9,27 @@
> %%PROMETHEUS_CONSOLES_DIR%%/node.html
> %%PROMETHEUS_CONSOLES_DIR%%/prometheus-overview.html
> %%PROMETHEUS_CONSOLES_DIR%%/prometheus.html
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/alerting_rules.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/configuration.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/index.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/recording_rules.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/template_examples.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/template_reference.md
>+%%PORTDOCS%%%%DOCSDIR%%/configuration/unit_testing_rules.md
>+%%PORTDOCS%%%%DOCSDIR%%/federation.md
>+%%PORTDOCS%%%%DOCSDIR%%/getting_started.md
>+%%PORTDOCS%%%%DOCSDIR%%/images/remote_integrations.png
>+%%PORTDOCS%%%%DOCSDIR%%/index.md
>+%%PORTDOCS%%%%DOCSDIR%%/installation.md
>+%%PORTDOCS%%%%DOCSDIR%%/migration.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/api.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/basics.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/examples.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/functions.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/index.md
>+%%PORTDOCS%%%%DOCSDIR%%/querying/operators.md
>+%%PORTDOCS%%%%DOCSDIR%%/stability.md
>+%%PORTDOCS%%%%DOCSDIR%%/storage.md
> @sample etc/prometheus.yml.sample
> @dir(prometheus,prometheus) %%PROMETHEUS_DB_DIR%%
> @dir(root,root) %%PROMETHEUS_LOG_DIR%%

Flags:

dor.bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 239067: 205604