Merge pull request #18 from browserup/updated-schemas

Updated schemas

Author: kiturutin

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
@@ -204,7 +206,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 +274,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 +300,8 @@ services:
       - loki
     environment:
       - LOG_PATH=/tmp
+    ports:
+      - "24224:8889"
     volumes:
       - ./resources/fluent-bit:/fluent-bit/etc
 

lib/docker_compose/resources/click-house/schemas/errors.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 {

lib/docker_compose/resources/click-house/schemas/run_infos.proto

@@ -22,5 +22,5 @@ message System_stat {
 }
 
 message System_statsList {
-	repeated System_stat system_stats = 1;
+  repeated System_stat system_stats = 1;
 }

lib/docker_compose/resources/click-house/schemas/steps.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 {