prometheus: 2.30.3 -> 2.31.1

4 files changed, 45 insertions, 47 deletions

diff --git a/prometheus/.footprint b/prometheus/.footprint
index 1b722e84d..1138ab2fe 100644
--- a/prometheus/.footprint
+++ b/prometheus/.footprint
@@ -9,10 +9,10 @@ drwxr-xr-x	root/root	etc/prometheus/consoles/
 -rw-r--r--	root/root	etc/prometheus/consoles/index.html.example
 -rw-r--r--	root/root	etc/prometheus/consoles/node-cpu.html
 -rw-r--r--	root/root	etc/prometheus/consoles/node-disk.html
--rw-r--r--	root/root	etc/prometheus/consoles/node-overview.html
 -rw-r--r--	root/root	etc/prometheus/consoles/node.html
--rw-r--r--	root/root	etc/prometheus/consoles/prometheus-overview.html
+-rw-r--r--	root/root	etc/prometheus/consoles/node-overview.html
 -rw-r--r--	root/root	etc/prometheus/consoles/prometheus.html
+-rw-r--r--	root/root	etc/prometheus/consoles/prometheus-overview.html
 -rw-r--r--	root/root	etc/prometheus/prometheus.yml
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/prometheus
@@ -53,33 +53,35 @@ drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/css/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/2.cede384b.chunk.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/2.cede384b.chunk.css.map
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.5e424735.chunk.css
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.5e424735.chunk.css.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.ddf8afd6.chunk.css
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/css/main.ddf8afd6.chunk.css.map
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/js/
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.0eb756ee.chunk.js
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.0eb756ee.chunk.js.LICENSE.txt
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.0eb756ee.chunk.js.map
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.1ffb7e4c.chunk.js
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.1ffb7e4c.chunk.js.map
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/runtime-main.26e9e2c9.js
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/runtime-main.26e9e2c9.js.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.680b6485.chunk.js
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.680b6485.chunk.js.LICENSE.txt
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/2.680b6485.chunk.js.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.0b169d67.chunk.js
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/main.0b169d67.chunk.js.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/runtime-main.9b474c39.js
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/js/runtime-main.9b474c39.js.map
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/react/static/media/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/react/static/media/codicon.b3726f01.ttf
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/
+drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap3-typeahead/
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.css
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.css.map
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css.map
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.min.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.min.css.map
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.min.css
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.min.css.map
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-reboot.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-reboot.css.map
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-reboot.min.css
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-reboot.min.css.map
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.css
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.css.map
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.min.css
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap.min.css.map
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.js
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.js.map
@@ -89,8 +91,6 @@ drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/j
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.js.map
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.min.js
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.min.js.map
-drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap3-typeahead/
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/css/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.css
@@ -133,8 +133,8 @@ drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/js/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/js/jquery.selection.js
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/js/popper.min.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/moment/
--rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/moment/moment-timezone-with-data.min.js
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/moment/moment.min.js
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/moment/moment-timezone-with-data.min.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/mustache/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/mustache/mustache.min.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/rickshaw/
@@ -144,8 +144,8 @@ drwxr-xr-x	root/root	usr/share/prometheus/web/ui/static/vendor/rickshaw/vendor/
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/rickshaw/vendor/d3.layout.min.js
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/static/vendor/rickshaw/vendor/d3.v3.js
 drwxr-xr-x	root/root	usr/share/prometheus/web/ui/templates/
--rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/_base.html
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/alerts.html
+-rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/_base.html
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/config.html
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/flags.html
 -rw-r--r--	root/root	usr/share/prometheus/web/ui/templates/graph.html
diff --git a/prometheus/.signature b/prometheus/.signature
index ca3ece658..dce2597d6 100644
--- a/prometheus/.signature
+++ b/prometheus/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/hx4Pi1lB4MQR5ic0JXfESOgbF4HNp4TI9K/+mk6ED8Np+JoKiRBIf0dkq5xnJB+hcqnLPqZhi70epyGrOLCgk=
-SHA256 (Pkgfile) = 078009e5f4e5db9fac15485ee9c822e0c401d2ff26f1d209ebf28056cf9a2f2b
-SHA256 (.footprint) = 6db7dccf2cc2a355201364bbe8d29f483c3da6d760171902c633077fa3c0cf63
-SHA256 (prometheus-2.30.3.tar.gz) = 66a835096e717c11db2ecb5f948c6346868fa1f877196ee2237fb4630df97c06
+RWSagIOpLGJF33oQX0WmioNLpXLMrdoIwqmq2LXUAORbENHwkFeNbEx5Wb/xl//u5scitVcB5OFkuI8lekdYTb0Uanjy+DgDdw4=
+SHA256 (Pkgfile) = 9bcc058b0b5cd22deb188569c6f8a668f0bacdcf0f0998a67cb8318715c589bc
+SHA256 (.footprint) = 70414d56c3612f0ed9839e83053b968ada3beafe9fa4f27adc08616ca3aa8274
+SHA256 (prometheus-2.31.1.tar.gz) = 869a8be315721115be628f766ec3ff71aa50f1a027cee776ea54d7ba070a5026
 SHA256 (prometheus.conf) = b3a7924e380f4f78fa6016bde9c7ca55778a46a440ffd00f4cf8c0d1327fc9ec
