Skip to content

Commit df85ddf

Browse files
authored
Merge branch 'main' into perf/refacatored-sort-algorithm
2 parents 5186aa9 + c142898 commit df85ddf

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

examples/example-custom-buckets/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- -jar
1111
- /example-custom-buckets.jar
1212
prometheus:
13-
image: prom/prometheus:v3.11.3@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
13+
image: prom/prometheus:v3.12.0@sha256:69f5241418838263316593f7274a304b095c40bcf22e57272865da91bd60a8ac
1414
network_mode: host
1515
volumes:
1616
- ./docker-compose/prometheus.yml:/prometheus.yml

examples/example-exemplars-tail-sampling/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
command:
4444
- --config=file:/config.yaml
4545
prometheus:
46-
image: prom/prometheus:v3.11.3@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
46+
image: prom/prometheus:v3.12.0@sha256:69f5241418838263316593f7274a304b095c40bcf22e57272865da91bd60a8ac
4747
network_mode: host
4848
volumes:
4949
- ./config/prometheus.yaml:/prometheus.yaml
@@ -52,7 +52,7 @@ services:
5252
- --enable-feature=native-histograms
5353
- --config.file=/prometheus.yaml
5454
tempo:
55-
image: grafana/tempo:2.10.5@sha256:ee21727732c7a7199cb71c3eee9153bbf23f9b0b87619f0555a0cf21a67f1a33
55+
image: grafana/tempo:3.0.0@sha256:78439f7f7cf3c97122846c13a832e060c6c7ef67dcc814dccf0a5f3f78393a93
5656
network_mode: host
5757
volumes:
5858
- ./config/tempo-config.yaml:/config.yaml

examples/example-exporter-opentelemetry/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
command:
2121
- --config=file:/config.yaml
2222
prometheus:
23-
image: prom/prometheus:v3.11.3@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
23+
image: prom/prometheus:v3.12.0@sha256:69f5241418838263316593f7274a304b095c40bcf22e57272865da91bd60a8ac
2424
network_mode: host
2525
volumes:
2626
- ./config/prometheus.yaml:/prometheus.yaml

examples/example-native-histogram/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- -jar
1111
- /example-native-histogram.jar
1212
prometheus:
13-
image: prom/prometheus:v3.11.3@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
13+
image: prom/prometheus:v3.12.0@sha256:69f5241418838263316593f7274a304b095c40bcf22e57272865da91bd60a8ac
1414
network_mode: host
1515
volumes:
1616
- ./docker-compose/prometheus.yml:/prometheus.yml

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tools]
2-
"go:github.com/grafana/oats" = "0.6.1"
2+
"go:github.com/grafana/oats" = "0.7.0"
33
hugo = "0.162.0"
44
java = "temurin-25.0.3+9.0.LTS"
55
node = "24.16.0"

0 commit comments

Comments
 (0)