CVS commit: pkgsrc/databases/prometheus

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases/prometheus
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 8 Jan 2020 22:33:05 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan  8 22:33:05 UTC 2020

Modified Files:
        pkgsrc/databases/prometheus: Makefile PLIST distinfo
Added Files:
        pkgsrc/databases/prometheus/patches: patch-web_ui_ui.go

Log Message:
prometheus: updated to 2.15.2

2.15.2:
[BUGFIX] TSDB: Fixed support for TSDB blocks built with Prometheus before 2.1.0.
[BUGFIX] TSDB: Fixed block compaction issues on Windows.

2.15.1:
[BUGFIX] Fixed race on concurrent queries against the same data.

2.15.0:
[CHANGE] Discovery: Removed prometheus_sd_kubernetes_cache_* metrics. Additionally prometheus_sd_kubernetes_workqueue_latency_seconds and prometheus_sd_kubernetes_workqueue_work_duration_seconds 
metrics now show correct values in seconds.
[CHANGE] Remote write: Changed query label on prometheus_remote_storage_* metrics to remote_name and url.
[FEATURE] API: Added new endpoint for exposing per metric metadata /metadata.
[ENHANCEMENT] TSDB: Significantly reduced memory footprint of loaded TSDB blocks.
[ENHANCEMENT] TSDB: Significantly optimized what we buffer during compaction which should result in lower memory footprint during compaction.
[ENHANCEMENT] TSDB: Improve replay latency.
[ENHANCEMENT] TSDB: WAL size is now used for size based retention calculation.
[ENHANCEMENT] Remote read: Added query grouping and range hints to the remote read request
[ENHANCEMENT] Remote write: Added prometheus_remote_storage_sent_bytes_total counter per queue.
[ENHANCEMENT] promql: Improved PromQL parser performance.
[ENHANCEMENT] React UI: Implemented missing pages like /targets
[ENHANCEMENT] promql: Prometheus now accepts spaces between time range and square bracket. e.g [ 5m]
[BUGFIX] Config: Fixed alertmanager configuration to not miss targets when configurations are similar.
[BUGFIX] Remote write: Value of prometheus_remote_storage_shards_desired gauge shows raw value of desired shards and it's updated correctly.
[BUGFIX] Rules: Prometheus now fails the evaluation of rules and alerts where metric results collide with labels specified in labels field.
[BUGFIX] API: Targets Metadata API /targets/metadata now accepts empty match_targets parameter as in the spec.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/prometheus/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/prometheus/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/prometheus/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/prometheus/patches/patch-web_ui_ui.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/prometheus/Makefile
diff -u pkgsrc/databases/prometheus/Makefile:1.13 pkgsrc/databases/prometheus/Makefile:1.14
--- pkgsrc/databases/prometheus/Makefile:1.13   Fri Dec 13 07:43:48 2019
+++ pkgsrc/databases/prometheus/Makefile        Wed Jan  8 22:33:05 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2019/12/13 07:43:48 bsiegert Exp $
+# $NetBSD: Makefile,v 1.14 2020/01/08 22:33:05 adam Exp $
 
-DISTNAME=      prometheus-2.14.0
+DISTNAME=      prometheus-2.15.2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=prometheus/}
-PKGREVISION=   1
 CATEGORIES=    databases
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
@@ -24,26 +23,37 @@ SUBST_FILES.paths+= cmd/prometheus/main.
 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
-EXAMPLE_FILES=         prometheus.yml
-EXAMPLE_FILES+=                consoles/index.html.example consoles/node-cpu.html \
-                       consoles/node-disk.html consoles/node-overview.html \
-                       consoles/node.html consoles/prometheus-overview.html \
-                       consoles/prometheus.html
-EXAMPLE_FILES+=                console_libraries/menu.lib console_libraries/prom.lib
-INSTALLATION_DIRS+=    ${PREFIX}/${EXAMPLE_DIR}
+SUBST_CLASSES+=                webui
+SUBST_FILES.webui=     web/ui/ui.go
+SUBST_STAGE.webui=     post-configure
+SUBST_VARS.webui=      WEBUI_DIR
+
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/consoles ${PKG_SYSCONFDIR}/console_libraries
+EXAMPLE_DIR=   share/examples/prometheus
+EXAMPLE_FILES= prometheus.yml
+EXAMPLE_FILES+=        consoles/index.html.example consoles/node-cpu.html \
+               consoles/node-disk.html consoles/node-overview.html \
+               consoles/node.html consoles/prometheus-overview.html \
+               consoles/prometheus.html
+EXAMPLE_FILES+=        console_libraries/menu.lib console_libraries/prom.lib
+WEBUI_DIR=     ${PREFIX}/share/prometheus
+
+INSTALLATION_DIRS+=    ${PREFIX}/${EXAMPLE_DIR} ${WEBUI_DIR}
 
 .for f in ${EXAMPLE_FILES}
 CONF_FILES+=   ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
