Add kube_*_annotations metrics #1468

sylr · 2021-04-29T13:40:35Z

What this PR does / why we need it:

Adds kube_annotations for every existing kube_labels counter parts.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

k8s-ci-robot · 2021-04-29T13:40:42Z

Welcome @sylr!

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. 😃

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

sylr · 2021-05-18T09:04:03Z

Hi @brancz, @mrueg 👋

Could I have a first feedback about this ?

Thank you.

brancz · 2021-06-07T13:23:25Z

I'm generally happy with this. cc @lilic as she lead the label allow work

(I tried to approve the CI run, but github is returning 500 errors consistently every time I press it)

lilic · 2021-06-07T13:30:02Z

I get the same error yes, but works on other PRs. Can you maybe force push @sylr, thanks!

sylr · 2021-06-07T13:34:50Z

I merged master into this branch to trigger the CI.

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

siegenthalerroger · 2021-06-21T09:13:21Z

I'm just going to leave a link to the relevant issue here so that the PR is correctly linked to the issue with lots of discussion. #941

Furthermore it's probably important to get @sylr 's thoughts on #1495 as it appears to solve the same use-case but more closely following the design of the label metric

sylr · 2021-06-25T13:18:22Z

@lilic can you approve the workflow please ?

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

docs/cli-arguments.md

lilic

A couple of comments, thanks for your patience! We can do majority in a follow up as well if you agree to it or in this tone.

docs/cli-arguments.md

lilic · 2021-07-13T08:18:14Z

internal/store/utils.go

@@ -172,6 +176,26 @@ func isPrefixedNativeResource(name v1.ResourceName) bool {
 	return strings.Contains(string(name), v1.ResourceDefaultNamespacePrefix)
 }

+// createAnnotationKeysValues takes in passed kubernetes annotations and allowed list in kubernetes label format


Suggested change

// createAnnotationKeysValues takes in passed kubernetes annotations and allowed list in kubernetes label format

// createAnnotationKeysValues takes in passed kubernetes annotations and an allowed list in Kubernetes label format

internal/store/utils.go

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

Co-authored-by: Damien Grisonnet <damien.grisonnet@epita.fr>

sylr · 2021-08-19T14:33:39Z

Guys, could we move forward and merge this ?

The size of it PR make it so basically any other PR merged onto master will create conflicts, I already performed two merge/conflicts resolutions.

dgrisonnet

/lgtm

mrueg · 2021-08-19T16:01:21Z

/hold cancel
/lgtm
Thanks for your contribution @sylr !

k8s-ci-robot · 2021-08-19T16:01:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, lilic, mrueg, sylr

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:

~~OWNERS~~ [lilic,mrueg]

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

* [FEATURE] Add --use-apiserver-cache flag to set resourceVersion=0 for ListWatch requests kubernetes#1548 * [FEATURE] Introduce metrics for Kubernetes object annotations kubernetes#1468 * [FEATURE] Introduce start time metric for containers in terminated state kubernetes#1519 * [FEATURE] Introduce metrics for cronjob job history limits kubernetes#1535 * [FEATURE] Add system_uuid dimension to kube_node_info metric kubernetes#1535 * [FEATURE] Add available replica metric for statefulsets kubernetes#1532 * [FEATURE] Add ready replica metric for deployments kubernetes#1534 * [CHANGE] Update go clients for Kubernetes to support 1.22 kubernetes#1545 * [CHANGE] Use new promlint package and update prometheus cli to 2.28.1 kubernetes#1531

…eration This PR fixes the regression introduced on `kube_persistentvolumeclaim_labels` functionality after kubernetes#1468. This also implements `kube_persistentvolumeclaim_annotations`. Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

…#1362) * Enable configuring kubernetes annotation metrics With kubernetes/kube-state-metrics#1468 kube-state-metrics v2.2.0 added the possibility to configure annotation metrics, similar to how label metrics are currently configured. This change adds a configuration option for configuring annotation metrics to this helm chart. Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de> * Bump chart version Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de>

…eration This PR fixes the regression introduced on `kube_persistentvolumeclaim_labels` functionality after kubernetes#1468. This also implements `kube_persistentvolumeclaim_annotations`. Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

…prometheus-community#1362) * Enable configuring kubernetes annotation metrics With kubernetes/kube-state-metrics#1468 kube-state-metrics v2.2.0 added the possibility to configure annotation metrics, similar to how label metrics are currently configured. This change adds a configuration option for configuring annotation metrics to this helm chart. Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de> * Bump chart version Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de> Signed-off-by: QuentinBisson <quentin@giantswarm.io>

These metrics were added in kubernetes/kube-state-metrics#1468 but for us don't add any valuable information. Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

