Skip to content

Commit

Permalink
feat: add trace to metrics and otelcol metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
krzko committed Jun 28, 2023
1 parent 432c910 commit 74f0dad
Show file tree
Hide file tree
Showing 16 changed files with 13 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ services:
- GF_AUTH_ANONYMOUS_ENABLED=true
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
- GF_AUTH_DISABLE_LOGIN_FORM=true
- GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
# https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/
- GF_FEATURE_TOGGLES_ENABLE=traceqlEditor,traceToMetrics,publicDashboards,showTraceId,pyroscopeFlameGraph
# - GF_INSTALL_PLUGINS=pyroscope-datasource,pyroscope-panel
- NO_PROXY=grafana,loki,minio,otel-collector,prometheus,pyroscope,tempo
ports:
Expand Down Expand Up @@ -111,6 +112,8 @@ services:
- ../shared/tempo.yaml:/etc/tempo.yaml
- ./tempo-data:/tmp/tempo
ports:
# - "4317:4317" # otlp grpc
# - "4318:4318" # otlp http
- "14268:14268" # jaeger ingest
- "3200:3200" # tempo
- "9095:9095" # tempo grpc
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":"1","format":"xl-single","id":"9c113de9-b71c-4a7d-b74d-b7b67c053479","xl":{"version":"3","this":"9721516b-773e-4788-9b76-4f16c8ba7ce5","sets":[["9721516b-773e-4788-9b76-4f16c8ba7ce5"]],"distributionAlgo":"SIPMOD+PARITY"}}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"UID":"548927bb-973a-46aa-9e15-a8b8f363e9be","created_at":"2023-06-28T03:58:06.276397917Z","version":{"version":"main-5e0870a","revision":"5e0870a55","branch":"main","buildUser":"","buildDate":"","goVersion":"go1.20.4"}}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ datasources:
jsonData:
httpMethod: GET
serviceMap:
datasourceUid: prometheus
datasourceUid: 'prometheus'
6 changes: 5 additions & 1 deletion internal/files/files/grafana/shared/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ global:
evaluation_interval: 15s

scrape_configs:
- job_name: 'otel-collector'
honor_labels: true
static_configs:
- targets: [ 'otel-collector:8888' ]
- job_name: 'prometheus'
honor_labels: true
static_configs:
- targets: [ 'localhost:9090' ]
- job_name: 'tempo'
honor_labels: true
static_configs:
- targets: [ 'tempo:3200' ]
- targets: [ 'tempo:3200' ]
2 changes: 1 addition & 1 deletion internal/files/files/grafana/shared/tempo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ storage:
path: /tmp/tempo/blocks

overrides:
metrics_generator_processors: [service-graphs, span-metrics] # enables metrics generator
metrics_generator_processors: [service-graphs, span-metrics] # enables metrics generator

0 comments on commit 74f0dad

Please sign in to comment.