ports/contrib (3.6): prometheus: -> 2.35.0; work around a race condition, rc now drops root rights
commit 516c3e8fc8139aeab9e9c79d87a939d9a3ff5627 Author: Tim Biermann <tbier@posteo.de> Date: Thu Apr 28 19:49:35 2022 +0200 prometheus: -> 2.35.0; work around a race condition, rc now drops root rights diff --git a/prometheus/.footprint b/prometheus/.footprint index 78bb5154a..5c1f75b07 100644 --- a/prometheus/.footprint +++ b/prometheus/.footprint @@ -2,18 +2,7 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/conf.d/ -rw-r--r-- root/root etc/conf.d/prometheus drwxr-xr-x root/root etc/prometheus/ -drwxr-xr-x root/root etc/prometheus/console_libraries/ --rw-r--r-- root/root etc/prometheus/console_libraries/menu.lib --rw-r--r-- root/root etc/prometheus/console_libraries/prom.lib -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/prometheus.html --rw-r--r-- root/root etc/prometheus/prometheus.yml +-rw-r----- root/prometheus etc/prometheus/prometheus.yml drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/prometheus drwxr-xr-x root/root usr/ @@ -27,92 +16,158 @@ drwxr-xr-x root/root usr/share/prometheus/web/ui/ drwxr-xr-x root/root usr/share/prometheus/web/ui/static/ drwxr-xr-x root/root usr/share/prometheus/web/ui/static/css/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/css/prom_console.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/css/prom_console.css.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/js/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/js/prom_console.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/js/prom_console.js.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/react/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/asset-manifest.json +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/asset-manifest.json.gz -rwxr-xr-x root/root usr/share/prometheus/web/ui/static/react/favicon.ico +-rwxr-xr-x root/root usr/share/prometheus/web/ui/static/react/favicon.ico.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/index.html +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/index.html.gz -rwxr-xr-x root/root usr/share/prometheus/web/ui/static/react/manifest.json +-rwxr-xr-x root/root usr/share/prometheus/web/ui/static/react/manifest.json.gz 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/main.faad45b4.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/css/main.faad45b4.css.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/css/main.faad45b4.css.map +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/css/main.faad45b4.css.map.gz 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/main.b0a7c7cf.js -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.LICENSE.txt +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.LICENSE.txt.gz +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.map +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/js/main.b0a7c7cf.js.map.gz 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.b3726f0165bf67ac6849.ttf +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/media/codicon.b3726f0165bf67ac6849.ttf.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/media/index.cd351d7c31d0d3fccf96.cjs +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/media/index.cd351d7c31d0d3fccf96.cjs.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/media/prometheus_logo_grey.3cf697e5443028ca5e5255b93c7906c5.svg +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/react/static/media/prometheus_logo_grey.3cf697e5443028ca5e5255b93c7906c5.svg.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/ 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-grid.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css.gz -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.css.map.gz -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.gz -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-grid.min.css.map.gz -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.gz -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.css.map.gz -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.gz -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-reboot.min.css.map.gz -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.gz -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.css.map.gz -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.gz -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.min.css.map.gz 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.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.js.map +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.js.map.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.min.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.min.js.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.min.js.map +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.bundle.min.js.map.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.js.gz -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.js.map.gz -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.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.min.js.map +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap-4.5.2/js/bootstrap.min.js.map.gz 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 +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.css.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/ drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.eot +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.eot.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.svg +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.svg.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.ttf +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.ttf.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff2 +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff2.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.eot +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.eot.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.svg +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.svg.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.ttf +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.ttf.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff2 +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff2.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.eot +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.eot.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.svg +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.svg.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.ttf +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.ttf.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff2 +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff2.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css.gz 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-3.5.1.min.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/js/jquery-3.5.1.min.js.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/js/jquery.hotkeys.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/js/jquery.hotkeys.js.gz -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/jquery.selection.js.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/js/popper.min.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/js/popper.min.js.gz drwxr-xr-x root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/ -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/rickshaw.min.css +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/rickshaw.min.css.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/rickshaw.min.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/rickshaw.min.js.gz 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.layout.min.js.gz -rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/vendor/d3.v3.js +-rw-r--r-- root/root usr/share/prometheus/web/ui/static/vendor/rickshaw/vendor/d3.v3.js.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ -drwxr-xr-x root/root var/lib/prometheus/ -drw-r--r-- root/root var/lib/prometheus/data/ +drwxr-x--- prometheus/prometheus var/lib/prometheus/ diff --git a/prometheus/.signature b/prometheus/.signature index f9be44530..b7bbe47b0 100644 --- a/prometheus/.signature +++ b/prometheus/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39TpMnOmr/AA2eOK8PRavM2PXKeYB63Ix8HRF10d179D96hT8LkvAHla5QKRHG/72A+xN5KtydqbVL9y+o/MAQs= -SHA256 (Pkgfile) = d1117b1b90676991603f800fb73b6416b48dfae8935e03434a641ffa5d8bed94 -SHA256 (.footprint) = 3d085d00c3c68e2468530455b916dc6b2ae87bd2919ae329695916c781df8b7d +RWSagIOpLGJF35fmdX0hlvzlhsx/mxUPsA/liyD2hDw2Jm7RZZ5BQ0sg9B+S4OGr8pfsj40kAJ0pNo31aSPs1NHAU/Z3kdCxdgo= +SHA256 (Pkgfile) = 37ded40b3520e1cbc01697e817d846cd6109778788eb73c979f833b418ab6abe +SHA256 (.footprint) = 3d03464d398ed1c44ffea712f75e0b6771f7794592e4723259f673660d711b39 SHA256 (prometheus-2.35.0.tar.gz) = 5264a7b59f5b9e28d3c47bf694a1062e6d3745c3797d28585c2b44eb9d72da1f SHA256 (prometheus.conf) = b3a7924e380f4f78fa6016bde9c7ca55778a46a440ffd00f4cf8c0d1327fc9ec -SHA256 (prometheus.service) = c212b4a1f6a0e2f376254272304b29eb56cd7ba18f3819c0bbf3a3cf8e4a37f0 +SHA256 (prometheus.service) = 1745bbbccd3926a09ea5980d2a4fe15e4165544993c5548dd6d14e518c75c8f4 diff --git a/prometheus/Pkgfile b/prometheus/Pkgfile index 465d269f4..d7efb90b8 100644 --- a/prometheus/Pkgfile +++ b/prometheus/Pkgfile @@ -1,20 +1,17 @@ # 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 typescript yamllint yarn +# Depends on: go typescript yamllint yarn name=prometheus version=2.35.0 -release=1 +release=2 source=(https://github.com/prometheus/prometheus/archive/v$version/$name-$version.ta... prometheus.conf prometheus.service) build() { # setup build env {{{ ## Node Setup - #export NODE_ENV=production - #[ ! -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" @@ -28,69 +25,23 @@ build() { mkdir "$PKGMK_SOURCE_DIR/gopath" || true export GOPATH="$PKGMK_SOURCE_DIR/gopath" - 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 + LDFLAGS="-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)" # }}} cd $name-$version - pushd web/ui - GOOS= GOARCH= go generate -x -v - popd - make ui-install - make assets - - go build \ - -trimpath \ - -buildmode=pie \ - -mod=readonly \ - -modcacherw \ - -ldflags "$GOLDFLAGS" \ - ./cmd/prometheus - - go build \ - -trimpath \ - -buildmode=pie \ - -mod=readonly \ - -modcacherw \ - -ldflags "$GOLDFLAGS" \ - ./cmd/promtool + make build -j1 - # install install -Dm755 -t $PKG/usr/bin prometheus promtool - - install -Dm644 $SRC/prometheus.conf \ - $PKG/etc/conf.d/prometheus - install -dm644 $PKG/var/lib/prometheus/data - - install -Dm644 -t $PKG/etc/prometheus \ - documentation/examples/prometheus.yml - - mkdir -p $PKG/etc/prometheus/console_libraries - for file in console_libraries/* - do - install -Dm644 -t $PKG/etc/prometheus/console_libraries/ $file - done - - mkdir -p $PKG/etc/prometheus/consoles - for file in consoles/* - do - install -Dm644 -t $PKG/etc/prometheus/consoles/ $file - done - + install -Dm640 -g prometheus -t $PKG/etc/prometheus documentation/examples/prometheus.yml + install -dm750 -o prometheus -g prometheus $PKG/var/lib/prometheus install -dm755 $PKG/usr/share/prometheus/web/ui cp -R web/ui/static $PKG/usr/share/prometheus/web/ui/ - install -Dm644 $SRC/prometheus.conf $PKG/etc/conf.d/prometheus - ## install rc file + install -Dm644 $SRC/prometheus.conf $PKG/etc/conf.d/prometheus install -Dm 755 $SRC/prometheus.service $PKG/etc/rc.d/prometheus } diff --git a/prometheus/pre-install b/prometheus/pre-install new file mode 100755 index 000000000..5d9fe52a7 --- /dev/null +++ b/prometheus/pre-install @@ -0,0 +1,9 @@ +#!/bin/sh -e + +_USER=prometheus +_HOME=/var/lib/prometheus +_GROUP=prometheus + +/usr/bin/getent group $_GROUP > /dev/null 2>&1 || /usr/sbin/groupadd $_GROUP +/usr/bin/getent passwd $_USER > /dev/null 2>&1 || /usr/sbin/useradd -c 'prometheus system user' -g $_GROUP -d $_HOME -s /bin/false $_USER +passwd -l $_USER > /dev/null diff --git a/prometheus/prometheus.service b/prometheus/prometheus.service index 2c14c1511..808462893 100755 --- a/prometheus/prometheus.service +++ b/prometheus/prometheus.service @@ -6,30 +6,32 @@ SSD=/sbin/start-stop-daemon PROG=/usr/bin/prometheus OPTS="--config.file=/etc/prometheus/prometheus.yml --web.listen-address=":9191"" +USER=prometheus +WORKING_DIR=/var/lib/prometheus/ case $1 in -start) - $SSD --start -b --exec $PROG -- $OPTS - ;; -stop) - $SSD --stop --retry 10 --exec $PROG - ;; -restart) - $0 stop - $0 start - ;; -status) - $SSD --status --exec $PROG - case $? in - 0) echo "$PROG is running with pid $(pidof $PROG)" ;; - 1) echo "$PROG is not running but the pid file $PID exists" ;; - 3) echo "$PROG is not running" ;; - 4) echo "Unable to determine the program status" ;; - esac - ;; -*) - echo "usage: $0 [start|stop|restart|status]" - ;; + start) + $SSD --start --chuid $USER --chdir $WORKING_DIR --background --exec $PROG -- $OPTS + ;; + stop) + $SSD --stop --retry 10 --exec $PROG + ;; + restart) + $0 stop + $0 start + ;; + status) + $SSD --status --exec $PROG + case $? in + 0) echo "$PROG is running with pid $(pidof $PROG)" ;; + 1) echo "$PROG is not running but the pid file $PID exists" ;; + 3) echo "$PROG is not running" ;; + 4) echo "Unable to determine the program status" ;; + esac + ;; + *) + echo "usage: $0 [start|stop|restart|status]" + ;; esac # End of file
participants (1)
-
crux@crux.nu