… (#1362) * Enable configuring kubernetes annotation metrics With kubernetes/kube-state-metrics#1468 kube-state-metrics v2.2.0 added the possibility to configure annotation metrics, similar to how label metrics are currently configured. This change adds a configuration option for configuring annotation metrics to this helm chart. Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de> * Bump chart version Signed-off-by: Maximilian Bischoff <maximilian.bischoff@inovex.de>

These metrics were added in kubernetes/kube-state-metrics#1468 but for us don't add any valuable information. Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 29, 2021

k8s-ci-robot requested review from brancz and mrueg April 29, 2021 13:40

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 29, 2021

sylr marked this pull request as draft April 29, 2021 13:49

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 29, 2021

Add kube_*_annotations metrics

65bc62a

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

sylr force-pushed the annotations branch from 9bafabf to 65bc62a Compare April 29, 2021 14:17

sylr marked this pull request as ready for review April 30, 2021 07:23

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 30, 2021

lilic mentioned this pull request Jun 7, 2021

Add annotation metrics #1495

Closed

Merge remote-tracking branch 'origin/master' into annotations

c0cb475

sylr added 2 commits June 7, 2021 15:59

Regenerate docs/cli-arguments.md

adcf2b4

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

Fix benchmark test

1cd06cf

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

Fix documentation and tests

c1d3c87

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

sylr force-pushed the annotations branch from 0250577 to c1d3c87 Compare June 25, 2021 13:47

fpetkovski mentioned this pull request Jun 30, 2021

Expose annotations and labels on configmaps #1503

Closed

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 6, 2021

Merge remote-tracking branch 'origin/master' into annotations

754aeb7

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 7, 2021

logicalhan reviewed Jul 8, 2021

View reviewed changes

docs/cli-arguments.md Show resolved Hide resolved

lilic reviewed Jul 13, 2021

View reviewed changes

Move option in the cli arguments list

b60508b

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

Fix kube_horizontalpodautoscaler_annotations status

81db7e0

Co-authored-by: Damien Grisonnet <damien.grisonnet@epita.fr>

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2021

Merge remote-tracking branch 'origin/master' into annotations

0e45534

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2021

dgrisonnet approved these changes Aug 19, 2021

View reviewed changes

k8s-ci-robot assigned dgrisonnet Aug 19, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2021

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 19, 2021

k8s-ci-robot assigned mrueg Aug 19, 2021

k8s-ci-robot merged commit 3193891 into kubernetes:master Aug 19, 2021

mrueg mentioned this pull request Aug 19, 2021

*: Cut v2.2.0 release #1550

Merged

arajkumar mentioned this pull request Aug 31, 2021

persistentvolumeclaim: Implement annotation and fix label metrics generation #1566

Merged

dgrisonnet mentioned this pull request Sep 9, 2021

annotation metrics, what is the future direction? #941

Closed

george-angel mentioned this pull request Sep 10, 2021

Option for exporting deployment annotations. utilitywarehouse/kube-annotations-exporter#9

Closed

maxbischoff mentioned this pull request Sep 21, 2021

[kube-state-metrics] Enable configuring kubernetes annotation metrics prometheus-community/helm-charts#1362

Merged

3 tasks

simonpasquier mentioned this pull request Oct 8, 2021

MON-1890: Bump to v2.2.0 openshift/kube-state-metrics#61

Merged

jan--f mentioned this pull request Oct 12, 2021

KSM: add kube_*_annotations to --metric-denylist arg openshift/cluster-monitoring-operator#1426

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add kube_*_annotations metrics #1468

Add kube_*_annotations metrics #1468

sylr commented Apr 29, 2021

k8s-ci-robot commented Apr 29, 2021

sylr commented May 18, 2021

brancz commented Jun 7, 2021

lilic commented Jun 7, 2021

sylr commented Jun 7, 2021

siegenthalerroger commented Jun 21, 2021

sylr commented Jun 25, 2021

lilic left a comment

lilic Jul 13, 2021

sylr commented Aug 19, 2021

dgrisonnet left a comment

mrueg commented Aug 19, 2021

k8s-ci-robot commented Aug 19, 2021

	// createAnnotationKeysValues takes in passed kubernetes annotations and allowed list in kubernetes label format
	// createAnnotationKeysValues takes in passed kubernetes annotations and an allowed list in Kubernetes label format

Add kube_*_annotations metrics #1468

Add kube_*_annotations metrics #1468

Conversation

sylr commented Apr 29, 2021

k8s-ci-robot commented Apr 29, 2021

sylr commented May 18, 2021

brancz commented Jun 7, 2021

lilic commented Jun 7, 2021

sylr commented Jun 7, 2021

siegenthalerroger commented Jun 21, 2021

sylr commented Jun 25, 2021

lilic left a comment

Choose a reason for hiding this comment

lilic Jul 13, 2021

Choose a reason for hiding this comment

sylr commented Aug 19, 2021

dgrisonnet left a comment

Choose a reason for hiding this comment

mrueg commented Aug 19, 2021

k8s-ci-robot commented Aug 19, 2021