Skip to content
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.

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

[receiver/kubeletstats] Bring back k8s.container.name attribute #10848

Merged
merged 1 commit into from
Jun 9, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

### 🧰 Bug fixes 🧰

- `kubletetstatsreceiver`: Bring back `k8s.container.name` attribute (#10848)

## v0.53.0

### 🛑 Breaking changes 🛑
Expand Down
2 changes: 1 addition & 1 deletion receiver/kubeletstatsreceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ metrics:
| ---- | ----------- | ---- |
| aws.volume.id | The id of the AWS Volume | String |
| container.id | Container id used to identify container | String |
| container.name | Container name used by container runtime | String |
| fs.type | The filesystem type of the Volume | String |
| gce.pd.name | The name of the persistent disk in GCE | String |
| glusterfs.endpoints.name | The endpoint name that details Glusterfs topology | String |
| glusterfs.path | Glusterfs volume path | String |
| k8s.container.name | Container name used by container runtime | String |
| k8s.namespace.name | The name of the namespace that the pod is running in | String |
| k8s.node.name | The name of the Node | String |
| k8s.persistentvolumeclaim.name | The name of the Persistent Volume Claim | String |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func getContainerResourceOptions(sPod stats.PodStats, sContainer stats.Container
metadata.WithK8sPodUID(sPod.PodRef.UID),
metadata.WithK8sPodName(sPod.PodRef.Name),
metadata.WithK8sNamespaceName(sPod.PodRef.Namespace),
metadata.WithContainerName(sContainer.Name),
metadata.WithK8sContainerName(sContainer.Name),
}

extraResources, err := k8sMetadata.getExtraResources(sPod.PodRef, MetadataLabelContainerID, sContainer.Name)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/kubeletstatsreceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resource_attributes:
k8s.namespace.name:
description: "The name of the namespace that the pod is running in"
type: string
container.name:
k8s.container.name:
description: "Container name used by container runtime"
type: string
container.id:
Expand Down