From 8c8358a20881caf8a0243614700357ec9cee8136 Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Sun, 16 Mar 2025 21:28:26 +0100 Subject: [PATCH 1/2] updated schemas; updated CH --- lib/docker_compose/docker-compose.yml | 6 +++-- .../click-house/schemas/errors.proto | 0 .../click-house/schemas/run_infos.proto | 5 ++-- .../resources/click-house/schemas/steps.proto | 0 .../click-house/schemas/system_stats.proto | 2 +- .../resources/click-house/schemas/urls.proto | 0 .../click-house/schemas/verifications.proto | 0 .../click-house/schemas/vu_logs.proto | 25 ++++++++----------- .../click-house/schemas/vu_statuses.proto | 0 9 files changed, 18 insertions(+), 20 deletions(-) mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/errors.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/run_infos.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/steps.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/system_stats.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/urls.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/verifications.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/vu_logs.proto mode change 100755 => 100644 lib/docker_compose/resources/click-house/schemas/vu_statuses.proto diff --git a/lib/docker_compose/docker-compose.yml b/lib/docker_compose/docker-compose.yml index 77422818..90efe49c 100644 --- a/lib/docker_compose/docker-compose.yml +++ b/lib/docker_compose/docker-compose.yml @@ -204,7 +204,7 @@ services: fluentd-address: "localhost:24224" clickhouse: - image: 'clickhouse/clickhouse-server:25.1' + image: 'clickhouse/clickhouse-server:latest' container_name: clickhouse hostname: clickhouse volumes: @@ -272,7 +272,7 @@ services: minio: container_name: browserup_minio - image: quay.io/minio/minio:RELEASE.2022-01-08T03-11-54Z + image: quay.io/minio/minio:RELEASE.2025-02-28T09-55-16Z command: server --console-address ":9001" /data ports: - "${BROWSERUP_S3_MINIO_PORT_1}:9000" @@ -298,6 +298,8 @@ services: - loki environment: - LOG_PATH=/tmp + ports: + - "24224:8889" volumes: - ./resources/fluent-bit:/fluent-bit/etc diff --git a/lib/docker_compose/resources/click-house/schemas/errors.proto b/lib/docker_compose/resources/click-house/schemas/errors.proto old mode 100755 new mode 100644 diff --git a/lib/docker_compose/resources/click-house/schemas/run_infos.proto b/lib/docker_compose/resources/click-house/schemas/run_infos.proto old mode 100755 new mode 100644 index 6e84bfe6..556bf7b8 --- a/lib/docker_compose/resources/click-house/schemas/run_infos.proto +++ b/lib/docker_compose/resources/click-house/schemas/run_infos.proto @@ -5,9 +5,8 @@ package com.browserup.common.metric.dto; message Run_info { int64 start_ts = 1; int64 end_ts = 2; - string region = 3; - uint32 run_id = 4; - uint32 workspace_id = 5; + uint32 run_id = 3; + uint32 workspace_id = 4; } message Run_infosList { diff --git a/lib/docker_compose/resources/click-house/schemas/steps.proto b/lib/docker_compose/resources/click-house/schemas/steps.proto old mode 100755 new mode 100644 diff --git a/lib/docker_compose/resources/click-house/schemas/system_stats.proto b/lib/docker_compose/resources/click-house/schemas/system_stats.proto old mode 100755 new mode 100644 index 4838d3fa..3d20ed15 --- a/lib/docker_compose/resources/click-house/schemas/system_stats.proto +++ b/lib/docker_compose/resources/click-house/schemas/system_stats.proto @@ -22,5 +22,5 @@ message System_stat { } message System_statsList { - repeated System_stat system_stats = 1; + repeated System_stat system_stats = 1; } diff --git a/lib/docker_compose/resources/click-house/schemas/urls.proto b/lib/docker_compose/resources/click-house/schemas/urls.proto old mode 100755 new mode 100644 diff --git a/lib/docker_compose/resources/click-house/schemas/verifications.proto b/lib/docker_compose/resources/click-house/schemas/verifications.proto old mode 100755 new mode 100644 diff --git a/lib/docker_compose/resources/click-house/schemas/vu_logs.proto b/lib/docker_compose/resources/click-house/schemas/vu_logs.proto old mode 100755 new mode 100644 index 45b248f1..ae204e70 --- a/lib/docker_compose/resources/click-house/schemas/vu_logs.proto +++ b/lib/docker_compose/resources/click-house/schemas/vu_logs.proto @@ -3,20 +3,17 @@ syntax = "proto3"; package com.browserup.common.metric.dto; message Vu_log { - int64 start_ts = 1; - int64 end_ts = 2; - string log_text = 3; - uint32 iteration = 4; - string status = 5; - string region = 6; - string profile = 7; - string image = 8; - string step = 9; - uint32 vu_id = 10; - uint32 run_id = 11; - uint32 workspace_id = 12; - uint32 scenario_id = 13; - uint32 profile_id = 14; + string log_text = 1; + uint32 iteration = 2; + string region = 3; + string profile = 4; + string image = 5; + string step = 6; + uint32 vu_id = 7; + uint32 run_id = 8; + uint32 workspace_id = 9; + uint32 scenario_id = 10; + uint32 profile_id = 11; } message Vu_logsList { diff --git a/lib/docker_compose/resources/click-house/schemas/vu_statuses.proto b/lib/docker_compose/resources/click-house/schemas/vu_statuses.proto old mode 100755 new mode 100644 From ea913378942771ad4f97dff74afd956fe4018a99 Mon Sep 17 00:00:00 2001 From: "Kirill.T" Date: Sat, 22 Mar 2025 15:56:20 +0100 Subject: [PATCH 2/2] cleanup --- lib/docker_compose/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/docker_compose/docker-compose.yml b/lib/docker_compose/docker-compose.yml index 90efe49c..ad816569 100644 --- a/lib/docker_compose/docker-compose.yml +++ b/lib/docker_compose/docker-compose.yml @@ -172,6 +172,8 @@ services: - "${BROWSERUP_WEBCONSOLE_PORT}:3100" environment: - DOCKER_LOGS=true + - BROWSERUP_WC_DEBUG=${BROWSERUP_WC_DEBUG} + - BROWSERUP_DEPLOY_TYPE=docker - BROWSERUP_CLICKHOUSE_HOST=${BROWSERUP_CLICKHOUSE_HOST} - BROWSERUP_GRID_SERVICE_URL=http://${BROWSERUP_GRID_JAVA_API_HOST}:8080/grid - BROWSERUP_LOKI_SERVICE_URL=http://${BROWSERUP_LOKI_HOST}:3100