[-] fix dbSourcesReaderWriter.updateDatabase() to include is_enabled (#760)

Author: pashagolub

docker/demo/Dockerfile

@@ -34,7 +34,6 @@ RUN apt-get update \
     && sh /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
     && curl -L "https://www.postgresql.org/media/keys/ACCC4CF8.asc" | apt-key add - \
     && curl -s https://packagecloud.io/install/repositories/timescale/timescaledb/script.deb.sh | bash \
-    
     && apt-get -qy install \
         timescaledb-2-postgresql-17 postgresql-plpython3-17 postgresql-17-pg-qualstats \
         supervisor python3-psutil libfontconfig1 \

internal/sinks/prometheus.go

@@ -164,8 +164,6 @@ func (promw *PrometheusWriter) Collect(ch chan<- prometheus.Metric) {
 	ch <- promw.totalScrapeFailures
 	promw.lastScrapeErrors.Set(lastScrapeErrors)
 	ch <- promw.lastScrapeErrors
-
-	// atomic.StoreInt64(&lastSuccessfulDatastoreWriteTimeEpoch, time.Now().Unix())
 }
 
 func (promw *PrometheusWriter) setInstanceUpDownState(ch chan<- prometheus.Metric, dbName string) {

internal/sources/postgres.go

@@ -63,9 +63,10 @@ func (r *dbSourcesReaderWriter) updateDatabase(conn db.PgxIface, md Source) (err
 	exclude_pattern, 
 	custom_tags, 
 	host_config, 
-	only_if_master) 
+	only_if_master,
+	is_enabled) 
 values 
-	($1, $2, $3, $4, $5, $6, NULLIF($7, ''), NULLIF($8, ''), $9, $10, $11, $12, $13) 
+	($1, $2, $3, $4, $5, $6, NULLIF($7, ''), NULLIF($8, ''), $9, $10, $11, $12, $13, $14) 
 on conflict (name) do update set
 	"group" = $2, 
 	dbtype = $3, 
@@ -78,12 +79,13 @@ on conflict (name) do update set
 	exclude_pattern = $10, 
 	custom_tags = $11, 
 	host_config = $12,
-	only_if_master = $13`
+	only_if_master = $13,
+	is_enabled = $14`
 	_, err = conn.Exec(context.Background(), sql,
 		md.Name, md.Group, md.Kind,
 		md.ConnStr, m(md.Metrics), m(md.MetricsStandby), md.PresetMetrics, md.PresetMetricsStandby,
 		md.IncludePattern, md.ExcludePattern, m(md.CustomTags),
-		m(md.HostConfig), md.OnlyIfMaster)
+		m(md.HostConfig), md.OnlyIfMaster, md.IsEnabled)
 	return err
 }
 

internal/sources/postgres_test.go

@@ -128,7 +128,7 @@ func TestUpdateDatabase(t *testing.T) {
 		md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`,
 		md.PresetMetrics, md.PresetMetricsStandby,
 		md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
-		nil, md.OnlyIfMaster,
+		nil, md.OnlyIfMaster, md.IsEnabled,
 	).WillReturnResult(pgxmock.NewResult("UPDATE", 1))
 
 	pgrw, err := sources.NewPostgresSourcesReaderWriterConn(ctx, conn)
@@ -167,7 +167,7 @@ func TestWriteMonitoredDatabases(t *testing.T) {
 			md.Name, md.Group, md.Kind,
 			md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`, md.PresetMetrics, md.PresetMetricsStandby,
 			md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
-			nil, md.OnlyIfMaster,
+			nil, md.OnlyIfMaster, md.IsEnabled,
 		).WillReturnResult(pgxmock.NewResult("INSERT", 1))
 		conn.ExpectCommit()
 		conn.ExpectRollback() // deferred rollback
@@ -203,7 +203,7 @@ func TestWriteMonitoredDatabases(t *testing.T) {
 			md.Name, md.Group, md.Kind,
 			md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`, md.PresetMetrics, md.PresetMetricsStandby,
 			md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
-			nil, md.OnlyIfMaster,
+			nil, md.OnlyIfMaster, md.IsEnabled,
 		).WillReturnError(errors.New("failed insert"))
 		conn.ExpectRollback()