Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(dev): update Prometheus to 3.1.0 and add prometheusRW2 profile #10425

Merged
merged 3 commits into from
Jan 16, 2025
Merged

chore(dev): update Prometheus to 3.1.0 and add prometheusRW2 profile #10425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7593f97
chore(dev): update Prometheus to 3.1.0 and add prometheusRW2 profile
krajorama Jan 13, 2025
cb3e5d2
Sync versions with jsonnet
krajorama Jan 13, 2025
d656dc2
Update development/mimir-monolithic-mode/config/prometheusRW2.yaml
krajorama Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion development/mimir-microservices-mode/config/prom-ha-pair-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ scrape_configs:
target_label: 'container'
regex: '(.+?)(-\d+)?'
replacement: '${1}'
scrape_classic_histograms: true
always_scrape_classic_histograms: true

remote_write:
- url: http://distributor-2:8001/api/v1/push
Expand Down
2 changes: 1 addition & 1 deletion development/mimir-microservices-mode/config/prom-ha-pair-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ scrape_configs:
target_label: 'container'
regex: '(.+?)(-\d+)?'
replacement: '${1}'
scrape_classic_histograms: true
always_scrape_classic_histograms: true

remote_write:
- url: http://distributor-2:8001/api/v1/push
Expand Down
2 changes: 1 addition & 1 deletion development/mimir-microservices-mode/config/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ scrape_configs:
target_label: 'container'
regex: '(.+?)(-\d+)?'
replacement: '${1}'
scrape_classic_histograms: true
always_scrape_classic_histograms: true

remote_write:
- url: http://distributor-1:8000/api/v1/push
Expand Down
6 changes: 3 additions & 3 deletions development/mimir-microservices-mode/docker-compose.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ std.manifestYamlDoc({

prometheus:: {
prometheus: {
image: 'prom/prometheus:v2.51.1',
image: 'prom/prometheus:v3.1.0',
command: [
'--config.file=/etc/prometheus/prometheus.yaml',
'--enable-feature=exemplar-storage',
Expand All @@ -358,7 +358,7 @@ std.manifestYamlDoc({

prompair1:: {
prompair1: {
image: 'prom/prometheus:v2.51.1',
image: 'prom/prometheus:v3.1.0',
hostname: 'prom-ha-pair-1',
command: [
'--config.file=/etc/prometheus/prom-ha-pair-1.yaml',
Expand All @@ -374,7 +374,7 @@ std.manifestYamlDoc({

prompair2:: {
prompair2: {
image: 'prom/prometheus:v2.51.1',
image: 'prom/prometheus:v3.1.0',
hostname: 'prom-ha-pair-2',
command: [
'--config.file=/etc/prometheus/prom-ha-pair-2.yaml',
Expand Down
6 changes: 3 additions & 3 deletions development/mimir-microservices-mode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
- "--config.file=/etc/prometheus/prometheus.yaml"
- "--enable-feature=exemplar-storage"
- "--enable-feature=native-histograms"
"image": "prom/prometheus:v2.51.1"
"image": "prom/prometheus:v3.1.0"
"ports":
- "9090:9090"
"volumes":
Expand All @@ -342,7 +342,7 @@
- "--enable-feature=exemplar-storage"
- "--enable-feature=native-histograms"
"hostname": "prom-ha-pair-1"
"image": "prom/prometheus:v2.51.1"
"image": "prom/prometheus:v3.1.0"
"ports":
- "9092:9090"
"volumes":
Expand All @@ -353,7 +353,7 @@
- "--enable-feature=exemplar-storage"
- "--enable-feature=native-histograms"
"hostname": "prom-ha-pair-2"
"image": "prom/prometheus:v2.51.1"
"image": "prom/prometheus:v3.1.0"
"ports":
- "9093:9090"
"volumes":
Expand Down
4 changes: 2 additions & 2 deletions development/mimir-monolithic-mode-with-swift-storage/config/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ scrape_configs:
- targets: ['mimir-1:8001']
labels:
container: 'mimir-1'
scrape_classic_histograms: true
always_scrape_classic_histograms: true
- job_name: mimir-2
static_configs:
- targets: ['mimir-2:8002']
labels:
container: 'mimir-2'
scrape_classic_histograms: true
always_scrape_classic_histograms: true

remote_write:
- url: http://mimir-1:8001/api/v1/push
Expand Down
2 changes: 1 addition & 1 deletion development/mimir-monolithic-mode-with-swift-storage/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:

prometheus:

image: prom/prometheus:v2.55.1
image: prom/prometheus:v3.1.0
command: ["--config.file=/etc/prometheus/prometheus.yaml", "--enable-feature=native-histograms"]
volumes:
- ./config:/etc/prometheus
Expand Down
4 changes: 2 additions & 2 deletions development/mimir-monolithic-mode/config/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ scrape_configs:
- targets: ['mimir-1:8001']
labels:
container: 'mimir-1'
scrape_classic_histograms: true
always_scrape_classic_histograms: true
- job_name: mimir-2
static_configs:
- targets: ['mimir-2:8002']
labels:
container: 'mimir-2'
scrape_classic_histograms: true
always_scrape_classic_histograms: true

remote_write:
- url: http://mimir-1:8001/api/v1/push
Expand Down
23 changes: 23 additions & 0 deletions development/mimir-monolithic-mode/config/prometheusRW2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
global:
scrape_interval: 5s
external_labels:
scraped_by: prometheus

scrape_configs:
- job_name: mimir-1
static_configs:
- targets: ['mimir-1:8001']
labels:
container: 'mimir-1'
always_scrape_classic_histograms: true
- job_name: mimir-2
static_configs:
- targets: ['mimir-2:8002']
labels:
container: 'mimir-2'
always_scrape_classic_histograms: true

remote_write:
- url: http://mimir-1:8001/api/v1/push
send_native_histograms: true
protobuf_message: "io.prometheus.write.v2.Request"
12 changes: 11 additions & 1 deletion development/mimir-monolithic-mode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,23 @@ services:
prometheus:
profiles:
- prometheus
image: prom/prometheus:v2.55.1
image: prom/prometheus:v3.1.0
command: ["--config.file=/etc/prometheus/prometheus.yaml", "--enable-feature=native-histograms"]
volumes:
- ./config:/etc/prometheus
ports:
- 9190:9090

prometheusRW2:
profiles:
- prometheusRW2
image: prom/prometheus:v3.1.0
command: ["--config.file=/etc/prometheus/prometheusRW2.yaml", "--enable-feature=metadata-wal-records,native-histograms"]
volumes:
- ./config:/etc/prometheus
ports:
- 9190:9090

grafana:
environment:
- GF_AUTH_ANONYMOUS_ENABLED=true
Expand Down
Loading