Tue Nov 17 08:47:52 2020 UTC ()
prometheus: updated to 2.22.2

2.22.2:
[BUGFIX] Fix race condition in syncing/stopping/reloading scrapers.


(adam)
diff -r1.38 -r1.39 pkgsrc/databases/prometheus/Makefile
diff -r1.20 -r1.21 pkgsrc/databases/prometheus/distinfo
cvs diff -r1.38 -r1.39 pkgsrc/databases/prometheus/Makefile (switch to unified diff)

--- pkgsrc/databases/prometheus/Makefile 2020/11/13 19:26:04 1.38
+++ pkgsrc/databases/prometheus/Makefile 2020/11/17 08:47:52 1.39
@@ -1,67 +1,67 @@ @@ -1,67 +1,67 @@
1# $NetBSD: Makefile,v 1.38 2020/11/13 19:26:04 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.39 2020/11/17 08:47:52 adam Exp $
2 2
3DISTNAME= prometheus-2.22.1 3DISTNAME= prometheus-2.22.2
4MASTER_SITES= ${MASTER_SITE_GITHUB:=prometheus/} 4MASTER_SITES= ${MASTER_SITE_GITHUB:=prometheus/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= databases 6CATEGORIES= databases
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://prometheus.io/ 10HOMEPAGE= https://prometheus.io/
11COMMENT= The Prometheus monitoring system and time series database 11COMMENT= The Prometheus monitoring system and time series database
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14GO_DIST_BASE= ${DISTNAME} 14GO_DIST_BASE= ${DISTNAME}
15GO_SRCPATH= github.com/prometheus/prometheus 15GO_SRCPATH= github.com/prometheus/prometheus
16 16
17PKG_SYSCONFSUBDIR= prometheus 17PKG_SYSCONFSUBDIR= prometheus
18 18
19USE_TOOLS+= pax 19USE_TOOLS+= pax
20BUILD_DEFS+= VARBASE PKG_SYSCONFDIR 20BUILD_DEFS+= VARBASE PKG_SYSCONFDIR
21 21
22SUBST_CLASSES+= paths 22SUBST_CLASSES+= paths
23SUBST_FILES.paths+= cmd/prometheus/main.go 23SUBST_FILES.paths+= cmd/prometheus/main.go
24SUBST_STAGE.paths= post-configure 24SUBST_STAGE.paths= post-configure
25SUBST_VARS.paths= PKG_SYSCONFDIR VARBASE 25SUBST_VARS.paths= PKG_SYSCONFDIR VARBASE
26 26
27SUBST_CLASSES+= webui 27SUBST_CLASSES+= webui
28SUBST_FILES.webui= web/ui/ui.go 28SUBST_FILES.webui= web/ui/ui.go
29SUBST_STAGE.webui= post-configure 29SUBST_STAGE.webui= post-configure
30SUBST_VARS.webui= WEBUI_DIR 30SUBST_VARS.webui= WEBUI_DIR
31 31
32MAKE_DIRS+= ${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries 32MAKE_DIRS+= ${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries
33EXAMPLE_DIR= share/examples/prometheus 33EXAMPLE_DIR= share/examples/prometheus
34EXAMPLE_FILES= prometheus.yml 34EXAMPLE_FILES= prometheus.yml
35EXAMPLE_FILES+= consoles/index.html.example consoles/node-cpu.html \ 35EXAMPLE_FILES+= consoles/index.html.example consoles/node-cpu.html \
36 consoles/node-disk.html consoles/node-overview.html \ 36 consoles/node-disk.html consoles/node-overview.html \
37 consoles/node.html consoles/prometheus-overview.html \ 37 consoles/node.html consoles/prometheus-overview.html \
38 consoles/prometheus.html 38 consoles/prometheus.html
39EXAMPLE_FILES+= console_libraries/menu.lib console_libraries/prom.lib 39EXAMPLE_FILES+= console_libraries/menu.lib console_libraries/prom.lib
40WEBUI_DIR= ${PREFIX}/share/prometheus 40WEBUI_DIR= ${PREFIX}/share/prometheus
41 41
42INSTALLATION_DIRS+= bin ${EXAMPLE_DIR} ${WEBUI_DIR} 42INSTALLATION_DIRS+= bin ${EXAMPLE_DIR} ${WEBUI_DIR}
43 43
44.for f in ${EXAMPLE_FILES} 44.for f in ${EXAMPLE_FILES}
45CONF_FILES+= ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f} 45CONF_FILES+= ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
46.endfor 46.endfor
47 47
48do-install: 48do-install:
49 ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \ 49 ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \
50 ${DESTDIR}${PREFIX}/${EXAMPLE_DIR} 50 ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
51.for f in prometheus promtool 51.for f in prometheus promtool
52 ${INSTALL_PROGRAM} ${WRKDIR}/bin/${f} ${DESTDIR}${PREFIX}/bin 52 ${INSTALL_PROGRAM} ${WRKDIR}/bin/${f} ${DESTDIR}${PREFIX}/bin
53.endfor 53.endfor
54.for f in consoles console_libraries 54.for f in consoles console_libraries
55 cd ${WRKSRC} && ${PAX} -rw ${f} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR} 55 cd ${WRKSRC} && ${PAX} -rw ${f} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
56.endfor 56.endfor
57.for f in static templates 57.for f in static templates
58 cd ${WRKSRC}/web/ui && ${PAX} -rw ${f} ${DESTDIR}${WEBUI_DIR} 58 cd ${WRKSRC}/web/ui && ${PAX} -rw ${f} ${DESTDIR}${WEBUI_DIR}
59.endfor 59.endfor
60 60
61post-install: 61post-install:
62.for f in ${EXAMPLE_FILES} 62.for f in ${EXAMPLE_FILES}
63 ${CHMOD} ${NONBINMODE} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}/${f} 63 ${CHMOD} ${NONBINMODE} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}/${f}
64.endfor 64.endfor
65 65
66.include "../../lang/go/go-package.mk" 66.include "../../lang/go/go-package.mk"
67.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/databases/prometheus/distinfo (switch to unified diff)

