Skip to content

Commit

Permalink
Merge pull request #4296 from systeminit/promfixes
Browse files Browse the repository at this point in the history
fix: minor port changes to get all of the metrics shipping to grafana
  • Loading branch information
sprutton1 authored Aug 7, 2024
2 parents 0b58dd7 + d9cf478 commit 5670d8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions component/deploy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
- --path.rootfs=/rootfs
- --collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)
ports:
- 9100:9100
- 9000:9100
volumes:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
image: prom/prometheus
profiles: [rebaser, pinga, sdf, veritech]
ports:
- "9000:9090"
- "9100:9090"
volumes:
- "config:/etc/prometheus/"
depends_on:
Expand Down
4 changes: 3 additions & 1 deletion component/init/configs/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ exporters:
endpoint: "api.honeycomb.io:443"
headers:
"x-honeycomb-team": "$SI_HONEYCOMB_API_KEY"
prometheus:
endpoint: 0.0.0.0:9090

extensions:
zpages:
Expand All @@ -27,5 +29,5 @@ service:
metrics:
receivers: [otlp]
processors: [batch]
exporters: [logging, otlp]
exporters: [prometheus]
extensions: [zpages]
3 changes: 2 additions & 1 deletion component/init/configs/prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
global:
scrape_interval: 100ms
scrape_interval: 10s
scrape_configs:
- job_name: service_metrics
static_configs:
- targets:
- otelcol:9090
- job_name: firecracker
scrape_interval: 100ms
static_configs:
- targets:
- process-exporter:9256
Expand Down

0 comments on commit 5670d8a

Please sign in to comment.