Mon May 20 09:23:00 2019 UTC ()
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.


(adam)
diff -r1.1 -r1.2 pkgsrc/databases/prometheus/Makefile
diff -r1.1 -r1.2 pkgsrc/databases/prometheus/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/prometheus/patches/patch-cmd_prometheus_main.go
cvs diff -r1.1 -r1.2 pkgsrc/databases/prometheus/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/prometheus/Makefile 2019/03/17 12:55:13 1.1
+++ pkgsrc/databases/prometheus/Makefile 2019/05/20 09:23:00 1.2
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.1 2019/03/17 12:55:13 tm Exp $ 1# $NetBSD: Makefile,v 1.2 2019/05/20 09:23:00 adam Exp $
2 2
3DISTNAME= prometheus-2.8.0 3DISTNAME= prometheus-2.9.2
4MASTER_SITES= ${MASTER_SITE_GITHUB:=prometheus/} 4MASTER_SITES= ${MASTER_SITE_GITHUB:=prometheus/}
5CATEGORIES= databases 5CATEGORIES= databases
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/prometheus/prometheus 9HOMEPAGE= https://github.com/prometheus/prometheus
10COMMENT= The Prometheus monitoring system and time series database 10COMMENT= The Prometheus monitoring system and time series database
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13GO_DIST_BASE= ${DISTNAME} 13GO_DIST_BASE= ${DISTNAME}
14GO_SRCPATH= github.com/prometheus/prometheus 14GO_SRCPATH= github.com/prometheus/prometheus
15 15
16PKG_SYSCONFSUBDIR= prometheus 16PKG_SYSCONFSUBDIR= prometheus
17 17
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19BUILD_DEFS+= VARBASE PKG_SYSCONFDIR 19BUILD_DEFS+= VARBASE PKG_SYSCONFDIR
20 20
21SUBST_CLASSES+= paths 21SUBST_CLASSES+= paths
22SUBST_FILES.paths+= cmd/prometheus/main.go 22SUBST_FILES.paths+= cmd/prometheus/main.go
23SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g" 
24SUBST_SED.paths+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 
25SUBST_STAGE.paths= post-configure 23SUBST_STAGE.paths= post-configure
 24SUBST_VARS.paths= PKG_SYSCONFDIR VARBASE
