diff --git a/bazel/container_images.bzl b/bazel/container_images.bzl index ab81087c1d6..51f3ffda1d8 100644 --- a/bazel/container_images.bzl +++ b/bazel/container_images.bzl @@ -367,3 +367,12 @@ def stirling_test_images(): repository = "golang_1_22_grpc_server_with_buildinfo", digest = "sha256:67adba5e8513670fa37bd042862e7844f26239e8d2997ed8c3b0aa527bc04cc3", ) + + # ClickHouse server image for testing. + # clickhouse/clickhouse-server:25.7-alpine, mirrored to the Pixie ghcr registry. + # Arch: linux/amd64 (manifest from the multi-arch index pinned in scripts/regclient/deps.lua) + _container_image( + name = "clickhouse_server_base_image", + repository = "clickhouse_server_image_25_7", + digest = "sha256:fdc16ebabed9f93868a8c91f289d1abbb2d261b0ae676daa8cf30fbe81fec2b3", + ) diff --git a/scripts/regclient/deps.lua b/scripts/regclient/deps.lua index d8c1efc6ad9..afa18f7b10f 100644 --- a/scripts/regclient/deps.lua +++ b/scripts/regclient/deps.lua @@ -18,6 +18,7 @@ deps.depImages = { "docker.io/azul/zulu-openjdk-alpine@sha256:eef2da2a134370717e40b1cc570efba08896520af6b31744eabf64481a986878", "docker.io/azul/zulu-openjdk-debian@sha256:d9df673eae28bd1c8e23fabcbd6c76d20285ea7e5c589975bd26866cab189c2a", "docker.io/azul/zulu-openjdk@sha256:01a1519ff66c3038e4c66f36e5dcf4dbc68278058d83133c0bc942518fcbef6e", + "docker.io/clickhouse/clickhouse-server:25.7-alpine@sha256:258d438215084cad2b4504749bd7046a869a82789983831df6348a737c1a85f6", "docker.io/confluentinc/cp-kafka@sha256:ee6e42ce4f79623c69cf758848de6761c74bf9712697fe68d96291a2b655ce7f", "docker.io/confluentinc/cp-zookeeper@sha256:87314e87320abf190f0407bf1689f4827661fbb4d671a41cba62673b45b66bfa", "docker.io/curlimages/curl@sha256:5594e102d5da87f8a3a6b16e5e9b0e40292b5404c12f9b6962fd6b056d2a4f82", -- TODO(ddelnano): remove once gcr.io/pixie-oss/pixie-dev-public/curl:multiarch-7.87.0 is tested diff --git a/src/stirling/source_connectors/socket_tracer/testing/container_images/BUILD.bazel b/src/stirling/source_connectors/socket_tracer/testing/container_images/BUILD.bazel index 0d1ad990576..a795b6fd8a0 100644 --- a/src/stirling/source_connectors/socket_tracer/testing/container_images/BUILD.bazel +++ b/src/stirling/source_connectors/socket_tracer/testing/container_images/BUILD.bazel @@ -14,6 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 +load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_layer") load("//bazel:go_container.bzl", "go_container_libraries") load("//bazel:pl_build_system.bzl", "pl_all_supported_go_sdk_versions", "pl_cc_test_library", "pl_go_test_versions") @@ -364,3 +365,18 @@ pl_cc_test_library( ], deps = ["//src/common/testing/test_utils:cc_library"], ) + +# ClickHouse configuration layer for console logging +container_layer( + name = "clickhouse_config_layer", + directory = "/etc/clickhouse-server/config.d", + files = ["clickhouse_logging_config.xml"], + mode = "0644", +) + +container_image( + name = "clickhouse", + base = "@clickhouse_server_base_image//image", + layers = [":clickhouse_config_layer"], + visibility = ["//visibility:public"], +) diff --git a/src/stirling/source_connectors/socket_tracer/testing/container_images/clickhouse_logging_config.xml b/src/stirling/source_connectors/socket_tracer/testing/container_images/clickhouse_logging_config.xml new file mode 100644 index 00000000000..70d2f014380 --- /dev/null +++ b/src/stirling/source_connectors/socket_tracer/testing/container_images/clickhouse_logging_config.xml @@ -0,0 +1,7 @@ + + + true + + + +