Skip to content

Commit

Permalink
[receiver/k8scluster] add k8s.container.status.last_terminated_reason…
Browse files Browse the repository at this point in the history
… resource attribute (#31505)

**Description:** 
Add k8s.container.status.last_terminated_reason resource attribute

**Link to tracking Issue:** #31282
  • Loading branch information
povilasv authored Mar 12, 2024
1 parent 02a89ad commit 660c59a
Show file tree
Hide file tree
Showing 14 changed files with 260 additions and 187 deletions.
27 changes: 27 additions & 0 deletions .chloggen/main-resource-attribute.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: k8sclusterreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "add optional status_last_terminated_reason resource attribute"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [31282]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
1 change: 1 addition & 0 deletions receiver/k8sclusterreceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4
| container.runtime | The container runtime used by Kubernetes Node. | Any Str | false |
| container.runtime.version | The version of container runtime used by Kubernetes Node. | Any Str | false |
| k8s.container.name | The k8s container name | Any Str | true |
| k8s.container.status.last_terminated_reason | Last terminated reason of a container. | Any Str | false |
| k8s.cronjob.name | The k8s CronJob name | Any Str | true |
| k8s.cronjob.uid | The k8s CronJob uid. | Any Str | true |
| k8s.daemonset.name | The k8s daemonset name. | Any Str | true |
Expand Down
6 changes: 5 additions & 1 deletion receiver/k8sclusterreceiver/internal/container/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
logger.Debug("unsupported request type", zap.Any("type", k))
}
}

rb := mb.NewResourceBuilder()
var containerID string
var imageStr string
for _, cs := range pod.Status.ContainerStatuses {
Expand All @@ -68,11 +70,13 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
imageStr = cs.Image
mb.RecordK8sContainerRestartsDataPoint(ts, int64(cs.RestartCount))
mb.RecordK8sContainerReadyDataPoint(ts, boolToInt64(cs.Ready))
if cs.LastTerminationState.Terminated != nil {
rb.SetK8sContainerStatusLastTerminatedReason(cs.LastTerminationState.Terminated.Reason)
}
break
}
}

rb := mb.NewResourceBuilder()
rb.SetK8sPodUID(string(pod.UID))
rb.SetK8sPodName(pod.Name)
rb.SetK8sNodeName(pod.Spec.NodeName)
Expand Down
76 changes: 40 additions & 36 deletions receiver/k8sclusterreceiver/internal/metadata/generated_config.go

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

Loading

0 comments on commit 660c59a

Please sign in to comment.