Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/scripts/load-testing.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

STACK_VERSION=${1:-8.19.5}
STACK_VERSION=${1:-8.19.6}
USER_ID="$(id -u):$(id -g)"
# The migration of this to Node.js 18 will wait. To update playwright (and browsers)
# to make it work in Node.js 18 and latest version in ubuntu (or another OS)
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/pull_and_build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
export NODEJS_VERSION=$(cat .nvmrc)
export STACK_VERSION=${STACK_VERSION:-8.19.5}
export STACK_VERSION=${STACK_VERSION:-8.19.6}

STACK_VERSION=${STACK_VERSION} \
docker --log-level INFO compose -f ./dev-utils/docker-compose.yml pull --quiet --ignore-pull-failures
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -xo pipefail

STACK_VERSION=${STACK_VERSION:-"8.19.5"}
STACK_VERSION=${STACK_VERSION:-"8.19.6"}
APM_SERVER_PORT=${APM_SERVER_PORT:-"8200"}
APM_SERVER_URL=${APM_SERVER_URL:-"http://apm-server:8200"}
KIBANA_URL=${KIBANA_URL:-"http://kibana:5601"}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
matrix:
stack-version:
- '8.2.0-SNAPSHOT'
- '8.19.5'
- '8.19.6'
scope:
- '@elastic/apm-rum'
- '@elastic/apm-rum-core'
Expand Down Expand Up @@ -118,4 +118,4 @@ jobs:
uses: ./.github/workflows/run-test
with:
goal: 'coverage'
stack-version: '8.19.5'
stack-version: '8.19.6'
4 changes: 2 additions & 2 deletions .github/workflows/microbenchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
stack_version:
description: 'Stack Version'
default: '8.19.5'
default: '8.19.6'
required: false
push:
branches:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Run buildkite pipeline
uses: elastic/oblt-actions/buildkite/run@v1
env:
STACK_VERSION: ${{ inputs.stack_version || '8.19.5' }}
STACK_VERSION: ${{ inputs.stack_version || '8.19.6' }}
with:
token: ${{ secrets.BUILDKITE_TOKEN }}
pipeline: apm-agent-microbenchmark
Expand Down
6 changes: 3 additions & 3 deletions dev-utils/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
elasticsearch:
container_name: elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.19.5}
image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.19.6}
environment:
- cluster.name=docker-cluster
- bootstrap.memory_lock=true
Expand Down Expand Up @@ -46,7 +46,7 @@ services:

fleet-server:
container_name: apm-server
image: docker.elastic.co/beats/elastic-agent:${STACK_VERSION:-8.19.5}
image: docker.elastic.co/beats/elastic-agent:${STACK_VERSION:-8.19.6}
entrypoint: "/bin/bash"
command:
- "-l"
Expand Down Expand Up @@ -81,7 +81,7 @@ services:

kibana:
container_name: kibana
image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-8.19.5}
image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-8.19.6}
environment:
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-kibana_system_user}"
Expand Down
2 changes: 1 addition & 1 deletion packages/rum-core/test/run-apm-server.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ELASTICSEARCH_PORT=9201 STACK_VERSION=8.19.5 APM_SERVER_PORT=8001 docker compose up apm-server kibana
ELASTICSEARCH_PORT=9201 STACK_VERSION=8.19.6 APM_SERVER_PORT=8001 docker compose up apm-server kibana
4 changes: 2 additions & 2 deletions packages/rum/test/run-apm-server.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#docker run -p 127.0.0.1:8200:8201 elastic/apm-server:6.2.4 /bin/sh -c "apm-server -e -E output.elasticsearch.password=$(ELASTICSEARCH_PASSWORD) -E output.elasticsearch.username=$(ELASTICSEARCH_USERNAME) -E output.elasticsearch.hosts=['$(ELASTICSEARCH_SERVICE_HOST):$(ELASTICSEARCH_SERVICE_PORT)'] -E apm-server.expvar.enabled=true -E apm-server.frontend.enabled=true -E apm-server.frontend.rate_limit=100000 -E apm-server.host=0.0.0.0:8200 -E apm-server.read_timeout=1m -E apm-server.shutdown_timeout=2m -E apm-server.write_timeout=1m"
STACK_VERSION=8.19.5 APM_SERVER_PORT=8001 docker compose up apm-server
#STACK_VERSION=8.19.5 docker compose -f ./test/docker compose.yml start apm-server
STACK_VERSION=8.19.6 APM_SERVER_PORT=8001 docker compose up apm-server
#STACK_VERSION=8.19.6 docker compose -f ./test/docker compose.yml start apm-server
Loading