+       ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \
+               ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
        cd ${WRKDIR} && ${PAX} -rw bin ${DESTDIR}${PREFIX}
-       cd ${WRKSRC} && \
-               ${PAX} -rw consoles ${DESTDIR}${PREFIX}/${EXAMPLE_DIR} && \
-               ${PAX} -rw console_libraries ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
+.for f in consoles console_libraries
+       cd ${WRKSRC} && ${PAX} -rw ${f} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
+.endfor
+.for f in static templates
+       cd ${WRKSRC}/web/ui && ${PAX} -rw ${f} ${DESTDIR}${WEBUI_DIR}
+.endfor
 
 post-install:
 .for f in ${EXAMPLE_FILES}

Index: pkgsrc/databases/prometheus/PLIST
diff -u pkgsrc/databases/prometheus/PLIST:1.2 pkgsrc/databases/prometheus/PLIST:1.3
--- pkgsrc/databases/prometheus/PLIST:1.2       Wed Aug 21 08:46:39 2019
+++ pkgsrc/databases/prometheus/PLIST   Wed Jan  8 22:33:05 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/08/21 08:46:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/08 22:33:05 adam Exp $
 bin/adapter-usage
 bin/example_write_adapter
 bin/prometheus
@@ -15,3 +15,88 @@ share/examples/prometheus/consoles/node.
 share/examples/prometheus/consoles/prometheus-overview.html
 share/examples/prometheus/consoles/prometheus.html
 share/examples/prometheus/prometheus.yml
+share/prometheus/static/css/alerts.css
+share/prometheus/static/css/config.css
+share/prometheus/static/css/graph.css
+share/prometheus/static/css/prom_console.css
+share/prometheus/static/css/prometheus.css
+share/prometheus/static/css/rules.css
+share/prometheus/static/css/targets.css
+share/prometheus/static/img/ajax-loader.gif
+share/prometheus/static/img/favicon.ico
+share/prometheus/static/js/alerts.js
+share/prometheus/static/js/config.js
+share/prometheus/static/js/graph/graph_template.handlebar
+share/prometheus/static/js/graph/index.js
+share/prometheus/static/js/prom_console.js
+share/prometheus/static/js/targets.js
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-grid.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-grid.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-grid.min.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-grid.min.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-reboot.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-reboot.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-reboot.min.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap-reboot.min.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap.min.css
+share/prometheus/static/vendor/bootstrap-4.3.1/css/bootstrap.min.css.map
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.bundle.js
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.bundle.js.map
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.bundle.min.js
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.bundle.min.js.map
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.js
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.js.map
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.min.js
+share/prometheus/static/vendor/bootstrap-4.3.1/js/bootstrap.min.js.map
+share/prometheus/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js
+share/prometheus/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.css
+share/prometheus/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.eot
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.svg
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.ttf
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff2
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.eot
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.svg
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.ttf
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff2
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.eot
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.svg
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.ttf
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff2
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff
+share/prometheus/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2
+share/prometheus/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css
+share/prometheus/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less
+share/prometheus/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css
+share/prometheus/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.css
+share/prometheus/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
+share/prometheus/static/vendor/fuzzy/fuzzy.js
+share/prometheus/static/vendor/js/jquery-3.3.1.min.js
+share/prometheus/static/vendor/js/jquery.hotkeys.js
+share/prometheus/static/vendor/js/jquery.min.js
+share/prometheus/static/vendor/js/jquery.selection.js
+share/prometheus/static/vendor/js/popper.min.js
+share/prometheus/static/vendor/moment/moment-timezone-with-data.min.js
+share/prometheus/static/vendor/moment/moment.min.js
+share/prometheus/static/vendor/mustache/mustache.min.js
+share/prometheus/static/vendor/rickshaw/rickshaw.min.css
+share/prometheus/static/vendor/rickshaw/rickshaw.min.js
+share/prometheus/static/vendor/rickshaw/vendor/d3.layout.min.js
+share/prometheus/static/vendor/rickshaw/vendor/d3.v3.js
+share/prometheus/templates/_base.html
+share/prometheus/templates/alerts.html
+share/prometheus/templates/config.html
+share/prometheus/templates/flags.html
+share/prometheus/templates/graph.html
+share/prometheus/templates/rules.html
+share/prometheus/templates/service-discovery.html
+share/prometheus/templates/status.html
+share/prometheus/templates/targets.html

