Merge branch 'main' into build/bump-ubuntu-22

elastic · Oct 6, 2023 · c6571a5 · c6571a5
2 parents 49219f1 + 0e174d1
commit c6571a5
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 32 deletions.
diff --git a/apmpackage/apm/data_stream/app_logs/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/app_logs/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/apmpackage/apm/data_stream/app_metrics/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/app_metrics/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/apmpackage/apm/data_stream/error_logs/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/error_logs/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/apmpackage/apm/data_stream/rum_traces/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/rum_traces/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.10m.json b/...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.10m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "14d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...data_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.1m.json b/...data_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.1m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "7d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.60m.json b/...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.60m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.10m.json b/...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.10m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "14d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...apm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.1m.json b/...apm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.1m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "7d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.60m.json b/...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.60m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json b/...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "14d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...data_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json b/...data_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "7d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json b/...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/apmpackage/apm/data_stream/traces/elasticsearch/ilm/default_policy.json b/apmpackage/apm/data_stream/traces/elasticsearch/ilm/default_policy.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json b/...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "14d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...age/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json b/...age/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "7d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json b/...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json
@@ -5,7 +5,7 @@
                 "actions": {
                     "rollover": {
                         "max_age": "30d",
-                        "max_size": "50gb"
+                        "max_primary_shard_size": "50gb"
                     },
                     "set_priority": {
                         "priority": 100

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -6,6 +6,10 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
 [float]
 ==== Breaking Changes
 
+[float]
+==== Bug fixes
+- Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
+
 [float]
 ==== Deprecations
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ x-logging: &default-logging
     max-size: "1g"
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-4e7ff248-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-867cd584-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.11.0-4e7ff248-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.11.0-867cd584-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.11.0-4e7ff248-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.11.0-867cd584-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/internal/beater/middleware/recover_panic_middleware.go b/internal/beater/middleware/recover_panic_middleware.go
@@ -48,7 +48,7 @@ func RecoverPanicMiddleware() Middleware {
 					// set the context's result and write response
 					var ok bool
 					var err error
-					if err, ok = r.(error); !ok {
+					if err, ok = r.(error); ok {
 						err = errors.Wrap(err, status.Keyword)
 					}
 					c.Result.Set(id, status.Code, status.Keyword, keywordPanic, err)

diff --git a/packaging/ironbank/Dockerfile b/packaging/ironbank/Dockerfile
@@ -4,7 +4,7 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.7
+ARG BASE_TAG=8.8
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files
 

diff --git a/packaging/ironbank/hardening_manifest.yaml b/packaging/ironbank/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.7"
+  BASE_TAG: "8.8"
   ELASTIC_STACK: "${APM_SERVER_VERSION}"
   ELASTIC_PRODUCT: "apm-server"
 

diff --git a/testing/infra/k8s/base/kustomization.yaml b/testing/infra/k8s/base/kustomization.yaml
@@ -1,6 +1,6 @@
 resources:
-  - https://download.elastic.co/downloads/eck/2.4.0/crds.yaml
-  - https://download.elastic.co/downloads/eck/2.4.0/operator.yaml
+  - https://download.elastic.co/downloads/eck/2.9.0/crds.yaml
+  - https://download.elastic.co/downloads/eck/2.9.0/operator.yaml
   - stack/elasticsearch.yaml
   - stack/kibana.yaml
   - stack/apm-server.yaml
diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml
@@ -3,7 +3,7 @@ kind: ApmServer
 metadata:
   name: apm-server
 spec:
-  version: 8.11.0-4e7ff248-SNAPSHOT
+  version: 8.11.0-867cd584-SNAPSHOT
   count: 1
   http:
     tls:

diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.11.0-4e7ff248-SNAPSHOT
+  version: 8.11.0-867cd584-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.11.0-4e7ff248-SNAPSHOT
+  version: 8.11.0-867cd584-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch

diff --git a/testing/smoke/lib.sh b/testing/smoke/lib.sh
@@ -262,15 +262,15 @@ legacy_assert_ilm() {
         SUCCESS=false
     fi
     local ILM_HOT_PHASE=$(echo ${ILM_PHASES} | jq '.hot')
-    local ILM_HOT_PHASE_MAX_SIZE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_size')
+    local ILM_HOT_PHASE_MAX_SIZE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_primary_shard_size')
     local ILM_HOT_PHASE_MAX_AGE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_age')
     if [[ "${ILM_HOT_PHASE_MAX_SIZE}" != "${EXPECTED_MAX_SIZE}" ]]; then
-        echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_size ${EXPECTED_MAX_SIZE} got ${ILM_HOT_PHASE_MAX_SIZE}"
+        echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_primary_shard_size ${EXPECTED_MAX_SIZE} got ${ILM_HOT_PHASE_MAX_SIZE}"
         echo "${ILM_HOT_PHASE}"
         SUCCESS=false
     fi
     if [[ "${ILM_HOT_PHASE_MAX_AGE}" != "${EXPECTED_MAX_AGE}" ]]; then
-        echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_size ${EXPECTED_MAX_AGE} got ${ILM_HOT_PHASE_MAX_AGE}"
+        echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_age ${EXPECTED_MAX_AGE} got ${ILM_HOT_PHASE_MAX_AGE}"
         echo "${ILM_HOT_PHASE}"
         SUCCESS=false
     fi