diff --git a/.mergify.yml b/.mergify.yml index ac8644c7ba1..aa850556a5d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -394,3 +394,29 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to 8.18 branch + conditions: + - merged + - label=backport-8.18 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.18" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to 9.0 branch + conditions: + - merged + - label=backport-9.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "9.0" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" diff --git a/libbeat/version/version.go b/libbeat/version/version.go index e507bd18b01..ea8c71881af 100644 --- a/libbeat/version/version.go +++ b/libbeat/version/version.go @@ -18,4 +18,4 @@ // Code generated by dev-tools/set_version package version -const defaultBeatVersion = "9.0.0" +const defaultBeatVersion = "9.1.0" diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index 03b48240814..14113667f38 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -17,11 +17,11 @@ services: # Used by base tests elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.14.2}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.17.1}-1 build: context: ./module/elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.14.2} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.17.1} environment: - "ES_JAVA_OPTS=-Xms256m -Xmx256m" - "transport.host=127.0.0.1" @@ -38,11 +38,11 @@ services: # Used by base tests kibana: - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.14.2}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.17.1}-1 build: context: ./module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-8.14.2} + KIBANA_VERSION: ${KIBANA_VERSION:-8.17.1} healthcheck: test: ["CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 @@ -53,11 +53,11 @@ services: # Used by base tests metricbeat: - image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.14.2}-1 + image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.17.1}-1 build: context: ./module/beat/_meta args: - BEAT_VERSION: ${BEAT_VERSION:-8.14.2} + BEAT_VERSION: ${BEAT_VERSION:-8.17.1} command: '-e' ports: - 5066:5066 diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml index e2de3751f72..a7f0fb3b9da 100644 --- a/testing/environments/latest.yml +++ b/testing/environments/latest.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.2 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1 healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -19,7 +19,7 @@ services: - "script.context.template.cache_max_size=2000" logstash: - image: docker.elastic.co/logstash/logstash:8.14.2 + image: docker.elastic.co/logstash/logstash:8.17.1 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 300 @@ -29,7 +29,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:8.14.2 + image: docker.elastic.co/kibana/kibana:8.17.1 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:5601"] retries: 300 diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml index a7038627e88..9f74541f834 100644 --- a/x-pack/metricbeat/docker-compose.yml +++ b/x-pack/metricbeat/docker-compose.yml @@ -24,11 +24,11 @@ services: kibana: # Copied configuration from OSS metricbeat because services with depends_on # cannot be extended with extends - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.14.2}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.17.1}-1 build: context: ../../metricbeat/module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-8.14.2} + KIBANA_VERSION: ${KIBANA_VERSION:-8.17.1} depends_on: - elasticsearch ports: