Skip to content

Commit

Permalink
Switch built-in ILM policies to max_primary_shard_size
Browse files Browse the repository at this point in the history 
Remove EOL to appease elastic-package

Signed-off-by: Craig Rodrigues <[email protected]>
  • Loading branch information
@rodrigc
rodrigc committed Oct 5, 2023
1 parent 486b3a5 commit fd393b5
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/app_logs/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/app_metrics/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/error_logs/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/internal_metrics/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/rum_traces/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.10m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "14d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...data_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.1m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "7d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ata_stream/service_destination_interval_metrics/elasticsearch/ilm/default_policy.60m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.10m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "14d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...apm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.1m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "7d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...pm/data_stream/service_summary_interval_metrics/elasticsearch/ilm/default_policy.60m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "14d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...data_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "7d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ata_stream/service_transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion apmpackage/apm/data_stream/traces/elasticsearch/ilm/default_policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.10m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "14d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...age/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.1m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "7d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
2 changes: 1 addition & 1 deletion ...ge/apm/data_stream/transaction_interval_metrics/elasticsearch/ilm/default_policy.60m.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actions": {
"rollover": {
"max_age": "30d",
"max_size": "50gb"
"max_primary_shard_size": "50gb"
},
"set_priority": {
"priority": 100
Expand Down
4 changes: 4 additions & 0 deletions changelogs/head.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions testing/smoke/lib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fd393b5

Please sign in to comment.