From 54ce83f4585d50f614b3514c6459c6f1714b2052 Mon Sep 17 00:00:00 2001 From: "a.pivkin" Date: Tue, 23 Dec 2025 06:49:59 +0300 Subject: [PATCH] fixed some errors from linter --- rbd_exporter/main.go | 8 +++----- rbd_exporter/metrics/metrics.go | 10 +++------- .../RBDFactory.go => rbdfactory/rbdfactory.go} | 10 +++++----- rbd_exporter/tests/RBDFactory_test.go | 6 +++--- 4 files changed, 14 insertions(+), 20 deletions(-) rename rbd_exporter/{RBDFactory/RBDFactory.go => rbdfactory/rbdfactory.go} (80%) diff --git a/rbd_exporter/main.go b/rbd_exporter/main.go index 2cfac1c..7d986a2 100644 --- a/rbd_exporter/main.go +++ b/rbd_exporter/main.go @@ -34,12 +34,11 @@ func loggerInit() *zap.SugaredLogger { // This func runs even before main() func init() { - - config_file := flag.String("config", "/etc/ceph/ceph.conf", "placement of ceph config file") + configFile := flag.String("config", "/etc/ceph/ceph.conf", "placement of ceph config file") _keyring := flag.String("keyring", "/etc/ceph/ceph.client.admin.keyring", "placement of ceph keyring file") flag.Parse() - params.Config = *config_file + params.Config = *configFile params.Keyring = *_keyring mainlogger = loggerInit() @@ -63,7 +62,7 @@ func main() { http.Handle("/metrics", promhttp.Handler()) - // HTTP runs in separate thread cuz it blocks futher execution of main + // HTTP runs in separate thread cuz it blocks further execution of main go func() { mainlogger.Info("Starting http server") // Here I check for errors if HTTP fails @@ -77,5 +76,4 @@ func main() { go metrics.GetMetrics(cephConn) select {} - } diff --git a/rbd_exporter/metrics/metrics.go b/rbd_exporter/metrics/metrics.go index ed9dee9..5dbd921 100644 --- a/rbd_exporter/metrics/metrics.go +++ b/rbd_exporter/metrics/metrics.go @@ -1,8 +1,7 @@ package metrics import ( - "fmt" - "rbd_exporter/RBDFactory" + "rbd_exporter/rbdfactory" "rbd_exporter/mytypes" "rbd_exporter/logger" "time" @@ -11,7 +10,6 @@ import ( func GetMetrics(cephConn mytypes.CephConnector) { - metrics := InitMetrics() prometheus.MustRegister( metrics.Total_rbd_requested_size_per_pool, @@ -30,7 +28,7 @@ func GetMetrics(cephConn mytypes.CephConnector) { } for _, v := range poolList { - x, _ := RBDFactory.PoolFactory(cephConn, v) + x, _ := rbdfactory.PoolFactory(cephConn, v) result = append(result, x) } @@ -39,9 +37,8 @@ func GetMetrics(cephConn mytypes.CephConnector) { if !v.HasRBD {continue} FillMetrics(v,metrics) } - fmt.Println("====================") + logger.Logger.Debug("====================") // fmt.Println(result) - } } @@ -79,5 +76,4 @@ func FillMetrics(pool mytypes.Pool,metrics *mytypes.Metrics) { metrics.Total_rbd_requested_size_per_pool.WithLabelValues(pool.Name, ).Set( float64(totalSizePerPool)) - } \ No newline at end of file diff --git a/rbd_exporter/RBDFactory/RBDFactory.go b/rbd_exporter/rbdfactory/rbdfactory.go similarity index 80% rename from rbd_exporter/RBDFactory/RBDFactory.go rename to rbd_exporter/rbdfactory/rbdfactory.go index 217e1f7..69d5123 100644 --- a/rbd_exporter/RBDFactory/RBDFactory.go +++ b/rbd_exporter/rbdfactory/rbdfactory.go @@ -1,4 +1,4 @@ -package RBDFactory +package rbdfactory import ( "fmt" @@ -18,12 +18,12 @@ func PoolFactory(cephConn mytypes.CephConnector, poolName string) (mytypes.Pool, imageList, err := ioctx.GetImageNames() if err != nil { - return mytypes.Pool{}, fmt.Errorf("Couldn't get list of rbds %w", err) + return mytypes.Pool{}, fmt.Errorf("couldn't get list of rbds %w", err) } for _, rbdname := range imageList { stat, err := RBDFacroty(ioctx, rbdname) if err != nil { - fmt.Errorf("Coundn't get stat from disk %s %w", rbdname, err) + fmt.Errorf("coundn't get stat from disk %s %w", rbdname, err) panic(err) } rbdlist = append(rbdlist, stat) @@ -38,7 +38,7 @@ func PoolFactory(cephConn mytypes.CephConnector, poolName string) (mytypes.Pool, func RBDFacroty(ioctx mytypes.IOContexter, rbdname string) (mytypes.RBD, error) { defer func() { if v := recover(); v != nil { - logger.Logger.Errorf("No such RBD exists (probably just deleted)") + logger.Logger.Errorf("no such RBD exists (probably just deleted)") } }() @@ -54,7 +54,7 @@ func RBDFacroty(ioctx mytypes.IOContexter, rbdname string) (mytypes.RBD, error) info,err := image.Stat() if err != nil { - return mytypes.RBD{},fmt.Errorf("Couldn't get stats for image %s %w",rbdname,err) + return mytypes.RBD{},fmt.Errorf("couldn't get stats for image %s %w",rbdname,err) } return mytypes.RBD{ diff --git a/rbd_exporter/tests/RBDFactory_test.go b/rbd_exporter/tests/RBDFactory_test.go index b30f3b2..5da6af9 100644 --- a/rbd_exporter/tests/RBDFactory_test.go +++ b/rbd_exporter/tests/RBDFactory_test.go @@ -1,7 +1,7 @@ package tests import ( - "rbd_exporter/RBDFactory" + "rbd_exporter/rbdfactory" mock "rbd_exporter/mytypes/mock" "testing" @@ -30,7 +30,7 @@ func TestRBDFactory(t *testing.T) { MockRBDImager.EXPECT().Stat().Return(expectedImageInfo,nil) - result,err := RBDFactory.RBDFacroty(MockIOContexter,rbdName) + result,err := rbdfactory.RBDFacroty(MockIOContexter,rbdName) require.NoError(t, err) assert.Equal(t, rbdName, result.Name) @@ -62,7 +62,7 @@ func TestPoolFactory(t *testing.T) { mockImage.EXPECT().Stat().Return(expectedImageInfo, nil) } - result, err := RBDFactory.PoolFactory(mockCephConn, poolName) + result, err := rbdfactory.PoolFactory(mockCephConn, poolName) require.NoError(t, err) assert.Equal(t, poolName, result.Name)