--- pkgsrc/databases/prometheus/distinfo 2020/11/12 11:09:01 1.20
+++ pkgsrc/databases/prometheus/distinfo 2020/11/17 08:47:52 1.21
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.20 2020/11/12 11:09:01 adam Exp $ 1$NetBSD: distinfo,v 1.21 2020/11/17 08:47:52 adam Exp $
2 2
3SHA1 (prometheus-2.22.1.tar.gz) = 49bffbe38208bfb722ffda76924b11a0e6431fb9 3SHA1 (prometheus-2.22.2.tar.gz) = 7a83196f2e2ea8d981cf3b4f37cdb3822d63d68f
4RMD160 (prometheus-2.22.1.tar.gz) = 04ccb0445b69e4c9528460d535ba27ad7bd565af 4RMD160 (prometheus-2.22.2.tar.gz) = 52d8fa88081d256b1bcbbc5262a1dcc97fbd7adf
5SHA512 (prometheus-2.22.1.tar.gz) = 0bab320bf7ce1a72f378673a11ae2f2c31c9b226404a251590ffad497778e4774bc17cb2adf298092f794c093c438e0e64e4bcd37dfde3311005c99fcf26409b 5SHA512 (prometheus-2.22.2.tar.gz) = b94ceaf87c02152fffc7da9c28d28b773ec35f8ecc31fb03e0a1fdfcb7c2925c119f3e4b6dd92460952503fd34ae7ce355a9797d78341f8b6fe0176cfc3d614a
6Size (prometheus-2.22.1.tar.gz) = 14138581 bytes 6Size (prometheus-2.22.2.tar.gz) = 14138699 bytes
7SHA1 (patch-cmd_prometheus_main.go) = b3f3f8872ad19f823424009090fdf4705e7af257 7SHA1 (patch-cmd_prometheus_main.go) = b3f3f8872ad19f823424009090fdf4705e7af257
8SHA1 (patch-web_ui_ui.go) = 900fd75a9b9e7bbb8aa18a3e06d9c237b94708cf 8SHA1 (patch-web_ui_ui.go) = 900fd75a9b9e7bbb8aa18a3e06d9c237b94708cf