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

2047: Add LabelsFromPath functionality to Info metrics #2048

Merged
merged 1 commit into from
Apr 26, 2023

Conversation

murphd40
Copy link
Contributor

@murphd40 murphd40 commented Apr 14, 2023

What this PR does / why we need it:

This PR adds LabelsFromPath functionality to Info type metrics defined via a customresourcestate.Resource

How does this change affect the cardinality of KSM: (increases, decreases or does not change cardinality)

May increase under certain conditions (use of custom resource metrics of type info)

Which issue(s) this PR fixes

Fixes #2047


Testing

  • unit tests updated ✅
  • manually verified:
package main

import (
	"fmt"
	"strings"

	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
	"k8s.io/kube-state-metrics/v2/pkg/customresourcestate"
)

func main() {

	foo := unstructured.Unstructured{
		Object: map[string]any{
			"status": map[string]any {
				"sub": map[string]any {
					"type-a": map[string]any {
						"active": 1,
						"ready": 2,
					},
					"type-b": map[string]any {
						"active": 3,
						"ready": 4,
					},
				},
			},
		},
	}

	r := customresourcestate.Resource{
		GroupVersionKind: customresourcestate.GroupVersionKind{
			Group: "myteam.io",
			Version: "v1",
			Kind: "Foo",
		},
		Metrics: []customresourcestate.Generator{
			{
				Name: "gauge",
				Each: customresourcestate.Metric{
					Type: customresourcestate.MetricTypeGauge,
					Gauge: &customresourcestate.MetricGauge{
						MetricMeta: customresourcestate.MetricMeta{
							Path: []string{"status", "sub"},
							LabelsFromPath: map[string][]string{
								"active": {"active"},
							},
						},
						LabelFromKey: "type",
						ValueFrom: []string{"ready"},
					},
				},
			},
			{
				Name: "info",
				Each: customresourcestate.Metric{
					Type: customresourcestate.MetricTypeInfo,
					Info: &customresourcestate.MetricInfo{
						MetricMeta: customresourcestate.MetricMeta{
							Path: []string{"status", "sub"},
							LabelsFromPath: map[string][]string{
								"active": {"active"},
							},
						},
						LabelFromKey: "type",
					},
				},
			},
		},
	}

	f, _ := customresourcestate.NewCustomResourceMetrics(r)
	
	fgs := f.MetricFamilyGenerators(nil, nil)

	sb := strings.Builder{}
	for _, fg := range fgs {
		mf := fg.Generate(&foo)
		sb.WriteString(mf.Name + "\n")
		for _, m := range mf.Metrics {
			m.Write(&sb)
		}
	}

	fmt.Println(sb.String())

}

Before

go run foo/foo.go
I0414 15:19:35.573271   76061 custom_resource_metrics.go:79] "Custom resource state added metrics" familyNames=[kube_customresource_gauge kube_customresource_info]
kube_customresource_gauge
{active="1",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-a"} 2
{active="3",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-b"} 4
kube_customresource_info
{customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-a"} 1
{customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-b"} 1

After

go run foo/foo.go
I0414 17:18:39.914212   92158 custom_resource_metrics.go:79] "Custom resource state added metrics" familyNames=[kube_customresource_gauge kube_customresource_info]
kube_customresource_gauge
{active="1",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-a"} 2
{active="3",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-b"} 4
kube_customresource_info
{active="1",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-a"} 1
{active="3",customresource_group="myteam.io",customresource_kind="Foo",customresource_version="v1",type="type-b"} 1

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Apr 14, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 14, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If kube-state-metrics contributors determine this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Apr 14, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @murphd40!

It looks like this is your first PR to kubernetes/kube-state-metrics 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kube-state-metrics has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 14, 2023
Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 26, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, murphd40

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 26, 2023
@dgrisonnet
Copy link
Member

@murphd40 thank for contributing the fix and adding a unit test! :)

@k8s-ci-robot k8s-ci-robot merged commit 32f8c5e into kubernetes:main Apr 26, 2023
@murphd40 murphd40 deleted the 2047 branch April 28, 2023 09:07
@rexagod rexagod mentioned this pull request May 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistency between Gauge and Info behaviours regarding objects in path for Custom Resource State Metrics
3 participants