diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 0f409f6c03..ea9671f46c 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -34,14 +34,7 @@ "enabled": false } ], - "customManagers": [ - { - "customType": "regex", - "managerFilePatterns": ["lgtm.yaml"], - "matchStrings": ["grafana/otel-lgtm:(?.*?)\\n"], - "depNameTemplate": "otel-lgtm", - "packageNameTemplate": "grafana/otel-lgtm", - "datasourceTemplate": "docker" - } - ] + "kubernetes": { + "managerFilePatterns": ["/^logging-k8s-stdout-otlp-json/k8s/.+\\.yaml$/"] + } } diff --git a/logging-k8s-stdout-otlp-json/k8s/collector-configmap.yaml b/logging-k8s-stdout-otlp-json/k8s/collector-configmap.yaml index 5a53fea874..e4a453b8a4 100644 --- a/logging-k8s-stdout-otlp-json/k8s/collector-configmap.yaml +++ b/logging-k8s-stdout-otlp-json/k8s/collector-configmap.yaml @@ -11,12 +11,6 @@ data: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - prometheus/collector: # needed if you use the docker-lgtm image - config: - scrape_configs: - - job_name: 'opentelemetry-collector' - static_configs: - - targets: [ 'localhost:8888' ] filelog/otlp-json-logs: include: - /var/log/pods/*/*/*.log @@ -24,7 +18,13 @@ data: operators: - id: container-parser type: container - + + extensions: + # needed if you use the docker-lgtm image + health_check: + endpoint: 0.0.0.0:13133 + path: "/ready" + processors: batch: resourcedetection: @@ -53,13 +53,14 @@ data: nop: service: + extensions: [health_check] pipelines: traces: receivers: [ otlp ] processors: [ k8sattributes, resourcedetection, batch ] exporters: [ otlphttp/traces ] metrics: - receivers: [ otlp, prometheus/collector ] + receivers: [ otlp ] processors: [ k8sattributes, resourcedetection, batch ] exporters: [ otlphttp/metrics ] logs/raw_otlpjson: diff --git a/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml b/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml index c41ee2590a..96f79e5c95 100644 --- a/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml +++ b/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml @@ -47,7 +47,7 @@ spec: spec: containers: - name: lgtm - image: grafana/otel-lgtm:0.10.1 + image: grafana/otel-lgtm:0.11.1 ports: - containerPort: 3000 - containerPort: 4317