From 22dd0b2ebb3e76be60974cb08d5536b70a609388 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Wed, 20 Apr 2022 23:51:21 +0800 Subject: [PATCH] Modify CSI VolumeSnapshot metric related code. Signed-off-by: Xun Jiang --- changelogs/unreleased/4854-jxun | 1 + pkg/controller/backup_controller.go | 2 ++ pkg/metrics/metrics.go | 9 +++++++++ 3 files changed, 12 insertions(+) create mode 100644 changelogs/unreleased/4854-jxun diff --git a/changelogs/unreleased/4854-jxun b/changelogs/unreleased/4854-jxun new file mode 100644 index 000000000..abecfa4e1 --- /dev/null +++ b/changelogs/unreleased/4854-jxun @@ -0,0 +1 @@ +Modify CSI VolumeSnapshot metric related code. \ No newline at end of file diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go index 7402f7e45..e7075a560 100644 --- a/pkg/controller/backup_controller.go +++ b/pkg/controller/backup_controller.go @@ -621,6 +621,8 @@ func (c *backupController) runBackup(backup *pkgbackup.Request) error { if err != nil { backupLog.Error(err) } + + backup.CSISnapshots = volumeSnapshots } if c.volumeSnapshotContentLister != nil { diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 2e593a046..d486a88bd 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -410,6 +410,15 @@ func (m *ServerMetrics) InitSchedule(scheduleName string) { if c, ok := m.metrics[volumeSnapshotFailureTotal].(*prometheus.CounterVec); ok { c.WithLabelValues(scheduleName).Add(0) } + if c, ok := m.metrics[csiSnapshotAttemptTotal].(*prometheus.CounterVec); ok { + c.WithLabelValues(scheduleName, "").Add(0) + } + if c, ok := m.metrics[csiSnapshotSuccessTotal].(*prometheus.CounterVec); ok { + c.WithLabelValues(scheduleName, "").Add(0) + } + if c, ok := m.metrics[csiSnapshotFailureTotal].(*prometheus.CounterVec); ok { + c.WithLabelValues(scheduleName, "").Add(0) + } } // InitSchedule initializes counter metrics for a node.