Index: pkgsrc/databases/prometheus/distinfo
diff -u pkgsrc/databases/prometheus/distinfo:1.7 pkgsrc/databases/prometheus/distinfo:1.8
--- pkgsrc/databases/prometheus/distinfo:1.7    Thu Nov 28 06:44:12 2019
+++ pkgsrc/databases/prometheus/distinfo        Wed Jan  8 22:33:05 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2019/11/28 06:44:12 adam Exp $
+$NetBSD: distinfo,v 1.8 2020/01/08 22:33:05 adam Exp $
 
-SHA1 (prometheus-2.14.0.tar.gz) = 1aac259ad55d4882da81cc00d797db15c64a00a3
-RMD160 (prometheus-2.14.0.tar.gz) = 22f7a8eff328b7ac6c1788fb0662f5b67c241b12
-SHA512 (prometheus-2.14.0.tar.gz) = 077d83ef06a6ef77b6aa0d47ef0aa276f50b89c818f6cbe0163a4167d0ceb7fbcaf828a6341ba91cde303a0c6c7e2440de99ea0500a48a9059adb37a34a78a7a
-Size (prometheus-2.14.0.tar.gz) = 12755125 bytes
+SHA1 (prometheus-2.15.2.tar.gz) = 0e17ab634683b9495ec93fbd5265d7b538050b7a
+RMD160 (prometheus-2.15.2.tar.gz) = e6c1c4f380711cd4a3c73bf5ededed4be17c8109
+SHA512 (prometheus-2.15.2.tar.gz) = a444acd9b18aa3d62eab8e5807ef0cfee44165e1b80a979f61c42c99d104ad2a1991729704e5ae7423b881bc247de6f42eb2682c23e41cbbc31da58ad4e9b169
+Size (prometheus-2.15.2.tar.gz) = 12852804 bytes
 SHA1 (patch-cmd_prometheus_main.go) = b3f3f8872ad19f823424009090fdf4705e7af257
+SHA1 (patch-web_ui_ui.go) = e940f49f6f3dddf2d3bbae18a18f3b5411e68c11

Added files:

Index: pkgsrc/databases/prometheus/patches/patch-web_ui_ui.go
diff -u /dev/null pkgsrc/databases/prometheus/patches/patch-web_ui_ui.go:1.1
--- /dev/null   Wed Jan  8 22:33:05 2020
+++ pkgsrc/databases/prometheus/patches/patch-web_ui_ui.go      Wed Jan  8 22:33:05 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-web_ui_ui.go,v 1.1 2020/01/08 22:33:05 adam Exp $
+
+Use absolute path for web files.
+
+--- web/ui/ui.go.orig  2020-01-08 22:04:44.000000000 +0000
++++ web/ui/ui.go
+@@ -27,22 +27,7 @@ import (
+ 
+ // Assets contains the project's assets.
+ var Assets http.FileSystem = func() http.FileSystem {
+-      wd, err := os.Getwd()
+-      if err != nil {
+-              panic(err)
+-      }
+-      var assetsPrefix string
+-      switch path.Base(wd) {
+-      case "prometheus":
+-              // When running Prometheus (without built-in assets) from the repo root.
+-              assetsPrefix = "./web/ui"
+-      case "web":
+-              // When running web tests.
+-              assetsPrefix = "./ui"
+-      case "ui":
+-              // When generating statically compiled-in assets.
+-              assetsPrefix = "./"
+-      }
++      var assetsPrefix string = "@WEBUI_DIR@"
+ 
+       static := filter.Keep(
+               http.Dir(path.Join(assetsPrefix, "static")),

Prev by Date: CVS commit: pkgsrc/lang/nodejs
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/nodejs
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index