prometheus: updated to 2.9.2

2.9.2:
[BUGFIX] Make sure subquery range is taken into account for selection
[BUGFIX] Exhaust every request body before closing it
[BUGFIX] Cmd/promtool: return errors from rule evaluations
[BUGFIX] Remote Storage: string interner should not panic in release
[BUGFIX] Fix memory allocation regression in mergedPostings.

2.9.1:
[BUGFIX] Discovery/kubernetes: fix missing label sanitization
[BUGFIX] Remote_write: Prevent reshard concurrent with calling stop

2.9.0:
This releases uses Go 1.12, which includes a change in how memory is released
to Linux. This will cause RSS to be reported as higher, however this is harmless
and the memory is available to the kernel when it needs it.

[CHANGE/ENHANCEMENT] Update Consul to support catalog.ServiceMultipleTags.
[FEATURE] Add honor_timestamps scrape option.
[ENHANCEMENT] Discovery/kubernetes: add present labels for labels/annotations.
[ENHANCEMENT] OpenStack SD: Add ProjectID and UserID meta labels.
[ENHANCEMENT] Add GODEBUG and retention to the runtime page.
[ENHANCEMENT] Add support for POSTing to /series endpoint.
[ENHANCEMENT] Support PUT methods for Lifecycle and Admin APIs.
[ENHANCEMENT] Scrape: Add global jitter for HA server.
[ENHANCEMENT] Check for cancellation on every step of a range evaluation.
[ENHANCEMENT] String interning for labels & values in the remote_write path.
[ENHANCEMENT] Don't lose the scrape cache on a failed scrape.
[ENHANCEMENT] Reload cert files from disk automatically.
[ENHANCEMENT] Use fixed length millisecond timestamp format for logs.
[ENHANCEMENT] Performance improvements for postings.
[BUGFIX] Remote Write: fix checkpoint reading.
[BUGFIX] Check if label value is valid when unmarshaling external labels from YAML.
[BUGFIX] Promparse: sort all labels when parsing.
[BUGFIX] Reload rules: copy state on both name and labels.
[BUGFIX] Exponentation operator to drop metric name in result of operation.
[BUGFIX] Config: resolve more file paths.
[BUGFIX] Promtool: resolve relative paths in alert test files.
[BUGFIX] Set TLSHandshakeTimeout in HTTP transport.
[BUGFIX] Use fsync to be more resilient to machine crashes.
[BUGFIX] Keep series that are still in WAL in checkpoints.
[BUGFIX] Fix output sample values for scalar-to-vector comparison operations.

3 files changed, 14 insertions, 13 deletions

diff --git a/databases/prometheus/Makefile b/databases/prometheus/Makefile
index aa2b3b045a1..ee61be72781 100644
--- a/databases/prometheus/Makefile
+++ b/databases/prometheus/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2019/03/17 12:55:13 tm Exp $
+# $NetBSD: Makefile,v 1.2 2019/05/20 09:23:00 adam Exp $
 
-DISTNAME=	prometheus-2.8.0
+DISTNAME=	prometheus-2.9.2
 MASTER_SITES=	${MASTER_SITE_GITHUB:=prometheus/}
 CATEGORIES=	databases
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -20,9 +20,8 @@ BUILD_DEFS+=	VARBASE PKG_SYSCONFDIR
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	cmd/prometheus/main.go
-SUBST_SED.paths+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.paths+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_STAGE.paths=	post-configure
+SUBST_VARS.paths=	PKG_SYSCONFDIR VARBASE
 
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries
 EXAMPLE_DIR=		share/examples/prometheus
diff --git a/databases/prometheus/distinfo b/databases/prometheus/distinfo
index 7c5862e72c2..676614a2a77 100644
--- a/databases/prometheus/distinfo
+++ b/databases/prometheus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/03/17 12:55:13 tm Exp $
+$NetBSD: distinfo,v 1.2 2019/05/20 09:23:00 adam Exp $
 
-SHA1 (prometheus-2.8.0.tar.gz) = 3a4ce194b0db6670c33110d390cb3770c53b51e4
-RMD160 (prometheus-2.8.0.tar.gz) = 36cf8d13bde68c1f295ad96a8abc825a44c49d0c
-SHA512 (prometheus-2.8.0.tar.gz) = 9b0b0679768a9426547b232a87a3109008c28a59ef74b9376f192209c4005c7f18d622601ebef14516786378c5f014f6734a4e1a7929ffc0b9b7c369d28030eb
-Size (prometheus-2.8.0.tar.gz) = 11097030 bytes
-SHA1 (patch-cmd_prometheus_main.go) = 51f608ee8bb399f1145b0e8fcdc586ef1b3ba9c9
+SHA1 (prometheus-2.9.2.tar.gz) = f46550b832314e0d2e36fa16dddba63314af83bf
+RMD160 (prometheus-2.9.2.tar.gz) = 71cab3ef29e7ebc8ae372d2ebd7b427b08a94927
+SHA512 (prometheus-2.9.2.tar.gz) = 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
+Size (prometheus-2.9.2.tar.gz) = 11477683 bytes
+SHA1 (patch-cmd_prometheus_main.go) = b3f3f8872ad19f823424009090fdf4705e7af257
diff --git a/databases/prometheus/patches/patch-cmd_prometheus_main.go b/databases/prometheus/patches/patch-cmd_prometheus_main.go
index 7c8fa7ee091..ad7d33fcacd 100644
--- a/databases/prometheus/patches/patch-cmd_prometheus_main.go
+++ b/databases/prometheus/patches/patch-cmd_prometheus_main.go
@@ -1,8 +1,8 @@
-$NetBSD: patch-cmd_prometheus_main.go,v 1.1 2019/03/17 12:55:13 tm Exp $
+$NetBSD: patch-cmd_prometheus_main.go,v 1.2 2019/05/20 09:23:00 adam Exp $
 
 Add prefix for SYSCONFDIR and VARBASE to store configuration file and metrics data at the correct location.
 
---- cmd/prometheus/main.go.orig	2019-03-12 04:09:20.000000000 +0000
+--- cmd/prometheus/main.go.orig	2019-04-24 15:30:33.000000000 +0000
 +++ cmd/prometheus/main.go
 @@ -133,7 +133,7 @@ func main() {
  	a.HelpFlag.Short('h')
@@ -13,7 +13,7 @@ Add prefix for SYSCONFDIR and VARBASE to store configuration file and metrics da
  
  	a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry.").
  		Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress)
-@@ -163,16 +163,16 @@ func main() {
+@@ -163,10 +163,10 @@ func main() {
  		Default("false").BoolVar(&cfg.web.EnableAdminAPI)
  
  	a.Flag("web.console.templates", "Path to the console template directory, available at /consoles.").
@@ -26,6 +26,8 @@ Add prefix for SYSCONFDIR and VARBASE to store configuration file and metrics da
  
  	a.Flag("web.page-title", "Document title of Prometheus instance.").
  		Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle)
+@@ -175,7 +175,7 @@ func main() {
+ 		Default(".*").StringVar(&cfg.corsRegexString)
  
  	a.Flag("storage.tsdb.path", "Base path for metrics storage.").
 -		Default("data/").StringVar(&cfg.localStoragePath)