[arch-commits] Commit in prometheus/repos/extra-x86_64 (9 files)
Jelle van der Waa
jelle at archlinux.org
Thu Apr 1 20:05:34 UTC 2021
Date: Thursday, April 1, 2021 @ 20:05:34
Author: jelle
Revision: 411405
archrelease: copy trunk to extra-x86_64
Added:
prometheus/repos/extra-x86_64/PKGBUILD
(from rev 411404, prometheus/trunk/PKGBUILD)
prometheus/repos/extra-x86_64/prometheus.conf
(from rev 411404, prometheus/trunk/prometheus.conf)
prometheus/repos/extra-x86_64/prometheus.service
(from rev 411404, prometheus/trunk/prometheus.service)
prometheus/repos/extra-x86_64/prometheus.sysusers
(from rev 411404, prometheus/trunk/prometheus.sysusers)
Deleted:
prometheus/repos/extra-x86_64/PKGBUILD
prometheus/repos/extra-x86_64/fix-test-suite-failure-go1.16.patch
prometheus/repos/extra-x86_64/prometheus.conf
prometheus/repos/extra-x86_64/prometheus.service
prometheus/repos/extra-x86_64/prometheus.sysusers
-------------------------------------+
PKGBUILD | 165 ++++++++++++++++------------------
fix-test-suite-failure-go1.16.patch | 71 --------------
prometheus.conf | 2
prometheus.service | 60 ++++++------
prometheus.sysusers | 2
5 files changed, 111 insertions(+), 189 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-01 20:05:24 UTC (rev 411404)
+++ PKGBUILD 2021-04-01 20:05:34 UTC (rev 411405)
@@ -1,86 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-
-pkgname=prometheus
-pkgver=2.25.2
-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' 'bzr' 'yarn')
-
-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
- fix-test-suite-failure-go1.16.patch::https://github.com/prometheus/prometheus/commit/8bf7bc68f1d678ea82c392f80486a62e7973720b.patch)
-
-sha256sums=('85f50c0cfb4db206a59d2c3301e02d685c3fe4b451b41ca943a4eb94935cf4d4'
- 'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f'
- '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f'
- '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070'
- 'a8adb5f0999db24f17e215571e1c809620a50e184f565137f48e9f57b06a7aca')
-
-prepare() {
- cd prometheus-$pkgver
- patch -Np1 -i ${srcdir}/fix-test-suite-failure-go1.16.patch
-}
-
-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 -d@"$SOURCE_DATE_EPOCH" +%Y%m%d-%H:%M:%S)"
-
- make assets
- 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 -dm755 -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 411404, prometheus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-01 20:05:34 UTC (rev 411405)
@@ -0,0 +1,79 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+
+pkgname=prometheus
+pkgver=2.26.0
+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' 'bzr' 'yarn')
+
+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=('d2f5187946198e8d0ef820fb4f7e360d3d1b40587c70f6b7061a3a73b6ce90ab'
+ '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 -d@"$SOURCE_DATE_EPOCH" +%Y%m%d-%H:%M:%S)"
+
+ make assets
+ 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 -dm755 -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: fix-test-suite-failure-go1.16.patch
===================================================================
--- fix-test-suite-failure-go1.16.patch 2021-04-01 20:05:24 UTC (rev 411404)
+++ fix-test-suite-failure-go1.16.patch 2021-04-01 20:05:34 UTC (rev 411405)
@@ -1,71 +0,0 @@
-From 8bf7bc68f1d678ea82c392f80486a62e7973720b Mon Sep 17 00:00:00 2001
-From: Bartlomiej Plotka <bwplotka at gmail.com>
-Date: Thu, 25 Feb 2021 10:08:12 +0100
-Subject: [PATCH] Fixed TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks for
- go1.16 (#8538)
-
-Fixes https://github.com/prometheus/prometheus/issues/8403
-
-Signed-off-by: Bartlomiej Plotka <bwplotka at gmail.com>
----
- tsdb/chunks/head_chunks.go | 4 +++-
- tsdb/chunks/head_chunks_test.go | 11 ++---------
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/tsdb/chunks/head_chunks.go b/tsdb/chunks/head_chunks.go
-index 051b9b1a89..d5386f7ea1 100644
---- a/tsdb/chunks/head_chunks.go
-+++ b/tsdb/chunks/head_chunks.go
-@@ -605,12 +605,14 @@ func (cdm *ChunkDiskMapper) IterateAllChunks(f func(seriesRef, chunkRef uint64,
- }
- }
- if allZeros {
-+ // End of segment chunk file content.
- break
- }
- return &CorruptionErr{
- Dir: cdm.dir.Name(),
- FileIndex: segID,
-- Err: errors.Errorf("head chunk file doesn't include enough bytes to read the chunk header - required:%v, available:%v, file:%d", idx+MaxHeadChunkMetaSize, fileEnd, segID),
-+ Err: errors.Errorf("head chunk file has some unread data, but doesn't include enough bytes to read the chunk header"+
-+ " - required:%v, available:%v, file:%d", idx+MaxHeadChunkMetaSize, fileEnd, segID),
- }
- }
- chkCRC32.Reset()
-diff --git a/tsdb/chunks/head_chunks_test.go b/tsdb/chunks/head_chunks_test.go
-index 43aa0484b4..3519439003 100644
---- a/tsdb/chunks/head_chunks_test.go
-+++ b/tsdb/chunks/head_chunks_test.go
-@@ -118,11 +118,6 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) {
- fileEnd := HeadChunkFileHeaderSize + len(expectedBytes)
- require.Equal(t, expectedBytes, actualBytes[HeadChunkFileHeaderSize:fileEnd])
-
-- // Test for the next chunk header to be all 0s. That marks the end of the file.
-- for _, b := range actualBytes[fileEnd : fileEnd+MaxHeadChunkMetaSize] {
-- require.Equal(t, byte(0), b)
-- }
--
- // Testing reading of chunks.
- for _, exp := range expectedData {
- actChunk, err := hrw.Chunk(exp.chunkRef)
-@@ -137,7 +132,7 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) {
- require.NoError(t, err)
-
- idx := 0
-- err = hrw.IterateAllChunks(func(seriesRef, chunkRef uint64, mint, maxt int64, numSamples uint16) error {
-+ require.NoError(t, hrw.IterateAllChunks(func(seriesRef, chunkRef uint64, mint, maxt int64, numSamples uint16) error {
- t.Helper()
-
- expData := expectedData[idx]
-@@ -153,10 +148,8 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) {
-
- idx++
- return nil
-- })
-- require.NoError(t, err)
-+ }))
- require.Equal(t, len(expectedData), idx)
--
- }
-
- // TestChunkDiskMapper_Truncate tests
Deleted: prometheus.conf
===================================================================
--- prometheus.conf 2021-04-01 20:05:24 UTC (rev 411404)
+++ prometheus.conf 2021-04-01 20:05:34 UTC (rev 411405)
@@ -1 +0,0 @@
-PROMETHEUS_ARGS=""
Copied: prometheus/repos/extra-x86_64/prometheus.conf (from rev 411404, prometheus/trunk/prometheus.conf)
===================================================================
--- prometheus.conf (rev 0)
+++ prometheus.conf 2021-04-01 20:05:34 UTC (rev 411405)
@@ -0,0 +1 @@
+PROMETHEUS_ARGS=""
Deleted: prometheus.service
===================================================================
--- prometheus.service 2021-04-01 20:05:24 UTC (rev 411404)
+++ prometheus.service 2021-04-01 20:05:34 UTC (rev 411405)
@@ -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 411404, prometheus/trunk/prometheus.service)
===================================================================
--- prometheus.service (rev 0)
+++ prometheus.service 2021-04-01 20:05:34 UTC (rev 411405)
@@ -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-04-01 20:05:24 UTC (rev 411404)
+++ prometheus.sysusers 2021-04-01 20:05:34 UTC (rev 411405)
@@ -1 +0,0 @@
-u prometheus 210 "Prometheus dedicated user"
Copied: prometheus/repos/extra-x86_64/prometheus.sysusers (from rev 411404, prometheus/trunk/prometheus.sysusers)
===================================================================
--- prometheus.sysusers (rev 0)
+++ prometheus.sysusers 2021-04-01 20:05:34 UTC (rev 411405)
@@ -0,0 +1 @@
+u prometheus 210 "Prometheus dedicated user"
More information about the arch-commits
mailing list