From cf56e4ab6e9cb8f2fbe5ffcd29d88884358e0f44 Mon Sep 17 00:00:00 2001
From: AndreKR <haensel@creations.de>
Date: Thu, 6 Feb 2025 22:50:52 +0100
Subject: [PATCH] chore(outputs.sql): Update ClickHouse Docker image for
 integration test (#16462)

---
 plugins/outputs/sql/sql_test.go                      | 12 ++++++++----
 .../sql/testdata/clickhouse/enable_stdout_log.xml    |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 plugins/outputs/sql/testdata/clickhouse/enable_stdout_log.xml

diff --git a/plugins/outputs/sql/sql_test.go b/plugins/outputs/sql/sql_test.go
index 121260143..89d4d6898 100644
--- a/plugins/outputs/sql/sql_test.go
+++ b/plugins/outputs/sql/sql_test.go
@@ -331,6 +331,9 @@ func TestClickHouseIntegration(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
+	logConfig, err := filepath.Abs("testdata/clickhouse/enable_stdout_log.xml")
+	require.NoError(t, err)
+
 	initdb, err := filepath.Abs("testdata/clickhouse/initdb/init.sql")
 	require.NoError(t, err)
 
@@ -344,16 +347,17 @@ func TestClickHouseIntegration(t *testing.T) {
 
 	servicePort := "9000"
 	container := testutil.Container{
-		Image:        "yandex/clickhouse-server",
+		Image:        "clickhouse",
 		ExposedPorts: []string{servicePort, "8123"},
 		Files: map[string]string{
-			"/docker-entrypoint-initdb.d/script.sql": initdb,
-			"/out":                                   outDir,
+			"/docker-entrypoint-initdb.d/script.sql":                initdb,
+			"/etc/clickhouse-server/config.d/enable_stdout_log.xml": logConfig,
+			"/out": outDir,
 		},
 		WaitingFor: wait.ForAll(
 			wait.NewHTTPStrategy("/").WithPort(nat.Port("8123")),
 			wait.ForListeningPort(nat.Port(servicePort)),
-			wait.ForLog("Saved preprocessed configuration to '/var/lib/clickhouse/preprocessed_configs/users.xml'").WithOccurrence(2),
+			wait.ForLog("Ready for connections"),
 		),
 	}
 	err = container.Start()
diff --git a/plugins/outputs/sql/testdata/clickhouse/enable_stdout_log.xml b/plugins/outputs/sql/testdata/clickhouse/enable_stdout_log.xml
new file mode 100644
index 000000000..8af1907f4
--- /dev/null
+++ b/plugins/outputs/sql/testdata/clickhouse/enable_stdout_log.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+	<logger>
+		<console>1</console>
+	</logger>
+</clickhouse>