fix jobs channel size

new unit - 'B'

Author: mkabilov

configs/pgsettings.yaml

@@ -4,7 +4,7 @@ pg_settings:
             select
                 replace(case
                     when unit in ('ms', 's', 'min', 'h', 'd') then name || '_seconds'
-                    when unit in ('kB', 'MB', 'GB', 'TB', '8kB', '16kB', '32kB', '16MB', '32MB', '64MB') then name || '_bytes'
+                    when unit in ('B', 'kB', 'MB', 'GB', 'TB', '8kB', '16kB', '32kB', '16MB', '32MB', '64MB') then name || '_bytes'
                 else
                     name
                 end, '.', '_') as name,
@@ -15,6 +15,7 @@ pg_settings:
                     when 'h' then setting::numeric * 3600
                     when 'd' then setting::numeric * 86400
 
+                    when 'B' then setting::numeric
                     when 'kB' then setting::numeric * 1024
                     when 'MB' then setting::numeric * 1048576
                     when 'GB' then setting::numeric * 1073741824
@@ -38,7 +39,7 @@ pg_settings:
             select
                 replace(case
                     when unit in ('ms', 's', 'min', 'h', 'd') then name || '_seconds'
-                    when unit in ('kB', 'MB', 'GB', 'TB', '8kB', '16kB', '32kB', '16MB', '32MB', '64MB') then name || '_bytes'
+                    when unit in ('B', 'kB', 'MB', 'GB', 'TB', '8kB', '16kB', '32kB', '16MB', '32MB', '64MB') then name || '_bytes'
                 else
                     name
                 end, '.', '_') as name,
@@ -49,6 +50,7 @@ pg_settings:
                     when 'h' then setting::numeric * 3600
                     when 'd' then setting::numeric * 86400
 
+                    when 'B' then setting::numeric
                     when 'kB' then setting::numeric * 1024
                     when 'MB' then setting::numeric * 1048576
                     when 'GB' then setting::numeric * 1073741824

pkg/db/db.go

@@ -162,8 +162,8 @@ func ToFloat64(t interface{}) (float64, error) {
 	var res float64
 	switch v := t.(type) {
 	case *pgtype.Numeric:
-		v.AssignTo(&res)
-		return res, nil
+		err := v.AssignTo(&res)
+		return res, err
 	case int8:
 		return float64(v), nil
 	case int32:

pkg/pgcollector/pgcollector.go

@@ -85,9 +85,7 @@ func createMetric(job *workerJob, name string, constLabels prometheus.Labels, ra
 }
 
 func (p *PgCollector) worker(conn db.DbInterface, jobs chan *workerJob, res chan<- prometheus.Metric, wg *sync.WaitGroup) {
-	defer func() {
-		wg.Done()
-	}()
+	defer wg.Done()
 
 jobs:
 	for job := range jobs {
@@ -231,7 +229,7 @@ func (p *PgCollector) Collect(metricsCh chan<- prometheus.Metric) {
 
 			dbPool[dbName] = append(dbPool[dbName], conn)
 		}
-		dbJobs[dbName] = make(chan *workerJob, len(dbPool))
+		dbJobs[dbName] = make(chan *workerJob, len(dbPool[dbName]))
 
 		for _, conn := range dbPool[dbName] {
 			wg.Add(1)