Merge branch 'master' into include-ns-in-alerts

CHANGELOG.md

@@ -18,6 +18,12 @@ We use the following categories for changes:
 ### Added
 - Alerts from promscale monitoring mixin are groupped also by namespace label [#1714]
 
+### Changed
+- Reduced the verbosity of the logs emitted by the vacuum engine [#1715]
+
+### Fixed
+
+
 ## [0.16.0] - 2022-10-20
 
 ### Added

docker-compose/docker-compose.yaml

@@ -48,14 +48,16 @@ services:
     image: "otel/opentelemetry-collector:0.56.0"
     command: [ "--config=/etc/otel-collector-config.yml" ]
     volumes:
-      - ./otel-collector-config.yml:/etc/otel-collector-config.yml
+      - ${PWD}/otel-collector-config.yml:/etc/otel-collector-config.yml
     ports:
       - "14268:14268" # jaeger http
 
   jaeger:
     image: jaegertracing/jaeger-query:1.37.0
     environment:
       SPAN_STORAGE_TYPE: grpc-plugin
+    depends_on:
+      - promscale
     command: [
       "--grpc-storage.server=promscale:9202",
     ]

pkg/vacuum/vacuum.go

@@ -135,7 +135,7 @@ func (e *Engine) Run(ctx context.Context) {
 		return
 	}
 	if !acquired {
-		log.Info("msg", "vacuum engine did not acquire advisory lock")
+		log.Debug("msg", "vacuum engine did not acquire advisory lock")
 		return
 	}
 	// release the advisory lock when we're done
@@ -213,7 +213,7 @@ func runWorkers(ctx context.Context, parallelism int, chunks []string, worker fu
 // worker pulls chunks from a channel and vacuums them
 func (e *Engine) worker(ctx context.Context, id int, todo <-chan string) {
 	for chunk := range todo {
-		log.Info("msg", "vacuuming a chunk", "worker", id, "chunk", chunk)
+		log.Debug("msg", "vacuuming a chunk", "worker", id, "chunk", chunk)
 		sql := fmt.Sprintf(sqlVacuumFmt, chunk)
 		_, err := e.pool.Exec(ctx, sql)
 		if err != nil {