26 25
27MAKE_DIRS+= ${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries 26MAKE_DIRS+= ${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries
28EXAMPLE_DIR= share/examples/prometheus 27EXAMPLE_DIR= share/examples/prometheus
29EXAMPLE_FILES= prometheus.yml 28EXAMPLE_FILES= prometheus.yml
30EXAMPLE_FILES+= consoles/index.html.example consoles/node-cpu.html \ 29EXAMPLE_FILES+= consoles/index.html.example consoles/node-cpu.html \
31 consoles/node-disk.html consoles/node-overview.html \ 30 consoles/node-disk.html consoles/node-overview.html \
32 consoles/node.html consoles/prometheus-overview.html \ 31 consoles/node.html consoles/prometheus-overview.html \
33 consoles/prometheus.html 32 consoles/prometheus.html
34EXAMPLE_FILES+= console_libraries/menu.lib console_libraries/prom.lib 33EXAMPLE_FILES+= console_libraries/menu.lib console_libraries/prom.lib
35INSTALLATION_DIRS+= ${PREFIX}/${EXAMPLE_DIR} 34INSTALLATION_DIRS+= ${PREFIX}/${EXAMPLE_DIR}
36 35
37.for f in ${EXAMPLE_FILES} 36.for f in ${EXAMPLE_FILES}
38CONF_FILES+= ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f} 37CONF_FILES+= ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
cvs diff -r1.1 -r1.2 pkgsrc/databases/prometheus/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/prometheus/distinfo 2019/03/17 12:55:13 1.1
+++ pkgsrc/databases/prometheus/distinfo 2019/05/20 09:23:00 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2019/03/17 12:55:13 tm Exp $ 1$NetBSD: distinfo,v 1.2 2019/05/20 09:23:00 adam Exp $
2 2
3SHA1 (prometheus-2.8.0.tar.gz) = 3a4ce194b0db6670c33110d390cb3770c53b51e4 3SHA1 (prometheus-2.9.2.tar.gz) = f46550b832314e0d2e36fa16dddba63314af83bf
4RMD160 (prometheus-2.8.0.tar.gz) = 36cf8d13bde68c1f295ad96a8abc825a44c49d0c 4RMD160 (prometheus-2.9.2.tar.gz) = 71cab3ef29e7ebc8ae372d2ebd7b427b08a94927
5SHA512 (prometheus-2.8.0.tar.gz) = 9b0b0679768a9426547b232a87a3109008c28a59ef74b9376f192209c4005c7f18d622601ebef14516786378c5f014f6734a4e1a7929ffc0b9b7c369d28030eb 5SHA512 (prometheus-2.9.2.tar.gz) = 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
6Size (prometheus-2.8.0.tar.gz) = 11097030 bytes 6Size (prometheus-2.9.2.tar.gz) = 11477683 bytes
7SHA1 (patch-cmd_prometheus_main.go) = 51f608ee8bb399f1145b0e8fcdc586ef1b3ba9c9 7SHA1 (patch-cmd_prometheus_main.go) = b3f3f8872ad19f823424009090fdf4705e7af257
cvs diff -r1.1 -r1.2 pkgsrc/databases/prometheus/patches/patch-cmd_prometheus_main.go (expand / switch to unified diff)

--- pkgsrc/databases/prometheus/patches/patch-cmd_prometheus_main.go 2019/03/17 12:55:13 1.1
+++ pkgsrc/databases/prometheus/patches/patch-cmd_prometheus_main.go 2019/05/20 09:23:00 1.2
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1$NetBSD: patch-cmd_prometheus_main.go,v 1.1 2019/03/17 12:55:13 tm Exp $ 1$NetBSD: patch-cmd_prometheus_main.go,v 1.2 2019/05/20 09:23:00 adam Exp $
2 2
3Add prefix for SYSCONFDIR and VARBASE to store configuration file and metrics data at the correct location. 3Add prefix for SYSCONFDIR and VARBASE to store configuration file and metrics data at the correct location.
4 4
5--- cmd/prometheus/main.go.orig 2019-03-12 04:09:20.000000000 +0000 5--- cmd/prometheus/main.go.orig 2019-04-24 15:30:33.000000000 +0000
6+++ cmd/prometheus/main.go 6+++ cmd/prometheus/main.go
7@@ -133,7 +133,7 @@ func main() { 7@@ -133,7 +133,7 @@ func main() {
8 a.HelpFlag.Short('h') 8 a.HelpFlag.Short('h')
9  9
10 a.Flag("config.file", "Prometheus configuration file path."). 10 a.Flag("config.file", "Prometheus configuration file path.").
11- Default("prometheus.yml").StringVar(&cfg.configFile) 11- Default("prometheus.yml").StringVar(&cfg.configFile)
12+ Default("@PKG_SYSCONFDIR@/prometheus.yml").StringVar(&cfg.configFile) 12+ Default("@PKG_SYSCONFDIR@/prometheus.yml").StringVar(&cfg.configFile)
13  13
14 a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry."). 14 a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry.").
15 Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress) 15 Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress)
16@@ -163,16 +163,16 @@ func main() { 16@@ -163,10 +163,10 @@ func main() {
17 Default("false").BoolVar(&cfg.web.EnableAdminAPI) 17 Default("false").BoolVar(&cfg.web.EnableAdminAPI)
18  18
19 a.Flag("web.console.templates", "Path to the console template directory, available at /consoles."). 19 a.Flag("web.console.templates", "Path to the console template directory, available at /consoles.").
20- Default("consoles").StringVar(&cfg.web.ConsoleTemplatesPath) 20- Default("consoles").StringVar(&cfg.web.ConsoleTemplatesPath)
21+ Default("@PKG_SYSCONFDIR@/consoles").StringVar(&cfg.web.ConsoleTemplatesPath) 21+ Default("@PKG_SYSCONFDIR@/consoles").StringVar(&cfg.web.ConsoleTemplatesPath)
22  22
23 a.Flag("web.console.libraries", "Path to the console library directory."). 23 a.Flag("web.console.libraries", "Path to the console library directory.").
24- Default("console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath) 24- Default("console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath)
25+ Default("@PKG_SYSCONFDIR@/console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath) 25+ Default("@PKG_SYSCONFDIR@/console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath)
26  26
27 a.Flag("web.page-title", "Document title of Prometheus instance."). 27 a.Flag("web.page-title", "Document title of Prometheus instance.").
28 Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle) 28 Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle)
 29@@ -175,7 +175,7 @@ func main() {
 30 Default(".*").StringVar(&cfg.corsRegexString)
29  31
30 a.Flag("storage.tsdb.path", "Base path for metrics storage."). 32 a.Flag("storage.tsdb.path", "Base path for metrics storage.").
31- Default("data/").StringVar(&cfg.localStoragePath) 33- Default("data/").StringVar(&cfg.localStoragePath)
32+ Default("@VARBASE@/lib/prometheus/data/").StringVar(&cfg.localStoragePath) 34+ Default("@VARBASE@/lib/prometheus/data/").StringVar(&cfg.localStoragePath)
33  35
34 a.Flag("storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing."). 36 a.Flag("storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing.").
35 Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration) 37 Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration)