Merge branch 'v1.13' into paulyuk-patch-4

This commit is contained in:
Mike Nguyen 2024-05-31 00:52:17 +01:00 committed by GitHub
commit 61e65296a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions

View File

@ -17,8 +17,8 @@ data:
zpages: zpages:
endpoint: :55679 endpoint: :55679
exporters: exporters:
logging: debug:
loglevel: debug verbosity: basic
azuremonitor: azuremonitor:
endpoint: "https://dc.services.visualstudio.com/v2/track" endpoint: "https://dc.services.visualstudio.com/v2/track"
instrumentation_key: "<INSTRUMENTATION-KEY>" instrumentation_key: "<INSTRUMENTATION-KEY>"
@ -33,7 +33,7 @@ data:
pipelines: pipelines:
traces: traces:
receivers: [zipkin] receivers: [zipkin]
exporters: [azuremonitor,logging] exporters: [azuremonitor,debug]
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -71,7 +71,7 @@ spec:
spec: spec:
containers: containers:
- name: otel-collector - name: otel-collector
image: otel/opentelemetry-collector-contrib:0.77.0 image: otel/opentelemetry-collector-contrib:0.101.0
command: command:
- "/otelcol-contrib" - "/otelcol-contrib"
- "--config=/conf/otel-collector-config.yaml" - "--config=/conf/otel-collector-config.yaml"