Skip to content

Commit ecf5f7d

Browse files
committed
Deprecated metrics under /metrics/resource/v1alpha1
1 parent 0db7074 commit ecf5f7d

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

pkg/kubelet/apis/resourcemetrics/v1alpha1/config.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ import (
2424
"k8s.io/kubernetes/pkg/kubelet/server/stats"
2525
)
2626

27+
// This file contains a series of deprecated metrics which we emit them by endpoint `/metrics/resource/v1alpha1`.
28+
// These metrics have been adapted to new endpoint `/metrics/resource` as well as new `Desc`s.
29+
// In general, we don't need to maintain these deprecated metrics any more.
30+
// TODO(RainbowMango): Remove this file in release 1.20.0+.
31+
2732
// Version is the string representation of the version of this configuration
2833
const Version = "v1alpha1"
2934

@@ -33,28 +38,28 @@ var (
3338
nil,
3439
nil,
3540
metrics.ALPHA,
36-
"")
41+
"1.18.0")
3742

3843
nodeMemoryUsageDesc = metrics.NewDesc("node_memory_working_set_bytes",
3944
"Current working set of the node in bytes",
4045
nil,
4146
nil,
4247
metrics.ALPHA,
43-
"")
48+
"1.18.0")
4449

4550
containerCPUUsageDesc = metrics.NewDesc("container_cpu_usage_seconds_total",
4651
"Cumulative cpu time consumed by the container in core-seconds",
4752
[]string{"container", "pod", "namespace"},
4853
nil,
4954
metrics.ALPHA,
50-
"")
55+
"1.18.0")
5156

5257
containerMemoryUsageDesc = metrics.NewDesc("container_memory_working_set_bytes",
5358
"Current working set of the container in bytes",
5459
[]string{"container", "pod", "namespace"},
5560
nil,
5661
metrics.ALPHA,
57-
"")
62+
"1.18.0")
5863
)
5964

6065
// getNodeCPUMetrics returns CPU utilization of a node.

pkg/kubelet/server/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ func (s *Server) InstallDefaultHandlers(enableCAdvisorJSONEndpoints bool) {
320320
compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
321321
)
322322

323+
// deprecated endpoint which will be removed in release 1.20.0+.
323324
v1alpha1ResourceRegistry := compbasemetrics.NewKubeRegistry()
324325
v1alpha1ResourceRegistry.CustomMustRegister(stats.NewPrometheusResourceMetricCollector(s.resourceAnalyzer, v1alpha1.Config()))
325326
s.restfulCont.Handle(path.Join(resourceMetricsPath, v1alpha1.Version),

pkg/kubelet/server/stats/prometheus_resource_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func NewPrometheusResourceMetricCollector(provider SummaryProvider, config Resou
6060
nil,
6161
nil,
6262
metrics.ALPHA,
63-
""),
63+
"1.18.0"),
6464
}
6565
}
6666

0 commit comments

Comments
 (0)