metricbeat/module/postgresql: Improve healthcheck for Postgres (#36182)

elastic · Aug 1, 2023 · 4ae13d9 · 4ae13d9
1 parent 0a655a1
commit 4ae13d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/metricbeat/module/postgresql/docker-compose.yml b/metricbeat/module/postgresql/docker-compose.yml
@@ -2,17 +2,18 @@ version: '2.3'
 
 services:
   postgresql:
-    image: docker.elastic.co/integrations-ci/beats-postgresql:${POSTGRESQL_VERSION:-13.2}-2
+    image: docker.elastic.co/integrations-ci/beats-postgresql:${POSTGRESQL_VERSION:-13.11}-2
     build:
       context: ./_meta
       args:
-        POSTGRESQL_VERSION: ${POSTGRESQL_VERSION:-13.2}
+        POSTGRESQL_VERSION: ${POSTGRESQL_VERSION:-13.11}
     environment:
       POSTGRES_PASSWORD: postgres
     ports:
       - 5432
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -p 5432"]
-      interval: 5s
-      timeout: 5s
+      test: ['CMD-SHELL', 'psql -h localhost -p 5432 -U postgres -c select 1 -d postgres']
+      interval: 15s
+      timeout: 30s
       retries: 5
+      start_period: 15s
diff --git a/metricbeat/module/postgresql/statement/statement_integration_test.go b/metricbeat/module/postgresql/statement/statement_integration_test.go
@@ -31,7 +31,6 @@ import (
 )
 
 func TestFetch(t *testing.T) {
-	t.Skip("Flaky test: https://github.com/elastic/beats/issues/35995")
 	service := compose.EnsureUp(t, "postgresql")
 
 	f := mbtest.NewReportingMetricSetV2Error(t, getConfig(service.Host()))