Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] prometheus: update to 2.55.1.
@ 2024-11-18  3:29 bryanasdev000
  2024-11-18  3:32 ` bryanasdev000
                   ` (47 more replies)
  0 siblings, 48 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-11-18  3:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

There is a new pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 2.55.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer is required for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 1215 bytes --]

From 981dac14d6143f68e5fb61e10057e93719d1420e Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH] prometheus: update to 2.55.1.

---
 srcpkgs/prometheus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..fd2939f095ff68 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=2.55.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=f48251f5c89eea6d3b43814499d558bacc4829265419ee69be49c5af98f79573
 
 system_accounts="_prometheus"
 

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
@ 2024-11-18  3:32 ` bryanasdev000
  2024-11-18  4:01 ` bryanasdev000
                   ` (46 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-11-18  3:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2481875098

Comment:
Also, a question, for the 3.x release, a separated packaged would be needed? 

Current release is 2.55.1, current LTS is 2.53.3, and now 3.0.0.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
  2024-11-18  3:32 ` bryanasdev000
@ 2024-11-18  4:01 ` bryanasdev000
  2024-11-22 19:04 ` bryanasdev000
                   ` (45 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-11-18  4:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2481875098

Comment:
Also, a question, for the 3.x release, a separated packaged would be needed? 

Current release is 3.0.0, previously  2.55.1, current LTS is 2.53.3.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
  2024-11-18  3:32 ` bryanasdev000
  2024-11-18  4:01 ` bryanasdev000
@ 2024-11-22 19:04 ` bryanasdev000
  2024-11-30  3:29 ` TinfoilSubmarine
                   ` (44 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-11-22 19:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2494586217

Comment:
Is possible to retry tests on i686?

Did not find an error.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (2 preceding siblings ...)
  2024-11-22 19:04 ` bryanasdev000
@ 2024-11-30  3:29 ` TinfoilSubmarine
  2024-11-30  8:42 ` bryanasdev000
                   ` (43 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-11-30  3:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2508811334

Comment:
> Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).

Are you sure this assumption is correct? The linked guide doesn't say anything about needing >=2.55 to upgrade to v3. It only says that >=2.55 is needed when downgrading from v3.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (3 preceding siblings ...)
  2024-11-30  3:29 ` TinfoilSubmarine
@ 2024-11-30  8:42 ` bryanasdev000
  2024-11-30 14:47 ` TinfoilSubmarine
                   ` (42 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-11-30  8:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2508889184

Comment:
> > Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).
> 
> Are you sure this assumption is correct? The linked guide doesn't say anything about needing >=2.55 to upgrade to v3. It only says that >=2.55 is needed when downgrading from v3.

Bad wording on my part, sorry.

AFAIK is not required to have 2.55 to upgrade (thought the two upgrades that I did, I was on 2.55), in this case I put it as "required" and the asked how to proceed in void packages because is a major upgrade, and as I have understood, there will be multiple versions being supported at the same time (at least 2, if I understood correctly, the 2.x LTS and 3.x now).

So in case things go wrong, users have a way to downgrade and recover.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (4 preceding siblings ...)
  2024-11-30  8:42 ` bryanasdev000
@ 2024-11-30 14:47 ` TinfoilSubmarine
  2024-12-01  1:00 ` bryanasdev000
                   ` (41 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-11-30 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 711 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2508984318

Comment:
>  as I have understood, there will be multiple versions being supported at the same time (at least 2, if I understood correctly, the 2.x LTS and 3.x now).
> 
> So in case things go wrong, users have a way to downgrade and recover.

LTS versions aren't always packaged, especially if there is no/minimal breakage. The `prometheus` package doesn't have any dependents so this is a good sign that IMO it could just be upgraded to v3 and not have to bifurcate into two packages.

Was there a specific reason you thought we would need both versions packaged?

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (5 preceding siblings ...)
  2024-11-30 14:47 ` TinfoilSubmarine
@ 2024-12-01  1:00 ` bryanasdev000
  2024-12-01 11:52 ` bryanasdev000
                   ` (40 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-01  1:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 820 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2509504516

Comment:
> > as I have understood, there will be multiple versions being supported at the same time (at least 2, if I understood correctly, the 2.x LTS and 3.x now).
> > So in case things go wrong, users have a way to downgrade and recover.
> 
> LTS versions aren't always packaged, especially if there is no/minimal breakage. The `prometheus` package doesn't have any dependents so this is a good sign that IMO it could just be upgraded to v3 and not have to bifurcate into two packages.
> 
> Was there a specific reason you thought we would need both versions packaged?

Only if the user wants to be in the LTS or if things goes wrong on the update.

Myself will use 3.x

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (6 preceding siblings ...)
  2024-12-01  1:00 ` bryanasdev000
@ 2024-12-01 11:52 ` bryanasdev000
  2024-12-02 14:07 ` TinfoilSubmarine
                   ` (39 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-01 11:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2509731536

Comment:
Built 3.0.1 locally and will see how it goes.

Need to fix consoles on 3.0.1 and understand why tests are failing for both, 2.55.1 and 3.0.1 if I rebase to master.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (7 preceding siblings ...)
  2024-12-01 11:52 ` bryanasdev000
@ 2024-12-02 14:07 ` TinfoilSubmarine
  2024-12-02 14:07 ` TinfoilSubmarine
                   ` (38 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-02 14:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2511640719

Comment:
[From the prometheus changelog:](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
> [CHANGE] Console: Remove example files for the console feature. Users can continue using the console feature by supplying their own JavaScript and templates. #14807

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (8 preceding siblings ...)
  2024-12-02 14:07 ` TinfoilSubmarine
@ 2024-12-02 14:07 ` TinfoilSubmarine
  2024-12-02 17:58 ` bryanasdev000
                   ` (37 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-02 14:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2511640719

Comment:
[From the prometheus changelog:](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
> [CHANGE] Console: Remove example files for the console feature. Users can continue using the console feature by supplying their own JavaScript and templates. #14807

So you can just remove those two lines:
```
        vcopy consoles etc/prometheus
        vcopy console_libraries etc/prometheus
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (9 preceding siblings ...)
  2024-12-02 14:07 ` TinfoilSubmarine
@ 2024-12-02 17:58 ` bryanasdev000
  2024-12-02 20:17 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (36 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-02 17:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2512294576

Comment:
> [From the prometheus changelog:](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
> 
> > [CHANGE] Console: Remove example files for the console feature. Users can continue using the console feature by supplying their own JavaScript and templates. #14807
> 
> So you can just remove those two lines:
> 
> ```
>         vcopy consoles etc/prometheus
>         vcopy console_libraries etc/prometheus
> ```

I saw this, but it looks like I tested the wrong container image as I swore I saw `/consoles/index.html.example` in 3.0.0.

Anyway, I'll delete these items, thanks.





^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 2.55.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (10 preceding siblings ...)
  2024-12-02 17:58 ` bryanasdev000
@ 2024-12-02 20:17 ` bryanasdev000
  2024-12-03 13:36 ` prometheus: update to 3.0.1 TinfoilSubmarine
                   ` (35 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-02 20:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 2.55.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 1601 bytes --]

From 93b7677b9f0eeb0c8ace9d69ff26316171548992 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (11 preceding siblings ...)
  2024-12-02 20:17 ` [PR PATCH] [Updated] " bryanasdev000
@ 2024-12-03 13:36 ` TinfoilSubmarine
  2024-12-03 20:08 ` bryanasdev000
                   ` (34 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-03 13:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2514577072

Comment:
For the test failure, it looks like it's just the one test 'TestQueryLog' that is failing. You could just skip the test:
```
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46..9faadc82673 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,7 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+make_check_args="-skip TestQueryLog"
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}
 ```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (12 preceding siblings ...)
  2024-12-03 13:36 ` prometheus: update to 3.0.1 TinfoilSubmarine
@ 2024-12-03 20:08 ` bryanasdev000
  2024-12-03 20:09 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (33 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-03 20:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2515450183

Comment:
> For the test failure, it looks like it's just the one test 'TestQueryLog' that is failing. You could just skip the test:
> 
> ```
> diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
> index 8d6dd022b46..9faadc82673 100644
> --- a/srcpkgs/prometheus/template
> +++ b/srcpkgs/prometheus/template
> @@ -3,6 +3,7 @@ pkgname=prometheus
>  version=3.0.1
>  revision=1
>  build_style=go
> +make_check_args="-skip TestQueryLog"
>  go_import_path="github.com/prometheus/prometheus"
>  go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
>  go_ldflags="-X github.com/prometheus/common/version.Version=${version}
> ```

After a few tries, atleast here (x86_64-glibc) the only failing test is `TestDelayedCompaction`.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (13 preceding siblings ...)
  2024-12-03 20:08 ` bryanasdev000
@ 2024-12-03 20:09 ` bryanasdev000
  2024-12-04 13:15 ` TinfoilSubmarine
                   ` (32 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-03 20:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 2434 bytes --]

From 93b7677b9f0eeb0c8ace9d69ff26316171548992 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/2] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From 3d2e33dd63b2caa8993a2d81e6a2cfdf7cffda1c Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Tue, 3 Dec 2024 17:08:38 -0300
Subject: [PATCH 2/2] prometheus: ignore TestDelayedCompaction

---
 srcpkgs/prometheus/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..bd599362d56267 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,7 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+make_check_args="-skip TestDelayedCompaction"
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (14 preceding siblings ...)
  2024-12-03 20:09 ` [PR PATCH] [Updated] " bryanasdev000
@ 2024-12-04 13:15 ` TinfoilSubmarine
  2024-12-04 13:33 ` TinfoilSubmarine
                   ` (31 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-04 13:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2517317838

Comment:
>  the only failing test is `TestDelayedCompaction`.

Is this issue similar to the failure you were seeing then? https://github.com/prometheus/prometheus/issues/14855



^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (15 preceding siblings ...)
  2024-12-04 13:15 ` TinfoilSubmarine
@ 2024-12-04 13:33 ` TinfoilSubmarine
  2024-12-04 16:09 ` bryanasdev000
                   ` (30 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-04 13:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2517408276

Comment:
Out of curiosity, I ran this on my own branche's CI: https://github.com/TinfoilSubmarine/void-packages/pull/8

This is without any skipped tests. The i686 failure is unrelated to failing tests.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (16 preceding siblings ...)
  2024-12-04 13:33 ` TinfoilSubmarine
@ 2024-12-04 16:09 ` bryanasdev000
  2024-12-04 16:14 ` bryanasdev000
                   ` (29 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-04 16:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2517892117

Comment:
> > the only failing test is `TestDelayedCompaction`.
> 
> Is this issue similar to the failure you were seeing then? [prometheus/prometheus#14855](https://github.com/prometheus/prometheus/issues/14855)

Yes, same output.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (17 preceding siblings ...)
  2024-12-04 16:09 ` bryanasdev000
@ 2024-12-04 16:14 ` bryanasdev000
  2024-12-05 13:16 ` TinfoilSubmarine
                   ` (28 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-04 16:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2517907023

Comment:
> Out of curiosity, I ran this on my own branche's CI: [TinfoilSubmarine#8](https://github.com/TinfoilSubmarine/void-packages/pull/8)
> 
> This is without any skipped tests. The i686 failure is unrelated to failing tests.

Curious, no error on the tests? I don't have a full domain over xbps-src and how it builds the packages, but I have a plenty of free space in the machine that I am using to build the packages (around 80GB at the moment at / and 700GB at /home, where is my copy of void-packages, maybe some tmpfs thing?).

Also, any idea why i686 just seems to stop without logs?

I should drop the skip test on the template?

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (18 preceding siblings ...)
  2024-12-04 16:14 ` bryanasdev000
@ 2024-12-05 13:16 ` TinfoilSubmarine
  2024-12-05 14:12 ` TinfoilSubmarine
                   ` (27 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-05 13:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2520301951

Comment:
> Curious, no error on the tests? I don't have a full domain over xbps-src and how it builds the packages, but I have a plenty of free space in the machine that I am using to build the packages (around 80GB at the moment at / and 700GB at /home, where is my copy of void-packages, maybe some tmpfs thing?).

The build happens in the chroot located at `masterdir-<arch>` in the `void-packages` directory by default.

> Also, any idea why i686 just seems to stop without logs?

It's just truncated, you can view the whole log if you go up to the top-right and click view raw logs.

> I should drop the skip test on the template?

We may have to do something like this to only run those tests when in CI:
```
if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
fi
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (19 preceding siblings ...)
  2024-12-05 13:16 ` TinfoilSubmarine
@ 2024-12-05 14:12 ` TinfoilSubmarine
  2024-12-05 14:55 ` bryanasdev000
                   ` (26 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-05 14:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2520436323

Comment:
Looking at the logs for i686 it seems like this is a 32-bit int/float type size assumption bug.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (20 preceding siblings ...)
  2024-12-05 14:12 ` TinfoilSubmarine
@ 2024-12-05 14:55 ` bryanasdev000
  2024-12-05 14:59 ` bryanasdev000
                   ` (25 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-05 14:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2520546206

Comment:
> > Curious, no error on the tests? I don't have a full domain over xbps-src and how it builds the packages, but I have a plenty of free space in the machine that I am using to build the packages (around 80GB at the moment at / and 700GB at /home, where is my copy of void-packages, maybe some tmpfs thing?).
> 
> The build happens in the chroot located at `masterdir-<arch>` in the `void-packages` directory by default.
> 
> > Also, any idea why i686 just seems to stop without logs?
> 
> It's just truncated, you can view the whole log if you go up to the top-right and click view raw logs.
> 
> > I should drop the skip test on the template?
> 
> We may have to do something like this to only run those tests when in CI:
> 
> ```
> if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
>   make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
> fi
> ```

Ok, thanks, will add it.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (21 preceding siblings ...)
  2024-12-05 14:55 ` bryanasdev000
@ 2024-12-05 14:59 ` bryanasdev000
  2024-12-05 15:43 ` bryanasdev000
                   ` (24 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-05 14:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2520555547

Comment:
> Looking at the logs for i686 it seems like this is a 32-bit int/float type size assumption bug.

Will you report it upstream? Asking because I really don't know if they support 32-bit arches beside Armv6 (if I remember correctly).

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (22 preceding siblings ...)
  2024-12-05 14:59 ` bryanasdev000
@ 2024-12-05 15:43 ` bryanasdev000
  2024-12-06 16:17 ` TinfoilSubmarine
                   ` (23 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-05 15:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2520669265

Comment:
Well, another flaky one here `TestHeadSeriesChunkRace`.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (23 preceding siblings ...)
  2024-12-05 15:43 ` bryanasdev000
@ 2024-12-06 16:17 ` TinfoilSubmarine
  2024-12-06 16:26 ` TinfoilSubmarine
                   ` (22 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-06 16:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2523644711

Comment:
> > Looking at the logs for i686 it seems like this is a 32-bit int/float type size assumption bug.
> 
> Will you report it upstream? Asking because I really don't know if they support 32-bit arches beside Armv6 (if I remember correctly).

They do support 386/i686, look at the releases. There's a build for both linux and freebsd. [Apparently](https://github.com/prometheus/prometheus/blob/main/.github/workflows/ci.yml#L36) they only run the tests for `./cmd/prometheus` for 386 though, so that's why these failures haven't been caught.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (24 preceding siblings ...)
  2024-12-06 16:17 ` TinfoilSubmarine
@ 2024-12-06 16:26 ` TinfoilSubmarine
  2024-12-06 17:09 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (21 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-06 16:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2523676805

Comment:
Opened https://github.com/prometheus/prometheus/issues/15547

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (25 preceding siblings ...)
  2024-12-06 16:26 ` TinfoilSubmarine
@ 2024-12-06 17:09 ` bryanasdev000
  2024-12-06 17:10 ` bryanasdev000
                   ` (20 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-06 17:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 3412 bytes --]

From 93b7677b9f0eeb0c8ace9d69ff26316171548992 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/3] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From 3d2e33dd63b2caa8993a2d81e6a2cfdf7cffda1c Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Tue, 3 Dec 2024 17:08:38 -0300
Subject: [PATCH 2/3] prometheus: ignore TestDelayedCompaction

---
 srcpkgs/prometheus/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..bd599362d56267 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,7 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+make_check_args="-skip TestDelayedCompaction"
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

From 280aadf882c8747ac8e819eb2716df2279ab6651 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 3/3] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index bd599362d56267..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,7 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
-make_check_args="-skip TestDelayedCompaction"
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (26 preceding siblings ...)
  2024-12-06 17:09 ` [PR PATCH] [Updated] " bryanasdev000
@ 2024-12-06 17:10 ` bryanasdev000
  2024-12-17 15:41 ` TinfoilSubmarine
                   ` (19 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-06 17:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 2520 bytes --]

From 93b7677b9f0eeb0c8ace9d69ff26316171548992 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/2] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From 8cffb0ed5617b47bebb1478a882142f199f4178a Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 2/2] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (27 preceding siblings ...)
  2024-12-06 17:10 ` bryanasdev000
@ 2024-12-17 15:41 ` TinfoilSubmarine
  2024-12-17 15:58 ` [PR REVIEW] " TinfoilSubmarine
                   ` (18 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-17 15:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2548797250

Comment:
Built and tested on x86_64, working fine.

I took some time to patch all of the 32-bit test bugs here: https://github.com/prometheus/prometheus/pull/15548

And I have applied the patches to my branch here: https://github.com/TinfoilSubmarine/void-packages/pull/8. You could either pull these patches into this branch, or just skip the failing tests on 32-bit for now.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR REVIEW] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (28 preceding siblings ...)
  2024-12-17 15:41 ` TinfoilSubmarine
@ 2024-12-17 15:58 ` TinfoilSubmarine
  2024-12-17 15:59 ` TinfoilSubmarine
                   ` (17 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-17 15:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#discussion_r1888771376

Comment:
This block should be after `make_dirs=...`. It also needs a space at the beginning of the string, that's my bad for not suggesting it correctly:
```
make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR REVIEW] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (29 preceding siblings ...)
  2024-12-17 15:58 ` [PR REVIEW] " TinfoilSubmarine
@ 2024-12-17 15:59 ` TinfoilSubmarine
  2024-12-17 15:59 ` TinfoilSubmarine
                   ` (16 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-17 15:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#discussion_r1888771376

Comment:
This block should be after `make_dirs=...`. It also needs a space at the beginning of the string, that's my bad for not suggesting it correctly:
```
make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR REVIEW] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (30 preceding siblings ...)
  2024-12-17 15:59 ` TinfoilSubmarine
@ 2024-12-17 15:59 ` TinfoilSubmarine
  2024-12-29  3:56 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (15 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2024-12-17 15:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#discussion_r1888774864

Comment:
This block should be after `make_dirs=...`. It also needs a space at the beginning of the string, that's my bad for not suggesting it correctly:
```
make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (31 preceding siblings ...)
  2024-12-17 15:59 ` TinfoilSubmarine
@ 2024-12-29  3:56 ` bryanasdev000
  2024-12-29  3:56 ` [PR REVIEW] " bryanasdev000
                   ` (14 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  3:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 3831 bytes --]

From 312e11b5c0fd648664a38419fcc670933bf8e922 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/3] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From ff75224dced843f1fc0f7249eed28b1505241806 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 2/3] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

From b82d1ce8d7c8cbf8386609e909797bcf7d202917 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Sat, 28 Dec 2024 22:35:56 -0300
Subject: [PATCH 3/3] prometheus: fix skip order

---
 srcpkgs/prometheus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 498f8c472b10a5..baa14247c18ab6 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,9 +3,6 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
-if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
-  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
-fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}
@@ -28,6 +25,10 @@ system_accounts="_prometheus"
 
 make_dirs="/var/lib/prometheus 700 _prometheus _prometheus"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
+fi
+
 pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR REVIEW] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (32 preceding siblings ...)
  2024-12-29  3:56 ` [PR PATCH] [Updated] " bryanasdev000
@ 2024-12-29  3:56 ` bryanasdev000
  2024-12-29  3:59 ` bryanasdev000
                   ` (13 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  3:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#discussion_r1899057393

Comment:
No problem, fixed.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (33 preceding siblings ...)
  2024-12-29  3:56 ` [PR REVIEW] " bryanasdev000
@ 2024-12-29  3:59 ` bryanasdev000
  2024-12-29  4:01 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (12 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  3:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 796 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2564603788

Comment:
> Built and tested on x86_64, working fine.
> 
> I took some time to patch all of the 32-bit test bugs here: [prometheus/prometheus#15548](https://github.com/prometheus/prometheus/pull/15548)
> 
> And I have applied the patches to my branch here: [TinfoilSubmarine#8](https://github.com/TinfoilSubmarine/void-packages/pull/8). You could either pull these patches into this branch, or just skip the failing tests on 32-bit for now.

Sorry for the late response, also merry (late) christmas!

Since you PR is already merged, I prefer to wait for a release from upstream, if that's okay.

I fixed `make_check_args` order, rebased and pushed.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (34 preceding siblings ...)
  2024-12-29  3:59 ` bryanasdev000
@ 2024-12-29  4:01 ` bryanasdev000
  2024-12-29  4:03 ` bryanasdev000
                   ` (11 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  4:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 3830 bytes --]

From 312e11b5c0fd648664a38419fcc670933bf8e922 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/3] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From ff75224dced843f1fc0f7249eed28b1505241806 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 2/3] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

From 6856d695be33e4531a6efc8c09c89a03fd847d94 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Sat, 28 Dec 2024 22:35:56 -0300
Subject: [PATCH 3/3] prometheus: fix skip order

---
 srcpkgs/prometheus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 498f8c472b10a5..c4a55211efab6a 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,9 +3,6 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
-if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
-  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
-fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}
@@ -28,6 +25,10 @@ system_accounts="_prometheus"
 
 make_dirs="/var/lib/prometheus 700 _prometheus _prometheus"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+	make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
+fi
+
 pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (35 preceding siblings ...)
  2024-12-29  4:01 ` [PR PATCH] [Updated] " bryanasdev000
@ 2024-12-29  4:03 ` bryanasdev000
  2024-12-29  4:03 ` bryanasdev000
                   ` (10 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  4:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2564604535

Comment:
Fixed spaces vs tabs.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (36 preceding siblings ...)
  2024-12-29  4:03 ` bryanasdev000
@ 2024-12-29  4:03 ` bryanasdev000
  2025-01-02 15:41 ` TinfoilSubmarine
                   ` (9 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2024-12-29  4:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2564604593

Comment:
Local build ok.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (37 preceding siblings ...)
  2024-12-29  4:03 ` bryanasdev000
@ 2025-01-02 15:41 ` TinfoilSubmarine
  2025-01-06  4:17 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (8 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2025-01-02 15:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2567969958

Comment:
3.1.0 is released.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (38 preceding siblings ...)
  2025-01-02 15:41 ` TinfoilSubmarine
@ 2025-01-06  4:17 ` bryanasdev000
  2025-01-06  4:18 ` bryanasdev000
                   ` (7 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-06  4:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 4924 bytes --]

From a4eaeaa7d963da6b163038a4a6cf37edfb6c3adf Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/4] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From f1af91932b31e2947fbcbb571204dff8542e0009 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 2/4] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

From 60b49647a599c84547ac4c7170614ded9acd6e6f Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Sat, 28 Dec 2024 22:35:56 -0300
Subject: [PATCH 3/4] prometheus: fix skip order

---
 srcpkgs/prometheus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 498f8c472b10a5..c4a55211efab6a 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,9 +3,6 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
-if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
-  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
-fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}
@@ -28,6 +25,10 @@ system_accounts="_prometheus"
 
 make_dirs="/var/lib/prometheus 700 _prometheus _prometheus"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+	make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
+fi
+
 pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)

From a89ae0c7fe460e957af87723f26074f05cc27abd Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 6 Jan 2025 00:06:17 -0300
Subject: [PATCH 4/4] prometheus: update to 3.1.0.

---
 srcpkgs/prometheus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index c4a55211efab6a..bb007d47462974 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=3.0.1
+version=3.1.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
+checksum=b23aefb9e0018788ea048fd1c0dbac945c4acf7b20a6ab0cf81bd3e717a2995f
 
 system_accounts="_prometheus"
 

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (39 preceding siblings ...)
  2025-01-06  4:17 ` [PR PATCH] [Updated] " bryanasdev000
@ 2025-01-06  4:18 ` bryanasdev000
  2025-01-06  4:36 ` bryanasdev000
                   ` (6 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-06  4:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2572245588

Comment:
> 3.1.0 is released.

Happy (late) new year!

Built it locally and will test it on my lab, as for tests, seems that a new one (maybe more) is failing (at least here):

```
panic: test timed out after 10m0s
        running tests:
                TestWaitForPendingReadersInTimeRange (3s)
                TestWaitForPendingReadersInTimeRange/mint=500,maxt=1500,shouldWait=true (1s)
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.0.1.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (40 preceding siblings ...)
  2025-01-06  4:18 ` bryanasdev000
@ 2025-01-06  4:36 ` bryanasdev000
  2025-01-06 14:47 ` prometheus: update to 3.1.0 TinfoilSubmarine
                   ` (5 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-06  4:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2572259324

Comment:
Well, no errors for tests on CI, but i686 may be borked because of https://github.com/rollup/rollup/issues/5392 (based on CI logs https://github.com/void-linux/void-packages/actions/runs/12626419663/job/35179537404?pr=53119).

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (41 preceding siblings ...)
  2025-01-06  4:36 ` bryanasdev000
@ 2025-01-06 14:47 ` TinfoilSubmarine
  2025-01-14 21:26 ` [PR PATCH] [Updated] " bryanasdev000
                   ` (4 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2025-01-06 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2573264038

Comment:
> Well, no errors for tests on CI, but i686 may be borked because of [rollup/rollup#5392](https://github.com/rollup/rollup/issues/5392) (based on CI logs https://github.com/void-linux/void-packages/actions/runs/12626419663/job/35179537404?pr=53119).

I have a fix for this in `pre_build()` on my branch:
```
pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)
 	echo "require('graceful-fs').gracefulify(require('fs'));" \
 		> "${wrksrc}/web/ui/use-graceful-fs.js"
 	export NODE_OPTIONS="--require ${wrksrc}/web/ui/use-graceful-fs.js"
+
+	# rollup doesn't support native i686, use wasm instead
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		(cd web/ui && npm install --override rollup@npm:@rollup/wasm-node@latest)
+	fi
+
 	CGO_ENABLED=0 GOARCH= make assets assets-compress
}
```

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (42 preceding siblings ...)
  2025-01-06 14:47 ` prometheus: update to 3.1.0 TinfoilSubmarine
@ 2025-01-14 21:26 ` bryanasdev000
  2025-01-14 23:06 ` bryanasdev000
                   ` (3 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-14 21:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 5847 bytes --]

From a4eaeaa7d963da6b163038a4a6cf37edfb6c3adf Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH 1/5] prometheus: update to 3.0.1.

---
 srcpkgs/prometheus/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..8d6dd022b46243 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.0.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
 
 system_accounts="_prometheus"
 
@@ -39,8 +39,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

From f1af91932b31e2947fbcbb571204dff8542e0009 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Thu, 5 Dec 2024 13:02:36 -0300
Subject: [PATCH 2/5] prometheus: run some tests only on ci

---
 srcpkgs/prometheus/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 8d6dd022b46243..498f8c472b10a5 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,6 +3,9 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
+fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}

From 60b49647a599c84547ac4c7170614ded9acd6e6f Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Sat, 28 Dec 2024 22:35:56 -0300
Subject: [PATCH 3/5] prometheus: fix skip order

---
 srcpkgs/prometheus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 498f8c472b10a5..c4a55211efab6a 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -3,9 +3,6 @@ pkgname=prometheus
 version=3.0.1
 revision=1
 build_style=go
-if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
-  make_check_args+="-skip (TestQueryLog|TestDelayedCompaction)"
-fi
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
 go_ldflags="-X github.com/prometheus/common/version.Version=${version}
@@ -28,6 +25,10 @@ system_accounts="_prometheus"
 
 make_dirs="/var/lib/prometheus 700 _prometheus _prometheus"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+	make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
+fi
+
 pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)

From a89ae0c7fe460e957af87723f26074f05cc27abd Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 6 Jan 2025 00:06:17 -0300
Subject: [PATCH 4/5] prometheus: update to 3.1.0.

---
 srcpkgs/prometheus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index c4a55211efab6a..bb007d47462974 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=3.0.1
+version=3.1.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=bd40fd54d5a8f63cbbf5355ee056d23efce29c4af3fbf3fd754238c5d2a27425
+checksum=b23aefb9e0018788ea048fd1c0dbac945c4acf7b20a6ab0cf81bd3e717a2995f
 
 system_accounts="_prometheus"
 

From b7b4cc97d0e3be35d4fcb21a6326ba417abe68f9 Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Tue, 14 Jan 2025 18:26:32 -0300
Subject: [PATCH 5/5] prometheus: fix web ui build

---
 srcpkgs/prometheus/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index bb007d47462974..f8ae56618a068c 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -35,6 +35,12 @@ pre_build() {
 	echo "require('graceful-fs').gracefulify(require('fs'));" \
 		> "${wrksrc}/web/ui/use-graceful-fs.js"
 	export NODE_OPTIONS="--require ${wrksrc}/web/ui/use-graceful-fs.js"
+
+	# rollup doesn't support native i686, use wasm instead
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		(cd web/ui && npm install --override rollup@npm:@rollup/wasm-node@latest)
+	fi
+
 	CGO_ENABLED=0 GOARCH= make assets assets-compress
 }
 

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (43 preceding siblings ...)
  2025-01-14 21:26 ` [PR PATCH] [Updated] " bryanasdev000
@ 2025-01-14 23:06 ` bryanasdev000
  2025-01-17 15:50 ` TinfoilSubmarine
                   ` (2 subsequent siblings)
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-14 23:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2591287199

Comment:
> > Well, no errors for tests on CI, but i686 may be borked because of [rollup/rollup#5392](https://github.com/rollup/rollup/issues/5392) (based on CI logs https://github.com/void-linux/void-packages/actions/runs/12626419663/job/35179537404?pr=53119).
> 
> I have a fix for this in `pre_build()` on my branch:
> ```
> pre_build() {
>  	# Need to patch node fs to avoid using too many file descriptors
>  	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)
>  	echo "require('graceful-fs').gracefulify(require('fs'));" \
>  		> "${wrksrc}/web/ui/use-graceful-fs.js"
>  	export NODE_OPTIONS="--require ${wrksrc}/web/ui/use-graceful-fs.js"
> +
> +	# rollup doesn't support native i686, use wasm instead
> +	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
> +		(cd web/ui && npm install --override rollup@npm:@rollup/wasm-node@latest)
> +	fi
> +
>  	CGO_ENABLED=0 GOARCH= make assets assets-compress
> }
> ```

Done, thanks.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (44 preceding siblings ...)
  2025-01-14 23:06 ` bryanasdev000
@ 2025-01-17 15:50 ` TinfoilSubmarine
  2025-01-17 23:53 ` [PR PATCH] [Updated] " bryanasdev000
  2025-01-17 23:53 ` bryanasdev000
  47 siblings, 0 replies; 49+ messages in thread
From: TinfoilSubmarine @ 2025-01-17 15:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2598655570

Comment:
This looks good to me. You should squash all of the commits into one with the message matching the title of this PR per [CONTRIBUTING.md#committing-your-changes](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes) and mark this PR as ready for review.

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PR PATCH] [Updated] prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (45 preceding siblings ...)
  2025-01-17 15:50 ` TinfoilSubmarine
@ 2025-01-17 23:53 ` bryanasdev000
  2025-01-17 23:53 ` bryanasdev000
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-17 23:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is an updated pull request by bryanasdev000 against master on the void-packages repository

https://github.com/bryanasdev000/void-packages prometheus-2.55.1
https://github.com/void-linux/void-packages/pull/53119

prometheus: update to 3.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes, running on my homelab**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

#### Note

Although 3.x is available, Prometheus 2.55 or newer "required" for a major (3.x) upgrade, per migration guide (https://prometheus.io/docs/prometheus/3.0/migration/#tsdb-format-and-downgrade).


A patch file from https://github.com/void-linux/void-packages/pull/53119.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prometheus-2.55.1-53119.patch --]
[-- Type: text/x-diff, Size: 2467 bytes --]

From 34faa965f066658f20ccbcacd2c23ba1bd0465ac Mon Sep 17 00:00:00 2001
From: "Bryan A. S." <bryanasdev000@gmail.com>
Date: Mon, 18 Nov 2024 00:25:44 -0300
Subject: [PATCH] prometheus: update to 3.1.0.

prometheus: run some tests only on ci

prometheus: fix skip order

prometheus: fix web ui build
---
 srcpkgs/prometheus/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index e18c0d3b610706..f8ae56618a068c 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.53.1
-revision=2
+version=3.1.0
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
@@ -19,18 +19,28 @@ license="Apache-2.0, MIT"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=6a36ad9fd6ce2813c78aab1da98d7725143bcb73e4fe1e2597c873537f7072af
+checksum=b23aefb9e0018788ea048fd1c0dbac945c4acf7b20a6ab0cf81bd3e717a2995f
 
 system_accounts="_prometheus"
 
 make_dirs="/var/lib/prometheus 700 _prometheus _prometheus"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" != "void-packages-ci" ]; then
+	make_check_args+=" -skip (TestQueryLog|TestDelayedCompaction)"
+fi
+
 pre_build() {
 	# Need to patch node fs to avoid using too many file descriptors
 	(cd web/ui && yarn add --dev -W graceful-fs@4.2.11)
 	echo "require('graceful-fs').gracefulify(require('fs'));" \
 		> "${wrksrc}/web/ui/use-graceful-fs.js"
 	export NODE_OPTIONS="--require ${wrksrc}/web/ui/use-graceful-fs.js"
+
+	# rollup doesn't support native i686, use wasm instead
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		(cd web/ui && npm install --override rollup@npm:@rollup/wasm-node@latest)
+	fi
+
 	CGO_ENABLED=0 GOARCH= make assets assets-compress
 }
 
@@ -39,8 +49,6 @@ post_install() {
 	vmkdir etc/prometheus
 	vmkdir usr/share/doc/prometheus
 	vmkdir usr/share/examples/prometheus
-	vcopy consoles etc/prometheus
-	vcopy console_libraries etc/prometheus
 	vcopy documentation/examples/* usr/share/examples/prometheus/
 	vcopy documentation/examples/prometheus.yml etc/prometheus/
 	vcopy documentation/images usr/share/doc/prometheus/

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: prometheus: update to 3.1.0.
  2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
                   ` (46 preceding siblings ...)
  2025-01-17 23:53 ` [PR PATCH] [Updated] " bryanasdev000
@ 2025-01-17 23:53 ` bryanasdev000
  47 siblings, 0 replies; 49+ messages in thread
From: bryanasdev000 @ 2025-01-17 23:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

New comment by bryanasdev000 on void-packages repository

https://github.com/void-linux/void-packages/pull/53119#issuecomment-2599385858

Comment:
> This looks good to me. You should squash all of the commits into one with the message matching the title of this PR per [CONTRIBUTING.md#committing-your-changes](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes) and mark this PR as ready for review.

Done, thanks for the help.

^ permalink raw reply	[flat|nested] 49+ messages in thread

end of thread, other threads:[~2025-01-17 23:53 UTC | newest]

Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-18  3:29 [PR PATCH] prometheus: update to 2.55.1 bryanasdev000
2024-11-18  3:32 ` bryanasdev000
2024-11-18  4:01 ` bryanasdev000
2024-11-22 19:04 ` bryanasdev000
2024-11-30  3:29 ` TinfoilSubmarine
2024-11-30  8:42 ` bryanasdev000
2024-11-30 14:47 ` TinfoilSubmarine
2024-12-01  1:00 ` bryanasdev000
2024-12-01 11:52 ` bryanasdev000
2024-12-02 14:07 ` TinfoilSubmarine
2024-12-02 14:07 ` TinfoilSubmarine
2024-12-02 17:58 ` bryanasdev000
2024-12-02 20:17 ` [PR PATCH] [Updated] " bryanasdev000
2024-12-03 13:36 ` prometheus: update to 3.0.1 TinfoilSubmarine
2024-12-03 20:08 ` bryanasdev000
2024-12-03 20:09 ` [PR PATCH] [Updated] " bryanasdev000
2024-12-04 13:15 ` TinfoilSubmarine
2024-12-04 13:33 ` TinfoilSubmarine
2024-12-04 16:09 ` bryanasdev000
2024-12-04 16:14 ` bryanasdev000
2024-12-05 13:16 ` TinfoilSubmarine
2024-12-05 14:12 ` TinfoilSubmarine
2024-12-05 14:55 ` bryanasdev000
2024-12-05 14:59 ` bryanasdev000
2024-12-05 15:43 ` bryanasdev000
2024-12-06 16:17 ` TinfoilSubmarine
2024-12-06 16:26 ` TinfoilSubmarine
2024-12-06 17:09 ` [PR PATCH] [Updated] " bryanasdev000
2024-12-06 17:10 ` bryanasdev000
2024-12-17 15:41 ` TinfoilSubmarine
2024-12-17 15:58 ` [PR REVIEW] " TinfoilSubmarine
2024-12-17 15:59 ` TinfoilSubmarine
2024-12-17 15:59 ` TinfoilSubmarine
2024-12-29  3:56 ` [PR PATCH] [Updated] " bryanasdev000
2024-12-29  3:56 ` [PR REVIEW] " bryanasdev000
2024-12-29  3:59 ` bryanasdev000
2024-12-29  4:01 ` [PR PATCH] [Updated] " bryanasdev000
2024-12-29  4:03 ` bryanasdev000
2024-12-29  4:03 ` bryanasdev000
2025-01-02 15:41 ` TinfoilSubmarine
2025-01-06  4:17 ` [PR PATCH] [Updated] " bryanasdev000
2025-01-06  4:18 ` bryanasdev000
2025-01-06  4:36 ` bryanasdev000
2025-01-06 14:47 ` prometheus: update to 3.1.0 TinfoilSubmarine
2025-01-14 21:26 ` [PR PATCH] [Updated] " bryanasdev000
2025-01-14 23:06 ` bryanasdev000
2025-01-17 15:50 ` TinfoilSubmarine
2025-01-17 23:53 ` [PR PATCH] [Updated] " bryanasdev000
2025-01-17 23:53 ` bryanasdev000

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).