diff --git a/Makefile b/Makefile index a589e82..e0f621f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -OTELCOL_BUILDER_VERSION ?= 0.1.3 +OTELCOL_BUILDER_VERSION ?= 0.2.0 OTELCOL_BUILDER_DIR ?= ~/bin OTELCOL_BUILDER ?= $(OTELCOL_BUILDER_DIR)/opentelemetry-collector-builder diff --git a/collector.yaml b/collector.yaml index f15677a..1d6768e 100644 --- a/collector.yaml +++ b/collector.yaml @@ -3,15 +3,13 @@ extensions: receivers: otlp: - protocols: - grpc: - endpoint: localhost:55680 - auth: - oidc: - issuer_url: https://dex.dex.svc.cluster.local:5556/dex - audience: test - issuer_ca_path: /etc/pki/ca-trust/source/anchors/cacert.crt - username_claim: email + endpoint: localhost:4317 + auth: + oidc: + issuer_url: https://dex.dex.svc.cluster.local:5556/dex + audience: test + issuer_ca_path: /etc/pki/ca-trust/source/anchors/cacert.crt + username_claim: email processors: # this processor will read an env var named OTEL_RESOURCE (key=value,key2=value2) and add each key-value pair as a resource attribute diff --git a/deploy/observatorium-otelcol.yaml b/deploy/observatorium-otelcol.yaml index 0e5de4b..637b226 100644 --- a/deploy/observatorium-otelcol.yaml +++ b/deploy/observatorium-otelcol.yaml @@ -16,15 +16,13 @@ data: receivers: otlp: - protocols: - grpc: - endpoint: localhost:55680 - auth: - oidc: - issuer_url: https://dex.dex.svc.cluster.local:5556/dex - audience: test - issuer_ca_path: /etc/pki/ca-trust/source/anchors/service-ca.crt - username_claim: email + endpoint: localhost:4317 + auth: + oidc: + issuer_url: https://dex.dex.svc.cluster.local:5556/dex + audience: test + issuer_ca_path: /etc/pki/ca-trust/source/anchors/service-ca.crt + username_claim: email processors: # this processor will read an env var named OTEL_RESOURCE (key=value,key2=value2) and add each key-value pair as a resource attribute @@ -68,8 +66,8 @@ metadata: app: observatorium-otelcol spec: ports: - - port: 55680 - targetPort: 55680 + - port: 4317 + targetPort: 4317 selector: app: observatorium-otelcol --- @@ -96,7 +94,7 @@ spec: cpu: 200m memory: 512Mi ports: - - containerPort: 55680 + - containerPort: 4317 volumeMounts: - name: otelcol-config mountPath: /etc/otelcol diff --git a/manifest.yaml b/manifest.yaml index 38b37ad..35331d9 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,18 +2,18 @@ dist: module: github.com/observatorium/observatorium-otelcol name: observatorium-otelcol description: Observatorium OpenTelemetry Collector Distribution - version: 0.3.0 + version: 0.4.0 output_path: ./_build - otelcol_version: 0.14.0 + otelcol_version: 0.16.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.14.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.14.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.14.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.16.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.16.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.16.0 replaces: # needed because the k8sprocessor references version v0 (local by the build) - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.14.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.16.0 # needed because the resourcedetectionprocessor references version v0 (local by the build) - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.14.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.16.0