[arch-commits] Commit in prometheus/repos/extra-x86_64 (8 files)
Jelle van der Waa
jelle at gemini.archlinux.org
Sat Nov 6 11:00:33 UTC 2021
Date: Saturday, November 6, 2021 @ 11:00:33
Author: jelle
Revision: 427408
archrelease: copy trunk to extra-x86_64
Added:
prometheus/repos/extra-x86_64/PKGBUILD
(from rev 427407, prometheus/trunk/PKGBUILD)
prometheus/repos/extra-x86_64/prometheus.conf
(from rev 427407, prometheus/trunk/prometheus.conf)
prometheus/repos/extra-x86_64/prometheus.service
(from rev 427407, prometheus/trunk/prometheus.service)
prometheus/repos/extra-x86_64/prometheus.sysusers
(from rev 427407, prometheus/trunk/prometheus.sysusers)
Deleted:
prometheus/repos/extra-x86_64/PKGBUILD
prometheus/repos/extra-x86_64/prometheus.conf
prometheus/repos/extra-x86_64/prometheus.service
prometheus/repos/extra-x86_64/prometheus.sysusers
---------------------+
PKGBUILD | 182 +++++++++++++++++++++++++-------------------------
prometheus.conf | 2
prometheus.service | 60 ++++++++--------
prometheus.sysusers | 2
4 files changed, 124 insertions(+), 122 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-11-06 11:00:21 UTC (rev 427407)
+++ PKGBUILD 2021-11-06 11:00:33 UTC (rev 427408)
@@ -1,90 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-
-pkgname=prometheus
-pkgver=2.30.3
-pkgrel=1
-
-pkgdesc='An open-source systems monitoring and alerting toolkit'
-url='https://prometheus.io'
-arch=('x86_64')
-license=('Apache')
-
-depends=('glibc')
-makedepends=('go' 'git' 'npm' 'nodejs')
-
-backup=('etc/prometheus/prometheus.yml' 'etc/conf.d/prometheus')
-
-source=("prometheus-v$pkgver.tar.gz::https://github.com/prometheus/prometheus/archive/v$pkgver.tar.gz"
- prometheus.service
- prometheus.sysusers
- prometheus.conf)
-
-sha256sums=('66a835096e717c11db2ecb5f948c6346868fa1f877196ee2237fb4630df97c06'
- 'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f'
- '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f'
- '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070')
-
-build() {
- cd prometheus-$pkgver
-
- LDFLAGS="-extldflags $LDFLAGS \
- -X github.com/prometheus/common/version.Version=$pkgver \
- -X github.com/prometheus/common/version.Revision=$pkgver \
- -X github.com/prometheus/common/version.Branch=tarball \
- -X github.com/prometheus/common/version.BuildUser=someone at builder \
- -X github.com/prometheus/common/version.BuildDate=$(date -u '+%Y%m%d-%H:%M:%S' --date=@${SOURCE_DATE_EPOCH})"
-
- # The makefile seems to not be able to execute npm properly, so run the make assets target manually
- cd web/ui/module/codemirror-promql
- npm install
- npm run build
-
- cd $srcdir/prometheus-$pkgver/web/ui
- GOOS= GOARCH= go generate -x -v
-
- cd $srcdir/prometheus-$pkgver
- # Build the react app, normally a part of the assets target
- make web/ui/static/react
-
- go build \
- -trimpath \
- -buildmode=pie \
- -mod=readonly \
- -modcacherw \
- -ldflags "-linkmode external $LDFLAGS" \
- ./cmd/prometheus
- go build \
- -trimpath \
- -buildmode=pie \
- -mod=readonly \
- -modcacherw \
- -ldflags "-linkmode external $LDFLAGS" \
- ./cmd/promtool
-}
-
-check() {
- cd prometheus-$pkgver
-
- go test -short ./...
-}
-
-package() {
- install -Dm644 prometheus.service "$pkgdir"/usr/lib/systemd/system/prometheus.service
- install -Dm644 prometheus.sysusers "$pkgdir"/usr/lib/sysusers.d/prometheus.conf
- install -Dm644 prometheus.conf "${pkgdir}"/etc/conf.d/prometheus
-
- cd prometheus-$pkgver
-
- install -Dm755 -t "$pkgdir"/usr/bin prometheus promtool
- install -Dm640 -g210 -t "$pkgdir"/etc/prometheus documentation/examples/prometheus.yml
- install -dm750 -o210 -g210 "$pkgdir"/var/lib/prometheus
-
- # Web
- install -dm755 "$pkgdir"/usr/share/prometheus/web/ui
- cp -R web/ui/{static,templates} "$pkgdir"/usr/share/prometheus/web/ui/
-
- # Examples
- install -Dm644 -t "$pkgdir"/usr/share/doc/prometheus/examples documentation/examples/prometheus*.yml
- cp -R consoles console_libraries "$pkgdir"/usr/share/doc/prometheus/examples
-
-}
Copied: prometheus/repos/extra-x86_64/PKGBUILD (from rev 427407, prometheus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-11-06 11:00:33 UTC (rev 427408)
@@ -0,0 +1,92 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+
+pkgname=prometheus
+pkgver=2.31.1
+pkgrel=1
+
+pkgdesc='An open-source systems monitoring and alerting toolkit'
+url='https://prometheus.io'
+arch=('x86_64')
+license=('Apache')
+
+depends=('glibc')
+makedepends=('go' 'git' 'npm' 'nodejs' 'yamllint')
+
+backup=('etc/prometheus/prometheus.yml' 'etc/conf.d/prometheus')
+
+source=("prometheus-v$pkgver.tar.gz::https://github.com/prometheus/prometheus/archive/v$pkgver.tar.gz"
+ prometheus.service
+ prometheus.sysusers
+ prometheus.conf)
+
+sha256sums=('869a8be315721115be628f766ec3ff71aa50f1a027cee776ea54d7ba070a5026'
+ 'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f'
+ '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f'
+ '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070')
+
+build() {
+ cd prometheus-$pkgver
+
+ LDFLAGS="-extldflags $LDFLAGS \
+ -X github.com/prometheus/common/version.Version=$pkgver \
+ -X github.com/prometheus/common/version.Revision=$pkgver \
+ -X github.com/prometheus/common/version.Branch=tarball \
+ -X github.com/prometheus/common/version.BuildUser=someone at builder \
+ -X github.com/prometheus/common/version.BuildDate=$(date -u '+%Y%m%d-%H:%M:%S' --date=@${SOURCE_DATE_EPOCH})"
+
+ # The makefile seems to not be able to execute npm properly, so run the make assets target manually
+ cd web/ui/module/codemirror-promql
+ npm install
+ npm run build
+
+ cd $srcdir/prometheus-$pkgver/web/ui
+ GOOS= GOARCH= go generate -x -v
+
+ cd $srcdir/prometheus-$pkgver
+ # Build the react app, normally a part of the assets target
+#make web/ui/static/react
+ make ui-install
+ make ui-build
+
+ go build \
+ -trimpath \
+ -buildmode=pie \
+ -mod=readonly \
+ -modcacherw \
+ -ldflags "-linkmode external $LDFLAGS" \
+ ./cmd/prometheus
+ go build \
+ -trimpath \
+ -buildmode=pie \
+ -mod=readonly \
+ -modcacherw \
+ -ldflags "-linkmode external $LDFLAGS" \
+ ./cmd/promtool
+}
+
+check() {
+ cd prometheus-$pkgver
+
+ go test -short ./...
+}
+
+package() {
+ install -Dm644 prometheus.service "$pkgdir"/usr/lib/systemd/system/prometheus.service
+ install -Dm644 prometheus.sysusers "$pkgdir"/usr/lib/sysusers.d/prometheus.conf
+ install -Dm644 prometheus.conf "${pkgdir}"/etc/conf.d/prometheus
+
+ cd prometheus-$pkgver
+
+ install -Dm755 -t "$pkgdir"/usr/bin prometheus promtool
+ install -Dm640 -g210 -t "$pkgdir"/etc/prometheus documentation/examples/prometheus.yml
+ install -dm750 -o210 -g210 "$pkgdir"/var/lib/prometheus
+
+ # Web
+ install -dm755 "$pkgdir"/usr/share/prometheus/web/ui
+ cp -R web/ui/{static,templates} "$pkgdir"/usr/share/prometheus/web/ui/
+
+ # Examples
+ install -Dm644 -t "$pkgdir"/usr/share/doc/prometheus/examples documentation/examples/prometheus*.yml
+ cp -R consoles console_libraries "$pkgdir"/usr/share/doc/prometheus/examples
+
+}
Deleted: prometheus.conf
===================================================================
--- prometheus.conf 2021-11-06 11:00:21 UTC (rev 427407)
+++ prometheus.conf 2021-11-06 11:00:33 UTC (rev 427408)
@@ -1 +0,0 @@
-PROMETHEUS_ARGS=""
Copied: prometheus/repos/extra-x86_64/prometheus.conf (from rev 427407, prometheus/trunk/prometheus.conf)
===================================================================
--- prometheus.conf (rev 0)
+++ prometheus.conf 2021-11-06 11:00:33 UTC (rev 427408)
@@ -0,0 +1 @@
+PROMETHEUS_ARGS=""
Deleted: prometheus.service
===================================================================
--- prometheus.service 2021-11-06 11:00:21 UTC (rev 427407)
+++ prometheus.service 2021-11-06 11:00:33 UTC (rev 427408)
@@ -1,30 +0,0 @@
-[Unit]
-Description=Prometheus service
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=prometheus
-Group=prometheus
-Restart=on-failure
-WorkingDirectory=/usr/share/prometheus
-EnvironmentFile=-/etc/conf.d/prometheus
-ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data $PROMETHEUS_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-LimitNOFILE=65535
-NoNewPrivileges=true
-ProtectHome=true
-ProtectSystem=full
-ProtectHostname=true
-ProtectControlGroups=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-LockPersonality=true
-RestrictRealtime=yes
-RestrictNamespaces=yes
-MemoryDenyWriteExecute=yes
-PrivateDevices=yes
-CapabilityBoundingSet=
-
-[Install]
-WantedBy=multi-user.target
Copied: prometheus/repos/extra-x86_64/prometheus.service (from rev 427407, prometheus/trunk/prometheus.service)
===================================================================
--- prometheus.service (rev 0)
+++ prometheus.service 2021-11-06 11:00:33 UTC (rev 427408)
@@ -0,0 +1,30 @@
+[Unit]
+Description=Prometheus service
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=prometheus
+Group=prometheus
+Restart=on-failure
+WorkingDirectory=/usr/share/prometheus
+EnvironmentFile=-/etc/conf.d/prometheus
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data $PROMETHEUS_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+LimitNOFILE=65535
+NoNewPrivileges=true
+ProtectHome=true
+ProtectSystem=full
+ProtectHostname=true
+ProtectControlGroups=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+LockPersonality=true
+RestrictRealtime=yes
+RestrictNamespaces=yes
+MemoryDenyWriteExecute=yes
+PrivateDevices=yes
+CapabilityBoundingSet=
+
+[Install]
+WantedBy=multi-user.target
Deleted: prometheus.sysusers
===================================================================
--- prometheus.sysusers 2021-11-06 11:00:21 UTC (rev 427407)
+++ prometheus.sysusers 2021-11-06 11:00:33 UTC (rev 427408)
@@ -1 +0,0 @@
-u prometheus 210 "Prometheus dedicated user"
Copied: prometheus/repos/extra-x86_64/prometheus.sysusers (from rev 427407, prometheus/trunk/prometheus.sysusers)
===================================================================
--- prometheus.sysusers (rev 0)
+++ prometheus.sysusers 2021-11-06 11:00:33 UTC (rev 427408)
@@ -0,0 +1 @@
+u prometheus 210 "Prometheus dedicated user"
More information about the arch-commits
mailing list