diff --git a/frontend/src/pages/EditRules/index.tsx b/frontend/src/pages/EditRules/index.tsx
index 9b80ff7024..09cda600ab 100644
--- a/frontend/src/pages/EditRules/index.tsx
+++ b/frontend/src/pages/EditRules/index.tsx
@@ -1,23 +1,45 @@
+import { notification } from 'antd';
import get from 'api/alerts/get';
import Spinner from 'components/Spinner';
+import ROUTES from 'constants/routes';
import EditRulesContainer from 'container/EditRules';
-import React from 'react';
+import history from 'lib/history';
+import React, { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useQuery } from 'react-query';
-import { useParams } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
function EditRules(): JSX.Element {
- const { ruleId } = useParams
();
+ const { search } = useLocation();
+ const params = new URLSearchParams(search);
+ const ruleId = params.get('ruleId');
+
const { t } = useTranslation('common');
+ const isValidRuleId = ruleId !== null && String(ruleId).length !== 0;
+
const { isLoading, data, isError } = useQuery(['ruleId', ruleId], {
queryFn: () =>
get({
- id: parseInt(ruleId, 10),
+ id: parseInt(ruleId || '', 10),
}),
+ enabled: isValidRuleId,
});
- if (isError) {
+ useEffect(() => {
+ if (!isValidRuleId) {
+ notification.error({
+ message: 'Rule Id is required',
+ });
+ history.replace(ROUTES.LIST_ALL_ALERT);
+ }
+ }, [isValidRuleId, ruleId]);
+
+ if (
+ (isError && !isValidRuleId) ||
+ ruleId == null ||
+ (data?.payload?.data === undefined && !isLoading)
+ ) {
return {data?.error || t('something_went_wrong')}
;
}
@@ -28,8 +50,4 @@ function EditRules(): JSX.Element {
return ;
}
-interface EditRulesParam {
- ruleId: string;
-}
-
export default EditRules;
diff --git a/frontend/src/store/reducers/trace.ts b/frontend/src/store/reducers/trace.ts
index b99ee7dd3a..3f7672cdd5 100644
--- a/frontend/src/store/reducers/trace.ts
+++ b/frontend/src/store/reducers/trace.ts
@@ -11,6 +11,7 @@ import {
UPDATE_SELECTED_TAGS,
UPDATE_SPAN_ORDER,
UPDATE_SPAN_ORDER_PARAMS,
+ UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE,
UPDATE_SPANS_AGGREGATE,
UPDATE_SPANS_AGGREGATE_PAGE_NUMBER,
UPDATE_SPANS_AGGREGATE_PAGE_SIZE,
@@ -23,6 +24,8 @@ import {
} from 'types/actions/trace';
import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';
+export const INITIAL_FILTER_VALUE = 8;
+
const initialValue: TraceReducer = {
filter: new Map(),
filterToFetchData: ['duration', 'status', 'serviceName'],
@@ -53,6 +56,17 @@ const initialValue: TraceReducer = {
loading: true,
payload: { items: {} },
},
+ filterDisplayValue: new Map([
+ ['component', INITIAL_FILTER_VALUE],
+ ['duration', INITIAL_FILTER_VALUE],
+ ['httpCode', INITIAL_FILTER_VALUE],
+ ['httpHost', INITIAL_FILTER_VALUE],
+ ['httpMethod', INITIAL_FILTER_VALUE],
+ ['httpUrl', INITIAL_FILTER_VALUE],
+ ['operation', INITIAL_FILTER_VALUE],
+ ['serviceName', INITIAL_FILTER_VALUE],
+ ['status', INITIAL_FILTER_VALUE],
+ ]),
};
const traceReducer = (
@@ -251,6 +265,13 @@ const traceReducer = (
};
}
+ case UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE: {
+ return {
+ ...state,
+ filterDisplayValue: action.payload,
+ };
+ }
+
default:
return state;
}
diff --git a/frontend/src/types/actions/trace.ts b/frontend/src/types/actions/trace.ts
index da97d05129..f043926142 100644
--- a/frontend/src/types/actions/trace.ts
+++ b/frontend/src/types/actions/trace.ts
@@ -31,6 +31,8 @@ export const UPDATE_SPANS_AGGREGATE_PAGE_NUMBER =
export const UPDATE_SPANS_AGGREGATE_PAGE_SIZE =
'UPDATE_SPANS_AGGREGATE_PAGE_SIZE';
export const UPDATE_SPAN_ORDER_PARAMS = 'UPDATE_SPAN_ORDER_PARAMS';
+export const UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE =
+ 'UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE';
export interface UpdateFilter {
type: typeof UPDATE_TRACE_FILTER;
@@ -187,6 +189,11 @@ export interface UpdateSpanParams {
};
}
+export interface UpdateTraceFilterDisplayValue {
+ type: typeof UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE;
+ payload: TraceReducer['filterDisplayValue'];
+}
+
export type TraceActions =
| UpdateFilter
| GetTraceFilter
@@ -208,4 +215,5 @@ export type TraceActions =
| UpdateSpanOrder
| UpdateSpansAggregatePageNumber
| UpdateSpanSize
- | UpdateSpanParams;
+ | UpdateSpanParams
+ | UpdateTraceFilterDisplayValue;
diff --git a/frontend/src/types/reducer/trace.ts b/frontend/src/types/reducer/trace.ts
index babeb344c6..fc1c08f4fc 100644
--- a/frontend/src/types/reducer/trace.ts
+++ b/frontend/src/types/reducer/trace.ts
@@ -32,6 +32,7 @@ export interface TraceReducer {
payload: PayloadProps;
};
yAxisUnit: string | undefined;
+ filterDisplayValue: Map;
}
interface SpansAggregateData {
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index b3aa27fe50..a10bce6e81 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -35,6 +35,7 @@
"playwright.config.ts",
"./commitlint.config.js",
"./webpack.config.js",
- "./webpack.config.prod.js"
+ "./webpack.config.prod.js",
+ "./jest.setup.ts"
]
}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 2227658f6b..3a254370a1 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -8128,6 +8128,13 @@ jest-snapshot@^27.5.1:
pretty-format "^27.5.1"
semver "^7.3.2"
+jest-styled-components@^7.0.8:
+ version "7.0.8"
+ resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.0.8.tgz#9ea3b43f002de060b4638fde3b422d14b3e3ec9f"
+ integrity sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==
+ dependencies:
+ css "^3.0.0"
+
jest-util@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go
index 1258060c41..f405c69f6d 100644
--- a/pkg/query-service/app/clickhouseReader/reader.go
+++ b/pkg/query-service/app/clickhouseReader/reader.go
@@ -592,21 +592,45 @@ func (r *ClickHouseReader) GetRulesFromDB() (*[]model.RuleResponseItem, *model.A
func (r *ClickHouseReader) GetRule(id string) (*model.RuleResponseItem, *model.ApiError) {
- idInt, _ := strconv.Atoi(id)
+ idInt, err := strconv.Atoi(id)
+ if err != nil {
+ zap.S().Debug("Error in parsing param: ", err)
+ return nil, &model.ApiError{Typ: model.ErrorBadData, Err: err}
+ }
rule := &model.RuleResponseItem{}
- query := fmt.Sprintf("SELECT id, updated_at, data FROM rules WHERE id=%d", idInt)
-
- err := r.localDB.Get(rule, query)
-
- zap.S().Info(query)
+ query := "SELECT id, updated_at, data FROM rules WHERE id=?"
+ rows, err := r.localDB.Query(query, idInt)
if err != nil {
zap.S().Debug("Error in processing sql query: ", err)
return nil, &model.ApiError{Typ: model.ErrorInternal, Err: err}
}
+ count := 0
+ // iterate over each row
+ for rows.Next() {
+ err = rows.Scan(&rule.Id, &rule.UpdatedAt, &rule.Data)
+ if err != nil {
+ zap.S().Debug(err)
+ return nil, &model.ApiError{Typ: model.ErrorInternal, Err: err}
+ }
+ count += 1
+
+ }
+
+ if count == 0 {
+ err = fmt.Errorf("no rule with id %d found", idInt)
+ zap.S().Debug(err)
+ return nil, &model.ApiError{Typ: model.ErrorNotFound, Err: err}
+ }
+ if count > 1 {
+ err = fmt.Errorf("multiple rules with id %d found", idInt)
+ zap.S().Debug(err)
+ return nil, &model.ApiError{Typ: model.ErrorConflict, Err: err}
+ }
+
return rule, nil
}
diff --git a/pkg/query-service/tests/test-deploy/clickhouse-config.xml b/pkg/query-service/tests/test-deploy/clickhouse-config.xml
index 06ddb2b723..3bb26a3a36 100644
--- a/pkg/query-service/tests/test-deploy/clickhouse-config.xml
+++ b/pkg/query-service/tests/test-deploy/clickhouse-config.xml
@@ -1,136 +1,567 @@
-
+
+
- information
- 1
+
+ trace
+ /var/log/clickhouse-server/clickhouse-server.log
+ /var/log/clickhouse-server/clickhouse-server.err.log
+
+ 1000M
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
8123
+
+
9000
-
-
+
+ 9004
-
-
-
-
- /etc/clickhouse-server/server.crt
- /etc/clickhouse-server/server.key
-
- /etc/clickhouse-server/dhparam.pem
- none
- true
- true
- sslv2,sslv3
- true
-
+
+ 9005
-
- true
- true
- sslv2,sslv3
- true
-
-
-
- RejectCertificateHandler
-
-
-
+
+
-
-
-
-
-
-
- s3
- http://172.17.0.1:9100/test//
- ash
- password
-
-
-
-
-
-
- default
-
-
- s3
-
-
-
-
-
+
+
+
+
-
-
+
+ 9009
-
-9009
+
+
+ If not specified, then it is determined analogous to 'hostname -f' command.
+ This setting could be used to switch replication to another network interface
+ (the server may be connected to multiple networks via multiple addresses)
+ -->
+
+ example.clickhouse.com
+ -->
-
-::
-
-
+
+
-
-
+
+
-4096
-3
-
-100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4096
+
+
+ 3
+
+
+
+
+ false
+
+
+ /path/to/ssl_cert_file
+ /path/to/ssl_key_file
+
+
+ false
+
+
+ /path/to/ssl_ca_cert_file
+
+
+ none
+
+
+ 0
+
+
+ -1
+ -1
+
+
+ false
+
+
+
+
+
+
+ /etc/clickhouse-server/server.crt
+ /etc/clickhouse-server/server.key
+
+
+ none
+ true
+ true
+ sslv2,sslv3
+ true
+
+
+
+ true
+ true
+ sslv2,sslv3
+ true
+
+
+
+ RejectCertificateHandler
+
+
+
+
+
+
+
+
+ 100
+
+
+ 0
+
+
+
+ 10000
+
+
+
+
+
+ 0.9
+
+
+ 4194304
+
+
+ 0
+ correct maximum value. -->
- 8589934592
+
+ Note: uncompressed cache can be pointless for lz4, because memory bandwidth
+ is slower than multi-core decompression on some server configurations.
+ Enabling it can sometimes paradoxically make queries slower.
+ -->
+ 8589934592
- 5368709120
+ -->
+ 5368709120
-
- /var/lib/clickhouse/
+
+ 1000
-
- /var/lib/clickhouse/tmp/
+
+ 134217728
-
- users.xml
+
+ 10000
-
- default
+
+ /var/lib/clickhouse/
-
- default
+
+ /var/lib/clickhouse/tmp/
+
+
+
+ `
+
+
+
+
+
+ /var/lib/clickhouse/user_files/
+
+
+
+
+
+
+
+
+
+
+
+
+ users.xml
+
+
+
+ /var/lib/clickhouse/access/
+
+
+
+
+
+
+ default
+
+
+
+
+
+
+
+
+
+
+
+ default
-
+ Example: Zulu is an alias for UTC.
+ -->
+
-
+ -->
+
+
+
+ true
+
+
+ false
+
+ ' | sed -e 's|.*>\(.*\)<.*|\1|')
+ wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+ apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+ clickhouse-jdbc-bridge &
+
+ * [CentOS/RHEL]
+ export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+ export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '' | sed -e 's|.*>\(.*\)<.*|\1|')
+ wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+ yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+ clickhouse-jdbc-bridge &
+
+ Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
+ ]]>
+
-
+ https://clickhouse.com/docs/en/operations/table_engines/distributed/
+ -->
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 9000
+
+
+
+
+
+
+
+ false
+
+ 127.0.0.1
+ 9000
+
+
+ 127.0.0.2
+ 9000
+
+
+ 127.0.0.3
+ 9000
+
+
+
+
+
+
+
+ localhost
+ 9000
+
+
+
+
+ localhost
+ 9000
+
+
+
+
+
+
+ 127.0.0.1
+ 9000
+
+
+
+
+ 127.0.0.2
+ 9000
+
+
+
+
+
+ true
+
+ 127.0.0.1
+ 9000
+
+
+
+ true
+
+ 127.0.0.2
+ 9000
+
+
+
+
+
+
+ localhost
+ 9440
+ 1
+
+
+
+
localhost
9000
-
+
+
+ localhost
+ 1
+
+
+
+
+
+
+
+
+
+ Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
+ -->
-
+ See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
+ -->
+
+
-
+ See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
+ -->
+
-
- 3600
+
+ 3600
-
- 3600
+
+ 3600
-
- 60
+
+ 60
-
+
+ -->
+
+
+
-
+ true
+ true
+ true
+ true
+
+ -->
+
+
+
+ system
+
+
+ toYYYYMM(event_date)
+
+
+
- system
-
-
- 7500
-
+
+ 7500
+
+
+
+ system
+
-
+
+ system
+
+ toYYYYMM(event_date)
+ 7500
+
+
+
+
+ system
+
+ toYYYYMM(event_date)
+ 7500
+
+
+
system
-
+ toYYYYMM(event_date)
7500
--->
+
+
+
+
+
+ system
+
+ 7500
+ 1000
+
+
+
+
+ system
+
+
+ 7000
+
+
+
+
+
+
+ engine MergeTree
+ partition by toYYYYMM(finish_date)
+ order by (finish_date, finish_time_us, trace_id)
+
+ system
+
+ 7500
+
-
+
+
+ system
+
-
-
+
+ 1000
+
-
-
+
+
+
+
+
+ system
+
+
+ toYYYYMM(event_date)
+ 7500
+
+
+
+
+
+
+
- *_dictionary.xml
+ https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
+ -->
+ *_dictionary.xml
+
+
+ *_function.xml
-
+ -->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
/clickhouse/task_queue/ddl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -303,239 +1149,156 @@
5
--->
+ -->
-
+ -->
+
+
-
-
-
+
+
- ^carbon\.
+ click_cost
any
0
+ 3600
+
+
+ 86400
60
-
- 7776000
- 3600
-
-
- 10368000
- 21600
-
-
- 34560000
- 43200
-
-
- 63072000
- 86400
-
-
- 94608000
- 604800
-
-
-
- ^collectd\.
- any
-
- 0
- 10
-
-
- 43200
- 60
-
-
- 864000
- 900
-
-
- 1728000
- 1800
-
-
- 3456000
- 3600
-
-
- 10368000
- 21600
-
-
- 34560000
- 43200
-
-
- 63072000
- 86400
-
-
- 94608000
- 604800
-
-
-
-
- ^high\.
- any
-
- 0
- 10
-
-
- 172800
- 60
-
-
- 864000
- 900
-
-
- 1728000
- 1800
-
-
- 3456000
- 3600
-
-
- 10368000
- 21600
-
-
- 34560000
- 43200
-
-
- 63072000
- 86400
-
-
- 94608000
- 604800
-
-
-
-
- ^medium\.
- any
-
- 0
- 60
-
-
- 864000
- 900
-
-
- 1728000
- 1800
-
-
- 3456000
- 3600
-
-
- 10368000
- 21600
-
-
- 34560000
- 43200
-
-
- 63072000
- 86400
-
-
- 94608000
- 604800
-
-
-
-
- ^low\.
- any
-
- 0
- 600
-
-
- 15552000
- 1800
-
-
- 31536000
- 3600
-
-
- 63072000
- 21600
-
-
- 126144000
- 43200
-
-
- 252288000
- 86400
-
-
- 315360000
- 604800
-
-
-
- any
+ max
0
60
- 864000
- 900
+ 3600
+ 300
- 1728000
- 1800
-
-
- 3456000
+ 86400
3600
-
- 10368000
- 21600
-
-
- 34560000
- 43200
-
-
- 63072000
- 86400
-
-
- 94608000
- 604800
-
-
+
- /var/lib/clickhouse/format_schemas/
-
+ -->
+ /var/lib/clickhouse/format_schemas/
+
+
+
+
+ hide encrypt/decrypt arguments
+ ((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)
+
+ \1(???)
+
+
+
+
+
+
+
+
+
+ false
+
+ false
+
+
+ https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277
+
+
+
+
+
+
+
+
+
+
+ 268435456
+ true
+
+
diff --git a/pkg/query-service/tests/test-deploy/clickhouse-storage.xml b/pkg/query-service/tests/test-deploy/clickhouse-storage.xml
new file mode 100644
index 0000000000..eaf1e7e99d
--- /dev/null
+++ b/pkg/query-service/tests/test-deploy/clickhouse-storage.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ 10485760
+
+
+ s3
+ http://172.17.0.1:9100/test//
+ ash
+ password
+
+
+
+
+
+
+ default
+
+
+ s3
+
+
+
+
+
+
diff --git a/pkg/query-service/tests/test-deploy/clickhouse-users.xml b/pkg/query-service/tests/test-deploy/clickhouse-users.xml
new file mode 100644
index 0000000000..f18562071d
--- /dev/null
+++ b/pkg/query-service/tests/test-deploy/clickhouse-users.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+ 10000000000
+
+
+ random
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+ ::/0
+
+
+
+ default
+
+
+ default
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3600
+
+
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
deleted file mode 100644
index 48a1449fe4..0000000000
--- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-version: "2.4"
-
-services:
- clickhouse:
- image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm
- volumes:
- - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- restart: on-failure
- logging:
- options:
- max-size: 50m
- max-file: "3"
- healthcheck:
- # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
- test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
- interval: 30s
- timeout: 5s
- retries: 3
-
- alertmanager:
- image: signoz/alertmanager:0.23.0-0.1
- depends_on:
- - query-service
- restart: on-failure
- command:
- - --queryService.url=http://query-service:8085
- - --storage.path=/data
-
- query-service:
- image: signoz/query-service:latest
- container_name: query-service
- command: ["-config=/root/config/prometheus.yml"]
- volumes:
- - ./prometheus.yml:/root/config/prometheus.yml
- - ../dashboards:/root/config/dashboards
- - ./data:/var/lib/signoz
- ports:
- - "8180:8080"
- environment:
- - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
- - STORAGE=clickhouse
- - GODEBUG=netdns=go
- - TELEMETRY_ENABLED=true
- healthcheck:
- test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"]
- interval: 30s
- timeout: 5s
- retries: 3
- depends_on:
- clickhouse:
- condition: service_healthy
-
- otel-collector:
- image: signoz/otelcontribcol:0.45.1-0.3
- command: ["--config=/etc/otel-collector-config.yaml"]
- volumes:
- - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
- ports:
- - "4317:4317" # OTLP GRPC receiver
- mem_limit: 2000m
- restart: always
- depends_on:
- clickhouse:
- condition: service_healthy
-
- otel-collector-metrics:
- image: signoz/otelcontribcol:0.45.1-0.3
- command: ["--config=/etc/otel-collector-metrics-config.yaml"]
- volumes:
- - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
- depends_on:
- clickhouse:
- condition: service_healthy
-
- hotrod:
- image: jaegertracing/example-hotrod:1.30
- container_name: hotrod
- logging:
- options:
- max-size: 50m
- max-file: "3"
- command: ["all"]
- environment:
- - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
-
- load-hotrod:
- image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
- container_name: load-hotrod
- hostname: load-hotrod
- environment:
- ATTACKED_HOST: http://hotrod:8080
- LOCUST_MODE: standalone
- NO_PROXY: standalone
- TASK_DELAY_FROM: 5
- TASK_DELAY_TO: 30
- QUIET_MODE: "${QUIET_MODE:-false}"
- LOCUST_OPTS: "--headless -u 10 -r 1"
- volumes:
- - ../../../../deploy/docker/common/locust-scripts:/locust
diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml
index 4a3ad41870..b1c6a39d7e 100644
--- a/pkg/query-service/tests/test-deploy/docker-compose.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml
@@ -2,9 +2,11 @@ version: "2.4"
services:
clickhouse:
- image: yandex/clickhouse-server:21.12.3.32
+ image: clickhouse/clickhouse-server:22.4.5-alpine
volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
+ - ./clickhouse-users.xml:/etc/clickhouse-server/users.xml
+ - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml
restart: on-failure
logging:
options:
@@ -17,8 +19,8 @@ services:
timeout: 5s
retries: 3
ports:
- - "9000:9000"
- - "8123:8123"
+ - "9000:9000"
+ - "8123:8123"
alertmanager:
image: signoz/alertmanager:0.23.0-0.1