Skip to content

Add service.name field and drop_origin: true #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 11, 2024
Merged

Add service.name field and drop_origin: true #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
406e074
add service.name and drop_origin
tetianakravchenko Oct 10, 2024
3656fe0
fix typo
tetianakravchenko Oct 10, 2024
de9d5ef
fix typo
tetianakravchenko Oct 10, 2024
f71bce4
remove redundant fields
tetianakravchenko Oct 10, 2024
9592941
split installation and upgrade commands
tetianakravchenko Oct 11, 2024
58860b3
remove k8s.container.name
tetianakravchenko Oct 11, 2024
8565bf8
use helm upgrade --install
tetianakravchenko Oct 11, 2024
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
2 changes: 1 addition & 1 deletion docs/onboarding/8_16/operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ $ kubectl create namespace opentelemetry-operator-system
```
$ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
$ helm repo update
$ helm install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2
$ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2
```

## Limitations
Expand Down
27 changes: 27 additions & 0 deletions resources/kubernetes/operator/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ collectors:
- key: service.name
from_attribute: app.label.component
action: insert
- key: service.name
from_attribute: k8s.container.name
action: insert
- key: app.label.component
action: delete
- key: service.version
from_attribute: app.label.version
action: insert
- key: app.label.version
action: delete
k8sattributes:
passthrough: false
pod_association:
Expand Down Expand Up @@ -114,6 +124,9 @@ collectors:
- tag_name: app.label.component
key: app.kubernetes.io/component
from: pod
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
receivers:
k8s_cluster:
auth_type: serviceAccount
Expand Down Expand Up @@ -205,6 +218,7 @@ collectors:
elasticinframetrics:
add_system_metrics: true
add_k8s_metrics: true
drop_original: true
resourcedetection/eks:
detectors: [env, eks]
timeout: 15s
Expand All @@ -230,6 +244,16 @@ collectors:
- key: service.name
from_attribute: app.label.component
action: insert
- key: service.name
from_attribute: k8s.container.name
action: insert
- key: app.label.component
action: delete
- key: service.version
from_attribute: app.label.version
action: insert
- key: app.label.version
action: delete
attributes/dataset:
actions:
- key: event.dataset
Expand Down Expand Up @@ -314,6 +338,9 @@ collectors:
- tag_name: app.label.component
key: app.kubernetes.io/component
from: pod
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
receivers:
otlp:
protocols:
Expand Down