github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Hide apiserver metrics that have been deprecated in 1.15

Browse Source
This commit is contained in:
RainbowMango 2019-10-12 21:17:01 +08:00
parent 5e0695e339
commit 627a9abc9e
2 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go
View File

@ -84,8 +84,9 @@ var (
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "transformation_failures_total", Name: "transformation_failures_total",
Help: "(Deprecated) Total number of failed transformation operations.", Help: "Total number of failed transformation operations.",
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.15.0",
}, },
[]string{"transformation_type"}, []string{"transformation_type"},
) )

56
staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go
View File

@ -48,68 +48,52 @@ func TestTotals(t *testing.T) {
prefix: NewPrefixTransformers(nil, nonStatusErrTransformer), prefix: NewPrefixTransformers(nil, nonStatusErrTransformer),
metrics: []string{ metrics: []string{
"apiserver_storage_transformation_operations_total", "apiserver_storage_transformation_operations_total",
"apiserver_storage_transformation_failures_total",
}, },
want: ` want: `
# HELP apiserver_storage_transformation_failures_total [ALPHA] (Deprecated) Total number of failed transformation operations. # HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations.
# TYPE apiserver_storage_transformation_failures_total counter # TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_failures_total{transformation_type="from_storage"} 1 apiserver_storage_transformation_operations_total{status="Unknown",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_failures_total{transformation_type="to_storage"} 1 apiserver_storage_transformation_operations_total{status="Unknown",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
# HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations. `,
# TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_operations_total{status="Unknown",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_operations_total{status="Unknown",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
`,
}, },
{ {
desc: "ok", desc: "ok",
prefix: NewPrefixTransformers(nil, okTransformer), prefix: NewPrefixTransformers(nil, okTransformer),
metrics: []string{ metrics: []string{
"apiserver_storage_transformation_operations_total", "apiserver_storage_transformation_operations_total",
"apiserver_storage_transformation_failures_total",
}, },
want: ` want: `
# HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations. # HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations.
# TYPE apiserver_storage_transformation_operations_total counter # TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_operations_total{status="OK",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1 apiserver_storage_transformation_operations_total{status="OK",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_operations_total{status="OK",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1 apiserver_storage_transformation_operations_total{status="OK",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
`, `,
}, },
{ {
desc: "failed precondition", desc: "failed precondition",
prefix: NewPrefixTransformers(nil, failedPreconditionErrTransformer), prefix: NewPrefixTransformers(nil, failedPreconditionErrTransformer),
metrics: []string{ metrics: []string{
"apiserver_storage_transformation_operations_total", "apiserver_storage_transformation_operations_total",
"apiserver_storage_transformation_failures_total",
}, },
want: ` want: `
# HELP apiserver_storage_transformation_failures_total [ALPHA] (Deprecated) Total number of failed transformation operations. # HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations.
# TYPE apiserver_storage_transformation_failures_total counter # TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_failures_total{transformation_type="from_storage"} 1 apiserver_storage_transformation_operations_total{status="FailedPrecondition",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_failures_total{transformation_type="to_storage"} 1 apiserver_storage_transformation_operations_total{status="FailedPrecondition",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
# HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations. `,
# TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_operations_total{status="FailedPrecondition",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_operations_total{status="FailedPrecondition",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
`,
}, },
{ {
desc: "internal", desc: "internal",
prefix: NewPrefixTransformers(nil, internalErrTransformer), prefix: NewPrefixTransformers(nil, internalErrTransformer),
metrics: []string{ metrics: []string{
"apiserver_storage_transformation_operations_total", "apiserver_storage_transformation_operations_total",
"apiserver_storage_transformation_failures_total",
}, },
want: ` want: `
# HELP apiserver_storage_transformation_failures_total [ALPHA] (Deprecated) Total number of failed transformation operations. # HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations.
# TYPE apiserver_storage_transformation_failures_total counter # TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_failures_total{transformation_type="from_storage"} 1 apiserver_storage_transformation_operations_total{status="Internal",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_failures_total{transformation_type="to_storage"} 1 apiserver_storage_transformation_operations_total{status="Internal",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
# HELP apiserver_storage_transformation_operations_total [ALPHA] Total number of transformations. `,
# TYPE apiserver_storage_transformation_operations_total counter
apiserver_storage_transformation_operations_total{status="Internal",transformation_type="from_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
apiserver_storage_transformation_operations_total{status="Internal",transformation_type="to_storage",transformer_prefix="k8s:enc:kms:v1:"} 1
`,
}, },
} }