-SHA256 (prometheus.service) = 1d232fa874a9903b446cb7bf6f9058f3871a9dec2859f2dd2c0040671de636fc
+SHA256 (prometheus.service) = c212b4a1f6a0e2f376254272304b29eb56cd7ba18f3819c0bbf3a3cf8e4a37f0
diff --git a/prometheus/Pkgfile b/prometheus/Pkgfile
index 530673eeb..bc3fdfadb 100644
--- a/prometheus/Pkgfile
+++ b/prometheus/Pkgfile
@@ -1,10 +1,10 @@
 # Description: an open-source systems monitoring and alerting toolkit
 # URL: https://prometheus.io
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: go npm yarn
+# Depends on: go npm
 
 name=prometheus
-version=2.30.3
+version=2.31.1
 release=1
 source=(https://github.com/prometheus/prometheus/archive/v$version/$name-$version.tar.gz
   prometheus.conf prometheus.service)
@@ -12,14 +12,15 @@ source=(https://github.com/prometheus/prometheus/archive/v$version/$name-$versio
 build() {
   # setup build env {{{
   export LC_ALL=C
+
+  ## Node Setup
   #export NODE_ENV=production
-  [ ! -d $PKGMK_SOURCE_DIR/yarn_cache ] && mkdir $PKGMK_SOURCE_DIR/yarn_cache
-  export YARN_CACHE_FOLDER=$PKGMK_SOURCE_DIR/yarn_cache
-  [ ! -d $PKGMK_SOURCE_DIR/npm_cache ] && mkdir $PKGMK_SOURCE_DIR/npm_cache
-  export npm_config_cache=$PKGMK_SOURCE_DIR/npm_cache
+  #[ ! -d $PKGMK_SOURCE_DIR/npm_cache ] && mkdir $PKGMK_SOURCE_DIR/npm_cache
+  #export npm_config_cache=$PKGMK_SOURCE_DIR/npm_cache
   export NPM_CONFIG_PREFIX="$SRC/npm"
   export PATH+=":$NPM_CONFIG_PREFIX/bin"
 
+  ## Go Setup
   export GOPATH="$SRC/gopath"
   export PATH+=":$GOPATH/bin"
   mkdir -p "$GOPATH/src/github.com/grafana/"
@@ -29,32 +30,30 @@ build() {
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
-  # }}}
-  cd $name-$version
-
-  cd web/ui/react-app
-  yarn --frozen-lockfile
-  yarn lint
-  cd ../../../
-  ./scripts/build_react_app.sh
-  cd web/ui
-  CGO_ENABLED=0 GOARCH= go generate -x -v
-
-  cd ../../
-  gofmt -w ./web/ui
 
   GOLDFLAGS="-X github.com/prometheus/common/version.Version=$version
     -X github.com/prometheus/common/version.Revision=CRUX
     -X github.com/prometheus/common/version.Branch=master
     -X github.com/prometheus/common/version.BuildUser=$USER@$HOSTNAME
     -X github.com/prometheus/common/version.BuildDate=$(date -u +%Y%m%d-%H:%M:%S)
-    "
+  "
 
   if [ -n $LDFLAGS ]; then
     # LDFLAGS (and only LDFLAGS) should be passed to -extldflags.
     GOLDFLAGS="$GOLDFLAGS -extldflags $LDFLAGS"
   fi
+  # }}}
+  cd $name-$version
+
+  cd web/ui
+  npm install
+  npm run build
+  npm run build:module
+  npm run lint
+  GOOS= GOARCH= go generate -x -v
+  cd ../..
 
+  gofmt -w ./web/ui
   go mod vendor
   go build \
     -trimpath \
@@ -67,7 +66,7 @@ build() {
     -mod=vendor \
     -ldflags "$GOLDFLAGS" \
     ./cmd/promtool
-
+  # install
   install -Dm755 -t $PKG/usr/bin prometheus promtool
 
   install -Dm644 $SRC/prometheus.conf \
@@ -89,7 +88,6 @@ build() {
     install -Dm644 -t $PKG/etc/prometheus/consoles/ $file
   done
 
-  ## web
   install -dm755 $PKG/usr/share/prometheus/web/ui
   cp -R web/ui/{static,templates} $PKG/usr/share/prometheus/web/ui/
   install -Dm644 $SRC/prometheus.conf $PKG/etc/conf.d/prometheus
diff --git a/prometheus/prometheus.service b/prometheus/prometheus.service
index b3f322e84..2c14c1511 100755
--- a/prometheus/prometheus.service
+++ b/prometheus/prometheus.service
@@ -5,7 +5,7 @@
 
 SSD=/sbin/start-stop-daemon
 PROG=/usr/bin/prometheus
-OPTS="--config.file=/etc/prometheus/prometheus.yml"
+OPTS="--config.file=/etc/prometheus/prometheus.yml --web.listen-address=":9191""
 
 case $1 in
 start)