Skip to content

Commit 1cf7fcd

Browse files
authored
Merge pull request kubernetes#2520 from wojtek-t/update_metrics_stability
Cleanup metadata in metrics stability kep
2 parents d1bb965 + 3bf05f4 commit 1cf7fcd

File tree

9 files changed

+40
-144
lines changed

9 files changed

+40
-144
lines changed

keps/sig-api-machinery/1693-warnings/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ disable the server sending warnings during the beta period.
276276
* Implement in-process deprecated API warnings, metrics, audit annotations
277277
* Complete test plan for implemented items
278278
* API server output of `Warning` headers for deprecated API use is feature-gated and enabled by default
279-
* The metric for deprecated API use is registered at [stability level `ALPHA`](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md#stability-classes)
279+
* The metric for deprecated API use is registered at [stability level `ALPHA`](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1290-metrics-stability/kubernetes-control-plane-metrics-stability.md#stability-classes)
280280
* Implement admission webhook warning contributions
281281
* Implement custom resource version deprecation
282282
* client-go logs warnings with code `299` by default
@@ -290,7 +290,7 @@ disable the server sending warnings during the beta period.
290290
* Implement in-process helpers for field-level validation warnings and admission warnings
291291
* Complete test plan for implemented items
292292
* API server output of `Warning` headers for deprecated API use is unconditionally enabled
293-
* Server metric for deprecated API use is registered at [stability level `STABLE`](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md#stability-classes)
293+
* Server metric for deprecated API use is registered at [stability level `STABLE`](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1209-metrics-stability/kubernetes-control-plane-metrics-stability.md#stability-classes)
294294
295295
### Upgrade / Downgrade Strategy
296296

keps/sig-instrumentation/1209-metrics-stability/README.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ Historically, the implementation was split into four documents:
7676

7777
This document is not net new and ties the four together in order to document the lifecycle of this feature.
7878

79-
[Metrics Stability Framework]: 20190404-kubernetes-control-plane-metrics-stability.md
80-
[Metrics Stability Migration]: 20190605-metrics-stability-migration.md
81-
[Metrics Validation and Verification]: 20190605-metrics-validation-and-verification.md
82-
[Metrics Stability to Beta]: 20191028-metrics-stability-to-beta.md
79+
[Metrics Stability Framework]: kubernetes-control-plane-metrics-stability.md
80+
[Metrics Stability Migration]: metrics-stability-migration.md
81+
[Metrics Validation and Verification]: metrics-validation-and-verification.md
82+
[Metrics Stability to Beta]: metrics-stability-to-beta.md
8383

8484
## Motivation
8585

@@ -90,10 +90,10 @@ See:
9090
1. [Metrics Validation and Verification#Motivation]
9191
1. [Metrics Stability to Beta#Motivation]
9292

93-
[Metrics Stability Framework#Motivation]: 20190404-kubernetes-control-plane-metrics-stability.md#motivation
94-
[Metrics Stability Migration#Motivation]: 20190605-metrics-stability-migration.md#motivation
95-
[Metrics Validation and Verification#Motivation]: 20190605-metrics-validation-and-verification.md#motivation
96-
[Metrics Stability to Beta#Motivation]: 20191028-metrics-stability-to-beta.md#motivation
93+
[Metrics Stability Framework#Motivation]: kubernetes-control-plane-metrics-stability.md#motivation
94+
[Metrics Stability Migration#Motivation]: metrics-stability-migration.md#motivation
95+
[Metrics Validation and Verification#Motivation]: metrics-validation-and-verification.md#motivation
96+
[Metrics Stability to Beta#Motivation]: metrics-stability-to-beta.md#motivation
9797

9898
## Proposal
9999

@@ -106,10 +106,10 @@ See:
106106

107107
https://github.com/kubernetes/enhancements/blob/77a84d2d55b5802a615f3fe98e7e7c9bd26c9efc/keps/sig-instrumentation/1209-metrics-stability/keps/sig-instrumentation/1209-metrics-stability/20190404-kubernetes-control-plane-metrics-stability.md#implementation-history
108108

109-
[Metrics Stability Framework#Proposal]: 20190404-kubernetes-control-plane-metrics-stability.md#proposal
110-
[Metrics Stability Migration#General Migration Strategy]: 20190605-metrics-stability-migration.md#general-migration-strategy
111-
[Metrics Validation and Verification#Proposal]: 20190605-metrics-validation-and-verification.md#proposal
112-
[Metrics Stability to Beta#Proposal]: 20191028-metrics-stability-to-beta.md#proposal
109+
[Metrics Stability Framework#Proposal]: kubernetes-control-plane-metrics-stability.md#proposal
110+
[Metrics Stability Migration#General Migration Strategy]: metrics-stability-migration.md#general-migration-strategy
111+
[Metrics Validation and Verification#Proposal]: metrics-validation-and-verification.md#proposal
112+
[Metrics Stability to Beta#Proposal]: metrics-stability-to-beta.md#proposal
113113

114114
## Design Details
115115

@@ -118,8 +118,8 @@ See:
118118
1. [Metrics Stability Framework#Design Details]
119119
1. [Metrics Validation and Verification#Design Details]
120120

121-
[Metrics Stability Framework#Design Details]: 20190404-kubernetes-control-plane-metrics-stability.md#design-details
122-
[Metrics Validation and Verification#Design Details]: 20190605-metrics-validation-and-verification.md#design-details
121+
[Metrics Stability Framework#Design Details]: kubernetes-control-plane-metrics-stability.md#design-details
122+
[Metrics Validation and Verification#Design Details]: metrics-validation-and-verification.md#design-details
123123

124124
### Graduation Criteria
125125

@@ -130,8 +130,8 @@ See:
130130
1. [Metrics Stability Framework#Graduation Criteria]
131131
1. [Metrics Stability Migration#Graduation Criteria]
132132

133-
[Metrics Stability Framework#Graduation Criteria]: 20190404-kubernetes-control-plane-metrics-stability.md#graduation-criteria
134-
[Metrics Stability Migration#Graduation Criteria]: 20190605-metrics-stability-migration.md#graduation-criteria
133+
[Metrics Stability Framework#Graduation Criteria]: kubernetes-control-plane-metrics-stability.md#graduation-criteria
134+
[Metrics Stability Migration#Graduation Criteria]: metrics-stability-migration.md#graduation-criteria
135135

136136
#### Alpha -> Beta Graduation
137137

@@ -140,24 +140,24 @@ See:
140140
1. [Metrics Validation and Verification#Graduation Criteria]
141141
1. [Metrics Stability to Beta#Graduation Criteria]
142142

143-
[Metrics Validation and Verification#Graduation Criteria]: 20190605-metrics-validation-and-verification.md#graduation-criteria
144-
[Metrics Stability to Beta#Graduation Criteria]: 20191028-metrics-stability-to-beta.md#graduation-criteria
143+
[Metrics Validation and Verification#Graduation Criteria]: metrics-validation-and-verification.md#graduation-criteria
144+
[Metrics Stability to Beta#Graduation Criteria]: metrics-stability-to-beta.md#graduation-criteria
145145

146146
#### Beta -> GA Graduation
147147

148148
- Metrics are now eligible to be promoted to STABLE status (we have some candidates in kube-apiserver).
149149
- [apiserver_storage_object_counts](https://github.com/kubernetes/kubernetes/issues/98270)
150150
- `apiserver_request_total` will also be promoted (as discussed in biweekly SIG apimachinery meeting)
151-
- Implement the ability to turn off individual metrics (see [here](20191028-metrics-stability-to-beta.md#non-goals))
151+
- Implement the ability to turn off individual metrics (see [here](metrics-stability-to-beta.md#non-goals))
152152
- We need this because of stuff like this: [Unbounded valuesets for metric labels](https://github.com/kubernetes/kubernetes/issues/76302)
153153

154154
### Upgrade / Downgrade Strategy
155155

156156
See:
157157

158-
- [Deprecation Lifecycle](20190404-kubernetes-control-plane-metrics-stability.md#deprecation-lifecycle)
159-
- [Deprecation of modified metrics from metrics overhaul KEP](20190605-metrics-stability-migration.md#deprecation-of-modified-metrics-from-metrics-overhaul-kep)
160-
- [Escape Hatch](20191028-metrics-stability-to-beta.md#escape-hatch)
158+
- [Deprecation Lifecycle](kubernetes-control-plane-metrics-stability.md#deprecation-lifecycle)
159+
- [Deprecation of modified metrics from metrics overhaul KEP](metrics-stability-migration.md#deprecation-of-modified-metrics-from-metrics-overhaul-kep)
160+
- [Escape Hatch](metrics-stability-to-beta.md#escape-hatch)
161161

162162
https://github.com/kubernetes/enhancements/blob/0f5bb1138a6dfd7f3d52fa901c2fba7abb7fb731/keps/sig-instrumentation/1209-metrics-stability/keps/sig-instrumentation/1209-metrics-stability/20190404-kubernetes-control-plane-metrics-stability.md#implementation-history
163163

@@ -229,7 +229,7 @@ See:
229229
1. [Metrics Validation and Verification#Implementation History]
230230
1. [Metrics Stability to Beta#Implementation History]
231231

232-
[Metrics Stability Framework#Implementation History]: 20190404-kubernetes-control-plane-metrics-stability.md#implementation-history
233-
[Metrics Stability Migration#Implementation History]: 20190605-metrics-stability-migration.md#implementation-history
234-
[Metrics Validation and Verification#Implementation History]: 20190605-metrics-validation-and-verification.md#implementation-history
235-
[Metrics Stability to Beta#Implementation History]: 20191028-metrics-stability-to-beta.md#implementation-history
232+
[Metrics Stability Framework#Implementation History]: kubernetes-control-plane-metrics-stability.md#implementation-history
233+
[Metrics Stability Migration#Implementation History]: metrics-stability-migration.md#implementation-history
234+
[Metrics Validation and Verification#Implementation History]: metrics-validation-and-verification.md#implementation-history
235+
[Metrics Stability to Beta#Implementation History]: metrics-stability-to-beta.md#implementation-history

keps/sig-instrumentation/1209-metrics-stability/kep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ participating-sigs:
1212
- sig-scheduling
1313
- sig-cluster-lifecycle
1414
- sig-cloud-provider
15+
- sig-testing
1516
status: implementable
1617
creation-date: 2019-04-04
1718
reviewers:
Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,3 @@
1-
---
2-
title: Kubernetes Control-Plane Metrics Stability
3-
authors:
4-
- "@logicalhan"
5-
owning-sig: sig-instrumentation
6-
participating-sigs:
7-
- sig-instrumentation
8-
- sig-api-machinery
9-
- sig-node
10-
reviewers:
11-
- "@brancz"
12-
- "@x13n"
13-
- "@DirectXMan12"
14-
- "@lavalamp"
15-
- "@dashpole"
16-
- "@ehashman"
17-
- "@mml"
18-
approvers:
19-
- "@brancz"
20-
- "@x13n"
21-
editor: "@brancz"
22-
creation-date: 2019-04-04
23-
last-updated: 2020-10-14
24-
stage: beta
25-
status: implementable
26-
see-also:
27-
- 20181106-kubernetes-metrics-overhaul
28-
---
29-
301
# Kubernetes Control-Plane Metrics Stability
312

323
## Table of Contents
@@ -331,11 +302,11 @@ Alternatively, one lightweight solution which was previously suggested was docum
331302
332303
### Static Analysis for Validation
333304
334-
[_resolved_](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190605-metrics-validation-and-verification.md)
305+
[_resolved_](./metrics-validation-and-verification.md)
335306
336307
### Beta Stability Level
337308
338-
_discussed during [stability-to-beta](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20191028-metrics-stability-to-beta.md), and decided it wasn't necessary_
309+
_discussed during [stability-to-beta](./metrics-stability-to-beta.md), and decided it wasn't necessary_
339310

340311
### Prometheus Labels vs OpenCensus-type Tags
341312

keps/sig-instrumentation/1209-metrics-stability/20190605-metrics-stability-migration.md renamed to keps/sig-instrumentation/1209-metrics-stability/metrics-stability-migration.md

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,3 @@
1-
---
2-
title: Metrics Stability Migration
3-
authors:
4-
- "@logicalhan"
5-
- "@solodov"
6-
owning-sig: sig-instrumentation
7-
participating-sigs:
8-
- sig-scheduling
9-
- sig-node
10-
- sig-api-machinery
11-
- sig-cluster-lifecycle
12-
- sig-cloud-provider
13-
reviewers:
14-
- "@brancz from sig-instrumentation"
15-
- "@dashpole from sig-node"
16-
- "@sttts from sig-api-machinery"
17-
- "@DirectXMan12 from sig-cluster-lifecycle"
18-
- "@bsalamat from sig-scheduling"
19-
- "@andrewsykim from sig-cloud-provider"
20-
approvers:
21-
- "@brancz"
22-
creation-date: 2019-06-05
23-
last-updated: 2019-06-27
24-
status: implemented
25-
see-also:
26-
- 20181106-kubernetes-metrics-overhaul
27-
- 20190404-kubernetes-control-plane-metrics-stability
28-
---
29-
301
# Metrics Stability Migration
312

323
## Table of Contents
@@ -47,11 +18,11 @@ see-also:
4718

4819
## Summary
4920

50-
This KEP intends to document and communicate the general strategy for migrating the control-plane metrics stability framework across the Kubernetes codebase. Most of the framework design decisions have been determined and outlined in [an earlier KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md).
21+
This KEP intends to document and communicate the general strategy for migrating the control-plane metrics stability framework across the Kubernetes codebase. Most of the framework design decisions have been determined and outlined in [an earlier KEP](./kubernetes-control-plane-metrics-stability.md).
5122

5223
## Motivation
5324

54-
We want to start using the metrics stability framework built based off the [Kubernetes Control-Plane Metrics Stability KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md), so that we can define stability levels for metrics in the Kubernetes codebase. These stability levels would provide API compatibility guarantees across version bumps.
25+
We want to start using the metrics stability framework built based off the [Kubernetes Control-Plane Metrics Stability KEP](./kubernetes-control-plane-metrics-stability.md), so that we can define stability levels for metrics in the Kubernetes codebase. These stability levels would provide API compatibility guarantees across version bumps.
5526

5627
### Goals
5728

@@ -119,7 +90,7 @@ TBD (since this is not yet implemented)
11990

12091
## Graduation Criteria
12192

122-
- [x] Prior to migrating a [component, automated static analysis testing](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190605-metrics-validation-and-verification.md) is in place to validate and verify API guarantees.
93+
- [x] Prior to migrating a [component, automated static analysis testing](./metrics-validation-and-verification.md) is in place to validate and verify API guarantees.
12394
- [x] Adequate [documentation exists for new flags on components](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/)
12495
- [x] Update [instrumentation documents to reflect changes](https://github.com/kubernetes/website/pull/17578)
12596

keps/sig-instrumentation/1209-metrics-stability/20191028-metrics-stability-to-beta.md renamed to keps/sig-instrumentation/1209-metrics-stability/metrics-stability-to-beta.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
---
2-
title: Metrics Stability Framework to Beta
3-
authors:
4-
- "@logicalhan"
5-
- "@RainbowMango"
6-
owning-sig: sig-instrumentation
7-
participating-sigs:
8-
- sig-instrumentation
9-
reviewers:
10-
- "@brancz"
11-
approvers:
12-
- "@brancz"
13-
editor: "@brancz"
14-
creation-date: 2019-10-28
15-
last-updated: 2020-10-14
16-
status: implemented
17-
stage: beta
18-
see-also:
19-
- 20181106-kubernetes-metrics-overhaul
20-
- 20190404-kubernetes-control-plane-metrics-stability
21-
- 20190605-metrics-stability-migration
22-
- 20190605-metrics-validation-and-verification
23-
---
24-
251
# Metrics Stability Framework to Beta
262

273
## Table of Contents
@@ -185,4 +161,4 @@ These are related Post-GA tasks:
185161
- [x] https://github.com/kubernetes/kubernetes/pull/83841 (by @RainbowMango)
186162

187163
### Escape Flag
188-
- [x] https://github.com/kubernetes/kubernetes/pull/84292 (by @RainbowMango)
164+
- [x] https://github.com/kubernetes/kubernetes/pull/84292 (by @RainbowMango)
Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
---
2-
title: Metrics Validation and Verification
3-
authors:
4-
- "@serathius"
5-
- "@solodov"
6-
- "@logicalhan"
7-
owning-sig: sig-instrumentation
8-
participating-sigs:
9-
- sig-instrumentation
10-
- sig-testing
11-
reviewers:
12-
- "@brancz"
13-
approvers:
14-
- "@brancz"
15-
editor: TBD
16-
creation-date: 2019-06-05
17-
last-updated: 2020-10-14
18-
status: implemented
19-
see-also:
20-
- 20190404-kubernetes-control-plane-metrics-stability
21-
- 20190605-metrics-stability-migration
22-
---
23-
241
# Metrics Validation and Verification
252

263
## Table of Contents
@@ -49,13 +26,13 @@ see-also:
4926
## Summary
5027

5128
This Kubernetes Enhancement Proposal (KEP) builds off of the framework proposed
52-
in the [Kubernetes Control-Plane Metrics Stability KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md)
29+
in the [Kubernetes Control-Plane Metrics Stability KEP](./kubernetes-control-plane-metrics-stability.md)
5330
and proposes a strategy for ensuring conformance of metrics with official
5431
stability guarantees.
5532

5633
## Motivation
5734

58-
While the [Kubernetes Control Plane metrics stability KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md)
35+
While the [Kubernetes Control Plane metrics stability KEP](./kubernetes-control-plane-metrics-stability.md)
5936
provides a framework to define stability levels for control-plane metrics,
6037
it does not provide a strategy for verifying and validating conformance to stated guarantees.
6138
This KEP intends to propose a framework for validating and verifying metric guarantees.
@@ -74,7 +51,7 @@ This KEP intends to propose a framework for validating and verifying metric guar
7451

7552
## Proposal
7653

77-
We will provide validation for metrics under the [new framework](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md) with static analysis.
54+
We will provide validation for metrics under the [new framework](./kubernetes-control-plane-metrics-stability.md) with static analysis.
7855

7956
## Design Details
8057

keps/sig-instrumentation/647-apiserver-tracing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ If `--opentelemetry-config-file` is not specified, the API Server will not send
149149

150150
### Controlling use of the OpenTelemetry library
151151

152-
As the community found in the [Metrics Stability Framework KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md#kubernetes-control-plane-metrics-stability), having control over how the client libraries are used in kubernetes can enable maintainers to enforce policy and make broad improvements to the quality of telemetry. To enable future improvements to tracing, we will restrict the direct use of the OpenTelemetry library within the kubernetes code base, and provide wrapped versions of functions we wish to expose in a utility library.
152+
As the community found in the [Metrics Stability Framework KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1209-metrics-stability/kubernetes-control-plane-metrics-stability.md#kubernetes-control-plane-metrics-stability), having control over how the client libraries are used in kubernetes can enable maintainers to enforce policy and make broad improvements to the quality of telemetry. To enable future improvements to tracing, we will restrict the direct use of the OpenTelemetry library within the kubernetes code base, and provide wrapped versions of functions we wish to expose in a utility library.
153153

154154
### Test Plan
155155

keps/sig-node/727-resource-metrics-endpoint/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This proposal deals with the first problem, which is that the Summary API is a p
7373

7474
The kubelet will expose an endpoint at `/metrics/resource` in prometheus text exposition format using the prometheus client library.
7575

76-
The metrics in this endpoint will make use of the [Kubernetes Metrics Stability framework](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/20190404-kubernetes-control-plane-metrics-stability.md) for stability and deprecation policies.
76+
The metrics in this endpoint will make use of the [Kubernetes Metrics Stability framework](https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1209-metrics-stability/kubernetes-control-plane-metrics-stability.md) for stability and deprecation policies.
7777

7878

7979
### API

0 commit comments

Comments
 (0)