kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `cluster` to `storage_cluster_id` for apiserver_storage_size_bytes metric 

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: fb5140f562289f3ffe596b4a3af4650b850a0941
This commit is contained in:
Davanum Srinivas 2024-04-11 15:06:03 -04:00 committed by Kubernetes Publisher
parent 8bbbe76e96
commit a22f7973bf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/storage/etcd3/metrics/metrics.go
View File

@ -84,7 +84,7 @@ var (
}, },
[]string{"endpoint"}, []string{"endpoint"},
) )
storageSizeDescription = compbasemetrics.NewDesc("apiserver_storage_size_bytes", "Size of the storage database file physically allocated in bytes.", []string{"cluster"}, nil, compbasemetrics.STABLE, "") storageSizeDescription = compbasemetrics.NewDesc("apiserver_storage_size_bytes", "Size of the storage database file physically allocated in bytes.", []string{"storage_cluster_id"}, nil, compbasemetrics.STABLE, "")
storageMonitor = &monitorCollector{monitorGetter: func() ([]Monitor, error) { return nil, nil }} storageMonitor = &monitorCollector{monitorGetter: func() ([]Monitor, error) { return nil, nil }}
etcdEventsReceivedCounts = compbasemetrics.NewCounterVec( etcdEventsReceivedCounts = compbasemetrics.NewCounterVec(
&compbasemetrics.CounterOpts{ &compbasemetrics.CounterOpts{
@ -288,21 +288,21 @@ func (c *monitorCollector) CollectWithStability(ch chan<- compbasemetrics.Metric
} }
for i, m := range monitors { for i, m := range monitors {
cluster := fmt.Sprintf("etcd-%d", i) storageClusterID := fmt.Sprintf("etcd-%d", i)
klog.V(4).InfoS("Start collecting storage metrics", "cluster", cluster) klog.V(4).InfoS("Start collecting storage metrics", "storage_cluster_id", storageClusterID)
ctx, cancel := context.WithTimeout(context.Background(), time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Second)
metrics, err := m.Monitor(ctx) metrics, err := m.Monitor(ctx)
cancel() cancel()
m.Close() m.Close()
if err != nil { if err != nil {
klog.InfoS("Failed to get storage metrics", "cluster", cluster, "err", err) klog.InfoS("Failed to get storage metrics", "storage_cluster_id", storageClusterID, "err", err)
continue continue
} }
metric, err := compbasemetrics.NewConstMetric(storageSizeDescription, compbasemetrics.GaugeValue, float64(metrics.Size), cluster) metric, err := compbasemetrics.NewConstMetric(storageSizeDescription, compbasemetrics.GaugeValue, float64(metrics.Size), storageClusterID)
if err != nil { if err != nil {
klog.ErrorS(err, "Failed to create metric", "cluster", cluster) klog.ErrorS(err, "Failed to create metric", "storage_cluster_id", storageClusterID)
} }
ch <- metric ch <- metric
} }

2
pkg/storage/etcd3/metrics/metrics_test.go
View File

@ -199,7 +199,7 @@ func TestStorageSizeCollector(t *testing.T) {
err: nil, err: nil,
want: `# HELP apiserver_storage_size_bytes [STABLE] Size of the storage database file physically allocated in bytes. want: `# HELP apiserver_storage_size_bytes [STABLE] Size of the storage database file physically allocated in bytes.
# TYPE apiserver_storage_size_bytes gauge # TYPE apiserver_storage_size_bytes gauge
apiserver_storage_size_bytes{cluster="etcd-0"} 1e+09 apiserver_storage_size_bytes{storage_cluster_id="etcd-0"} 1e+09
`, `,
}, },
{ {