From 286f8578e52130129eb070bdff319876369a3666 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Wed, 4 Jun 2025 09:14:47 +0200 Subject: [PATCH 1/4] Rename target destination for microbenchmarks --- .buildkite/hooks/pre-command | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index dbd5b77562106..2bce66763a847 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -96,7 +96,7 @@ fi if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/esbench-metics) - PERF_METRICS_INDEX="dummy-micro-benchmarks" + PERF_METRICS_INDEX="metrics-microbenchmarks-default" PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/esbench-metics) PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/esbench-metics) From cd4ee51d396f00fc6d3fbaf15348324d6dbc671e Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Thu, 5 Jun 2025 08:49:40 +0200 Subject: [PATCH 2/4] inline index name --- .buildkite/hooks/pre-command | 2 -- .buildkite/scripts/index-micro-benchmark-results.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 2bce66763a847..37bf7c9b00d07 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -96,12 +96,10 @@ fi if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/esbench-metics) - PERF_METRICS_INDEX="metrics-microbenchmarks-default" PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/esbench-metics) PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/esbench-metics) export PERF_METRICS_HOST - export PERF_METRICS_INDEX export PERF_METRICS_USERNAME export PERF_METRICS_PASSWORD fi diff --git a/.buildkite/scripts/index-micro-benchmark-results.sh b/.buildkite/scripts/index-micro-benchmark-results.sh index b7ffd82c529f1..735b68b8cc14d 100755 --- a/.buildkite/scripts/index-micro-benchmark-results.sh +++ b/.buildkite/scripts/index-micro-benchmark-results.sh @@ -3,7 +3,7 @@ jq -c '.[]' "benchmarks/build/result.json" | while read -r doc; do doc=$(echo "$doc" | jq --argjson timestamp "$(date +%s000)" '. + {"@timestamp": $timestamp}') echo "Indexing $(echo "$doc" | jq -r '.benchmark')" - curl -s -X POST "https://$PERF_METRICS_HOST/$PERF_METRICS_INDEX/_doc" \ + curl -s -X POST "https://$PERF_METRICS_HOST/metrics-microbenchmarks-default/_doc" \ -u "$PERF_METRICS_USERNAME:$PERF_METRICS_PASSWORD" \ -H 'Content-Type: application/json' \ -d "$doc" From b4dcb5d730b953c7e46e9a038d79b8fca08c5965 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Tue, 10 Jun 2025 10:06:05 +0200 Subject: [PATCH 3/4] update credentials path --- .buildkite/hooks/pre-command | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 37bf7c9b00d07..245d0245c93fa 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -95,9 +95,9 @@ if [[ "${USE_PROD_DOCKER_CREDENTIALS:-}" == "true" ]]; then fi if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then - PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/esbench-metics) - PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/esbench-metics) - PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/esbench-metics) + PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/microbenchmarks-metics) + PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/microbenchmarks-metics) + PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/microbenchmarks-metics) export PERF_METRICS_HOST export PERF_METRICS_USERNAME From 1597efdc15818c48610a944532bd5c74b1f48f63 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Tue, 10 Jun 2025 11:30:38 +0200 Subject: [PATCH 4/4] fix typo --- .buildkite/hooks/pre-command | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 245d0245c93fa..4c8a152e17c8b 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -95,9 +95,9 @@ if [[ "${USE_PROD_DOCKER_CREDENTIALS:-}" == "true" ]]; then fi if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then - PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/microbenchmarks-metics) - PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/microbenchmarks-metics) - PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/microbenchmarks-metics) + PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/microbenchmarks-metrics) + PERF_METRICS_USERNAME=$(vault read -field=es_username /secret/ci/elastic-elasticsearch/microbenchmarks-metrics) + PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/microbenchmarks-metrics) export PERF_METRICS_HOST export PERF_METRICS_USERNAME