-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add /pods endpoint support in kubeletstats receiver to add extra labels
This commits adds ability to optionally fetch extra metadata from /pods endpoint in kubeletstats receiver and use that data to set additional labels on metric resource. For now only container.id label is supported
- Loading branch information
Showing
22 changed files
with
628 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2020, OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package kubelet | ||
|
|
||
| const ( | ||
| labelContainerID = "container.id" | ||
| labelContainerName = "container.name" | ||
| labelNamespaceName = "k8s.namespace.name" | ||
| labelNodeName = "k8s.node.name" | ||
| labelPodName = "k8s.pod.name" | ||
| labelPodUID = "k8s.pod.uid" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // Copyright 2020, OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package kubelet | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
|
|
||
| "github.com/pkg/errors" | ||
| v1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| type MetadataLabel string | ||
|
|
||
| const ( | ||
| MetadataLabelContainerID MetadataLabel = labelContainerID | ||
| ) | ||
|
|
||
| var supportedLabels = map[MetadataLabel]bool{ | ||
| MetadataLabelContainerID: true, | ||
| } | ||
|
|
||
| // ValidateMetadataLabelsConfig validates that provided list of metadata labels is supported | ||
| func ValidateMetadataLabelsConfig(labels []MetadataLabel) error { | ||
| labelsFound := map[MetadataLabel]bool{} | ||
| for _, label := range labels { | ||
| if _, supported := supportedLabels[label]; supported { | ||
| if _, duplicate := labelsFound[label]; duplicate { | ||
| return fmt.Errorf("duplicate found in extra_metadata_labels: %q ", label) | ||
| } | ||
| labelsFound[label] = true | ||
| } else { | ||
| return fmt.Errorf("label %q is not supported", label) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| type Metadata struct { | ||
| Labels []MetadataLabel | ||
| PodsMetadata *v1.PodList | ||
| } | ||
|
|
||
| func NewMetadata(labels []MetadataLabel, podsMetadata *v1.PodList) Metadata { | ||
| return Metadata{ | ||
| Labels: labels, | ||
| PodsMetadata: podsMetadata, | ||
| } | ||
| } | ||
|
|
||
| // setExtraLabels sets extra labels in `lables` map based on available metadata | ||
| func (m *Metadata) setExtraLabels(labels map[string]string, podUID string, containerName string) error { | ||
| for _, label := range m.Labels { | ||
| switch label { | ||
| case MetadataLabelContainerID: | ||
| containerID, err := m.getContainerID(podUID, containerName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| labels[labelContainerID] = containerID | ||
| return nil | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // getContainerID retrieves container id from metadata for given pod UID and container name, | ||
| // returns an error if no container found in the metadata that matches the requirements. | ||
| func (m *Metadata) getContainerID(podUID string, containerName string) (string, error) { | ||
| if m.PodsMetadata == nil { | ||
| return "", errors.New("pods metadata were not fetched") | ||
| } | ||
|
|
||
| for _, pod := range m.PodsMetadata.Items { | ||
| if pod.UID == types.UID(podUID) { | ||
| for _, containerStatus := range pod.Status.ContainerStatuses { | ||
| if containerName == containerStatus.Name { | ||
| return stripContainerID(containerStatus.ContainerID), nil | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return "", fmt.Errorf("pod %q with container %q not found in the fetched metadata", podUID, containerName) | ||
| } | ||
|
|
||
| var containerSchemeRegexp = regexp.MustCompile(`^[\w_-]+://`) | ||
|
|
||
| // stripContainerID returns a pure container id without the runtime scheme:// | ||
| func stripContainerID(id string) string { | ||
| return containerSchemeRegexp.ReplaceAllString(id, "") | ||
| } |
46 changes: 46 additions & 0 deletions
46
receiver/kubeletstatsreceiver/kubelet/metadata_provider.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Copyright 2020, OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package kubelet | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| ) | ||
|
|
||
| // MetadataProvider wraps a RestClient, returning an unmarshaled | ||
| // Metadata.Summary struct from the kubelet API. | ||
| type MetadataProvider struct { | ||
| rc RestClient | ||
| } | ||
|
|
||
| func NewMetadataProvider(rc RestClient) *MetadataProvider { | ||
| return &MetadataProvider{rc: rc} | ||
| } | ||
|
|
||
| // Pods calls the /pods endpoint and unmarshals the | ||
| // results into a v1.PodList struct. | ||
| func (p *MetadataProvider) Pods() (*v1.PodList, error) { | ||
| pods, err := p.rc.Pods() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var out v1.PodList | ||
| err = json.Unmarshal(pods, &out) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &out, nil | ||
| } |
Oops, something went wrong.