Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,7 @@
"enabled": false
}
],
"customManagers": [
{
"customType": "regex",
"managerFilePatterns": ["lgtm.yaml"],
"matchStrings": ["grafana/otel-lgtm:(?<currentValue>.*?)\\n"],
"depNameTemplate": "otel-lgtm",
"packageNameTemplate": "grafana/otel-lgtm",
"datasourceTemplate": "docker"
}
]
"kubernetes": {
"managerFilePatterns": ["/^logging-k8s-stdout-otlp-json/k8s/.+\\.yaml$/"]
}
}
17 changes: 9 additions & 8 deletions logging-k8s-stdout-otlp-json/k8s/collector-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ 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
include_file_path: true
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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion logging-k8s-stdout-otlp-json/k8s/lgtm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading