Skip to content

Commit 225b495

Browse files
philipgoughphilipgough
authored
Swop out the jaeger collector endpoint for otel collector in metrics … (#608)
* Swop out the jaeger collector endpoint for otel collector in metrics template * Swap out the jaeger collector endpoint for otel collector in obs template
1 parent 5dab244 commit 225b495

7 files changed

+22
-16
lines changed

‎resources/services/metric-federation-rule-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ objects:
231231
- mountPath: /etc/thanos/rules/metric-federation-rules
232232
name: metric-federation-rules
233233
- args:
234-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
234+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
235235
- --reporter.type=grpc
236236
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
237237
env:

‎resources/services/observatorium-metrics-template.yaml

+14-12
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ objects:
654654
name: query-proxy
655655
readOnly: false
656656
- args:
657-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
657+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
658658
- --reporter.type=grpc
659659
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
660660
env:
@@ -937,7 +937,7 @@ objects:
937937
name: query-proxy
938938
readOnly: false
939939
- args:
940-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
940+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
941941
- --reporter.type=grpc
942942
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
943943
env:
@@ -1246,7 +1246,7 @@ objects:
12461246
name: query-proxy
12471247
readOnly: false
12481248
- args:
1249-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
1249+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
12501250
- --reporter.type=grpc
12511251
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
12521252
env:
@@ -1563,7 +1563,7 @@ objects:
15631563
name: query-frontend-proxy
15641564
readOnly: false
15651565
- args:
1566-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
1566+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
15671567
- --reporter.type=grpc
15681568
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
15691569
env:
@@ -2160,7 +2160,7 @@ objects:
21602160
name: observatorium-thanos-receive-limits
21612161
readOnly: true
21622162
- args:
2163-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
2163+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
21642164
- --reporter.type=grpc
21652165
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
21662166
env:
@@ -2642,7 +2642,7 @@ objects:
26422642
- mountPath: /etc/thanos/rules/observatorium-rules
26432643
name: observatorium-rules
26442644
- args:
2645-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
2645+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
26462646
- --reporter.type=grpc
26472647
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
26482648
env:
@@ -3199,7 +3199,7 @@ objects:
31993199
name: data
32003200
readOnly: false
32013201
- args:
3202-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
3202+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
32033203
- --reporter.type=grpc
32043204
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
32053205
env:
@@ -3456,7 +3456,7 @@ objects:
34563456
name: data
34573457
readOnly: false
34583458
- args:
3459-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
3459+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
34603460
- --reporter.type=grpc
34613461
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
34623462
env:
@@ -3713,7 +3713,7 @@ objects:
37133713
name: data
37143714
readOnly: false
37153715
- args:
3716-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
3716+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
37173717
- --reporter.type=grpc
37183718
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
37193719
env:
@@ -3970,7 +3970,7 @@ objects:
39703970
name: data
39713971
readOnly: false
39723972
- args:
3973-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
3973+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
39743974
- --reporter.type=grpc
39753975
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
39763976
env:
@@ -4227,7 +4227,7 @@ objects:
42274227
name: data
42284228
readOnly: false
42294229
- args:
4230-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
4230+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
42314231
- --reporter.type=grpc
42324232
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
42334233
env:
@@ -4484,7 +4484,7 @@ objects:
44844484
name: data
44854485
readOnly: false
44864486
- args:
4487-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
4487+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
44884488
- --reporter.type=grpc
44894489
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
44904490
env:
@@ -4586,6 +4586,8 @@ parameters:
45864586
value: quay.io/app-sre/jaegertracing-jaeger-agent
45874587
- name: JAEGER_COLLECTOR_NAMESPACE
45884588
value: $(NAMESPACE)
4589+
- name: TRACING_COLLECTOR_ENDPOINT
4590+
value: otel-trace-writer-collector-headless.observatorium-tools.svc:14250
45894591
- name: MEMCACHED_CPU_LIMIT
45904592
value: "3"
45914593
- name: MEMCACHED_CPU_REQUEST

‎resources/services/observatorium-template.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ objects:
13891389
cpu: ${OPA_AMS_CPU_REQUEST}
13901390
memory: ${OPA_AMS_MEMORY_REQUEST}
13911391
- args:
1392-
- --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
1392+
- --reporter.grpc.host-port=dns:///${TRACING_COLLECTOR_ENDPOINT}
13931393
- --reporter.type=grpc
13941394
- --agent.tags=pod.namespace=$(NAMESPACE),pod.name=$(POD)
13951395
env:
@@ -1746,6 +1746,8 @@ parameters:
17461746
value: jaegertracing/jaeger-agent
17471747
- name: JAEGER_COLLECTOR_NAMESPACE
17481748
value: $(NAMESPACE)
1749+
- name: TRACING_COLLECTOR_ENDPOINT
1750+
value: otel-trace-writer-collector-headless.observatorium-tools.svc:14250
17491751
- name: MEMCACHED_CONNECTION_LIMIT
17501752
value: "3072"
17511753
- name: MEMCACHED_CPU_LIMIT

‎services/observatorium-metrics-template-overwrites.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ local thanosRuleSyncer = import './sidecars/thanos-rule-syncer.libsonnet';
3030
// JaegerAgent sidecar shared across components, thus instantiated outside components.
3131
local jaegerAgentSidecar = jaegerAgent({
3232
image: '${JAEGER_AGENT_IMAGE}:${JAEGER_AGENT_IMAGE_TAG}',
33-
collectorAddress: 'dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250',
33+
collectorAddress: 'dns:///${TRACING_COLLECTOR_ENDPOINT}',
3434
}),
3535

3636
local ruleSyncerVolume = 'rule-syncer',

‎services/observatorium-metrics-template.jsonnet

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ local obs = import 'observatorium.libsonnet';
3636
{ name: 'JAEGER_AGENT_IMAGE_TAG', value: '1.29.0' },
3737
{ name: 'JAEGER_AGENT_IMAGE', value: 'quay.io/app-sre/jaegertracing-jaeger-agent' },
3838
{ name: 'JAEGER_COLLECTOR_NAMESPACE', value: '$(NAMESPACE)' },
39+
{ name: 'TRACING_COLLECTOR_ENDPOINT', value: 'otel-trace-writer-collector-headless.observatorium-tools.svc:14250' },
3940
{ name: 'MEMCACHED_CPU_LIMIT', value: '3' },
4041
{ name: 'MEMCACHED_CPU_REQUEST', value: '500m' },
4142
{ name: 'MEMCACHED_EXPORTER_CPU_LIMIT', value: '200m' },

‎services/observatorium-template.jsonnet

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ local obs = import 'observatorium.libsonnet';
3535
{ name: 'JAEGER_AGENT_IMAGE_TAG', value: '1.29.0' },
3636
{ name: 'JAEGER_AGENT_IMAGE', value: 'jaegertracing/jaeger-agent' },
3737
{ name: 'JAEGER_COLLECTOR_NAMESPACE', value: '$(NAMESPACE)' },
38+
{ name: 'TRACING_COLLECTOR_ENDPOINT', value: 'otel-trace-writer-collector-headless.observatorium-tools.svc:14250' },
3839
{ name: 'MEMCACHED_CONNECTION_LIMIT', value: '3072' },
3940
{ name: 'MEMCACHED_CPU_LIMIT', value: '3' },
4041
{ name: 'MEMCACHED_CPU_REQUEST', value: '500m' },

‎services/observatorium.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ local obsctlReloader = (import 'github.com/rhobs/obsctl-reloader/jsonnet/lib/obs
535535

536536
local jaegerAgent = (import './sidecars/jaeger-agent.libsonnet')({
537537
image: '${JAEGER_AGENT_IMAGE}:${JAEGER_AGENT_IMAGE_TAG}',
538-
collectorAddress: 'dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250',
538+
collectorAddress: 'dns:///${TRACING_COLLECTOR_ENDPOINT}',
539539
}),
540540

541541
local opaAms = (import 'sidecars/opa-ams.libsonnet')({

0 commit comments

Comments
 (0)