diff --git a/docker-compose.yml b/docker-compose.yml index 2da182a47a9..6f70ba02af5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ x-logging: &default-logging services: elasticsearch: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-d117fe4b-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-0dbaa119-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -43,7 +43,7 @@ services: kibana: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/kibana/kibana:9.0.0-d117fe4b-SNAPSHOT + image: docker.elastic.co/kibana/kibana:9.0.0-0dbaa119-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -63,7 +63,7 @@ services: metricbeat: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/beats/metricbeat:9.0.0-d117fe4b-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:9.0.0-0dbaa119-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/docker/elasticsearch/roles.yml b/testing/docker/elasticsearch/roles.yml index 40484d004b5..f19fa98a90b 100644 --- a/testing/docker/elasticsearch/roles.yml +++ b/testing/docker/elasticsearch/roles.yml @@ -3,7 +3,7 @@ apm_server: indices: - names: ['apm-*', 'traces-apm*', 'logs-apm*', 'metrics-apm*'] privileges: ['write','create_index','manage','manage_ilm'] - - names: ['.apm-source-map'] + - names: ['.apm-source-map', 'traces-apm.sampled*'] privileges: ['read'] applications: - application: 'apm' diff --git a/testing/docker/elasticsearch/users_roles b/testing/docker/elasticsearch/users_roles index 3330a232190..08ab802feb8 100644 --- a/testing/docker/elasticsearch/users_roles +++ b/testing/docker/elasticsearch/users_roles @@ -1,6 +1,5 @@ apm_server:apm_server_user apm_system:apm_server_user -apm_user:apm_server_user,apm_user_ro beats:beats_user beats_system:beats_user,filebeat_user,heartbeat_user,metricbeat_user filebeat:filebeat_user diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 358a1699694..c5bb0feacfe 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-43c887b6-SNAPSHOT + version: 9.0.0-0dbaa119-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index d34aa46781d..287ea690736 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -4,7 +4,7 @@ metadata: name: elasticsearch spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-43c887b6-SNAPSHOT + version: 9.0.0-0dbaa119-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 0593a2e2d8d..0fc5e398b7d 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -4,7 +4,7 @@ metadata: name: kibana spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-43c887b6-SNAPSHOT + version: 9.0.0-0dbaa119-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch