From 3f0a33246ab2a93ac9d5f1175169ea3d7612681c45f444bdb51fc700b4fc5709 Mon Sep 17 00:00:00 2001 From: Stefano Torresi Date: Fri, 28 May 2021 07:41:31 +0000 Subject: [PATCH] Accepting request 895359 from home:dmolkentin:infrarun - Refresh patches - Upgrade to upstream version 2.27.1 + Bugfix: * SECURITY: Fix arbitrary redirects under the /new endpoint (CVE-2021-29622) - Upgrade to upstream version 2.27.0 + Features: * Promtool: Retroactive rule evaluation functionality. #7675 * Configuration: Environment variable expansion for external labels. Behind --enable-feature=expand-external-labels flag. #8649 * TSDB: Add a flag(--storage.tsdb.max-block-chunk-segment-size) to control the max chunks file size of the blocks for small Prometheus instances. #8478 * UI: Add a dark theme. #8604 * AWS Lightsail Discovery: Add AWS Lightsail Discovery. #8693 * Docker Discovery: Add Docker Service Discovery. #8629 * OAuth: Allow OAuth 2.0 to be used anywhere an HTTP client is used. #8761 * Remote Write: Send exemplars via remote write. Experimental and disabled by default. #8296 + Enhancements: * Digital Ocean Discovery: Add __meta_digitalocean_vpc label. #8642 * Scaleway Discovery: Read Scaleway secret from a file. #8643 * Scrape: Add configurable limits for label size and count. #8777 * UI: Add 16w and 26w time range steps. #8656 * Templating: Enable parsing strings in humanize functions. #8682 + Bugfixes: * UI: Provide errors instead of blank page on TSDB Status Page. #8654 #8659 * TSDB: Do not panic when writing very large records to the WAL. #8790 * TSDB: Avoid panic when mmaped memory is referenced after the file is closed. #8723 * Scaleway Discovery: Fix nil pointer dereference. #8737 * Consul Discovery: Restart no longer required after config update with no targets. #8766 OBS-URL: https://build.opensuse.org/request/show/895359 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=43 --- ...-not-force-the-pure-Go-name-resolver.patch | 6 ++-- 0002-Default-settings.patch | 12 +++---- 0003-Add-Uyuni-service-discovery.patch | 29 ++++++++++------- _service | 2 +- golang-github-prometheus-prometheus.changes | 32 +++++++++++++++++++ golang-github-prometheus-prometheus.spec | 2 +- prometheus-2.26.0.tar.gz | 3 -- prometheus-2.27.1.tar.gz | 3 ++ vendor.tar.gz | 4 +-- 9 files changed, 66 insertions(+), 27 deletions(-) delete mode 100644 prometheus-2.26.0.tar.gz create mode 100644 prometheus-2.27.1.tar.gz diff --git a/0001-Do-not-force-the-pure-Go-name-resolver.patch b/0001-Do-not-force-the-pure-Go-name-resolver.patch index 1fd00b5..c0e539b 100644 --- a/0001-Do-not-force-the-pure-Go-name-resolver.patch +++ b/0001-Do-not-force-the-pure-Go-name-resolver.patch @@ -1,4 +1,4 @@ -From dca10001054ba4f61a8be3f4ef67223509a26683 Mon Sep 17 00:00:00 2001 +From 247610ea70657943fc50637380f27d262117cf8e Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 8 Feb 2019 09:17:06 +0100 Subject: [PATCH 1/3] Do not force the pure Go name resolver @@ -15,7 +15,7 @@ Signed-off-by: Jan Fajerski 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.promu.yml b/.promu.yml -index f52a646de..782f973a8 100644 +index f52a646de..23e662d11 100644 --- a/.promu.yml +++ b/.promu.yml @@ -10,7 +10,7 @@ build: @@ -28,5 +28,5 @@ index f52a646de..782f973a8 100644 -X github.com/prometheus/common/version.Version={{.Version}} -X github.com/prometheus/common/version.Revision={{.Revision}} -- -2.26.2 +2.31.1 diff --git a/0002-Default-settings.patch b/0002-Default-settings.patch index 1808347..1ed10a4 100644 --- a/0002-Default-settings.patch +++ b/0002-Default-settings.patch @@ -1,4 +1,4 @@ -From 7860b67a0a684d2d51087e323b780410031d83af Mon Sep 17 00:00:00 2001 +From f858a01d7d9ca8c28be8a9d6251e6dd7f0717272 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 8 Feb 2019 09:28:12 +0100 Subject: [PATCH 2/3] Default settings @@ -9,10 +9,10 @@ Signed-off-by: Jan Fajerski 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go -index 37a7f3535..ae43ded89 100644 +index 9fbd6e76b..6283c4057 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go -@@ -187,7 +187,7 @@ func main() { +@@ -191,7 +191,7 @@ func main() { a.HelpFlag.Short('h') a.Flag("config.file", "Prometheus configuration file path."). @@ -21,7 +21,7 @@ index 37a7f3535..ae43ded89 100644 a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry."). Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress) -@@ -219,10 +219,10 @@ func main() { +@@ -223,10 +223,10 @@ func main() { Default("false").BoolVar(&cfg.web.EnableAdminAPI) a.Flag("web.console.templates", "Path to the console template directory, available at /consoles."). @@ -34,7 +34,7 @@ index 37a7f3535..ae43ded89 100644 a.Flag("web.page-title", "Document title of Prometheus instance."). Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle) -@@ -231,7 +231,7 @@ func main() { +@@ -235,7 +235,7 @@ func main() { Default(".*").StringVar(&cfg.corsRegexString) a.Flag("storage.tsdb.path", "Base path for metrics storage."). @@ -44,5 +44,5 @@ index 37a7f3535..ae43ded89 100644 a.Flag("storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing."). Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration) -- -2.26.2 +2.31.1 diff --git a/0003-Add-Uyuni-service-discovery.patch b/0003-Add-Uyuni-service-discovery.patch index 7bf8800..d504d48 100644 --- a/0003-Add-Uyuni-service-discovery.patch +++ b/0003-Add-Uyuni-service-discovery.patch @@ -1,4 +1,4 @@ -From c19bd11c323a073a2c96f2e500de66320e3a627a Mon Sep 17 00:00:00 2001 +From 239bb9d32cb40409c8f2085700e85033f8642670 Mon Sep 17 00:00:00 2001 From: Joao Cavalheiro Date: Mon, 27 Jul 2020 17:42:33 +0200 Subject: [PATCH 3/3] Add Uyuni service discovery @@ -7,14 +7,14 @@ Subject: [PATCH 3/3] Add Uyuni service discovery discovery/install/install.go | 1 + discovery/uyuni/uyuni.go | 411 ++++++++++++++++++++++++++++++++++ discovery/uyuni/uyuni_test.go | 46 ++++ - go.mod | 1 + + go.mod | 3 +- go.sum | 2 + - 5 files changed, 461 insertions(+) + 5 files changed, 462 insertions(+), 1 deletion(-) create mode 100644 discovery/uyuni/uyuni.go create mode 100644 discovery/uyuni/uyuni_test.go diff --git a/discovery/install/install.go b/discovery/install/install.go -index 075a302e4..7cc2395bb 100644 +index 3e6f0f388..484d48db8 100644 --- a/discovery/install/install.go +++ b/discovery/install/install.go @@ -31,5 +31,6 @@ import ( @@ -494,22 +494,29 @@ index 000000000..c5fa8cc9e + } +} diff --git a/go.mod b/go.mod -index a4b7ff2a6..d347d7682 100644 +index dd22c9be7..b283af28a 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( - github.com/hetznercloud/hcloud-go v1.24.0 - github.com/influxdata/influxdb v1.8.4 - github.com/json-iterator/go v1.1.10 + github.com/hetznercloud/hcloud-go v1.25.0 + github.com/influxdata/influxdb v1.8.5 + github.com/json-iterator/go v1.1.11 + github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b github.com/miekg/dns v1.1.41 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect github.com/morikuni/aec v1.0.0 // indirect +@@ -110,4 +111,4 @@ exclude ( + k8s.io/client-go v8.0.0+incompatible + k8s.io/client-go v9.0.0+incompatible + k8s.io/client-go v9.0.0-invalid+incompatible +-) ++) +\ No newline at end of file diff --git a/go.sum b/go.sum -index d424276c8..e62734c2a 100644 +index 03a0abd29..e2fff275e 100644 --- a/go.sum +++ b/go.sum -@@ -552,6 +552,8 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 +@@ -556,6 +556,8 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -519,5 +526,5 @@ index d424276c8..e62734c2a 100644 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= -- -2.26.2 +2.31.1 diff --git a/_service b/_service index 64bfabc..f2a15ea 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v2.26.0 + v2.27.1 v(.*) diff --git a/golang-github-prometheus-prometheus.changes b/golang-github-prometheus-prometheus.changes index 7409418..124f48c 100644 --- a/golang-github-prometheus-prometheus.changes +++ b/golang-github-prometheus-prometheus.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed May 19 20:32:28 UTC 2021 - Daniel Molkentin + +- Refresh patches + +- Upgrade to upstream version 2.27.1 + + Bugfix: + * SECURITY: Fix arbitrary redirects under the /new endpoint (CVE-2021-29622) + +- Upgrade to upstream version 2.27.0 + + Features: + * Promtool: Retroactive rule evaluation functionality. #7675 + * Configuration: Environment variable expansion for external labels. Behind --enable-feature=expand-external-labels flag. #8649 + * TSDB: Add a flag(--storage.tsdb.max-block-chunk-segment-size) to control the max chunks file size of the blocks for small Prometheus instances. #8478 + * UI: Add a dark theme. #8604 + * AWS Lightsail Discovery: Add AWS Lightsail Discovery. #8693 + * Docker Discovery: Add Docker Service Discovery. #8629 + * OAuth: Allow OAuth 2.0 to be used anywhere an HTTP client is used. #8761 + * Remote Write: Send exemplars via remote write. Experimental and disabled by default. #8296 + + Enhancements: + * Digital Ocean Discovery: Add __meta_digitalocean_vpc label. #8642 + * Scaleway Discovery: Read Scaleway secret from a file. #8643 + * Scrape: Add configurable limits for label size and count. #8777 + * UI: Add 16w and 26w time range steps. #8656 + * Templating: Enable parsing strings in humanize functions. #8682 + + Bugfixes: + * UI: Provide errors instead of blank page on TSDB Status Page. #8654 #8659 + * TSDB: Do not panic when writing very large records to the WAL. #8790 + * TSDB: Avoid panic when mmaped memory is referenced after the file is closed. #8723 + * Scaleway Discovery: Fix nil pointer dereference. #8737 + * Consul Discovery: Restart no longer required after config update with no targets. #8766 + ------------------------------------------------------------------- Tue May 4 14:35:58 UTC 2021 - Witek Bedyk diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index fe19b38..ec25a1c 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -27,7 +27,7 @@ %endif Name: golang-github-prometheus-prometheus -Version: 2.26.0 +Version: 2.27.1 Release: 0 Summary: The Prometheus monitoring system and time series database License: Apache-2.0 diff --git a/prometheus-2.26.0.tar.gz b/prometheus-2.26.0.tar.gz deleted file mode 100644 index e30a709..0000000 --- a/prometheus-2.26.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d66c6169273f5dabccbc482a13103b635db73135c009f929c8351277aabc75e -size 62006663 diff --git a/prometheus-2.27.1.tar.gz b/prometheus-2.27.1.tar.gz new file mode 100644 index 0000000..2f16cf1 --- /dev/null +++ b/prometheus-2.27.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a59c4dff0498d000ba5806de9d19eb34da7d71d5a44a3681e6ccbd4199403c79 +size 78959947 diff --git a/vendor.tar.gz b/vendor.tar.gz index 4e1ac1b..ff61e07 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82c0d517e9ac1393040a2d5ddfdc5cf65100199137c5870c9309f5fbdaf39905 -size 18078140 +oid sha256:80645b109a2dbc6b994d5279e1291bfb5e6ba48212b1c13817c43618a2a1e35c +size 10485312