-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Set default indices in code and disable ILM.
* Set index default configuration in code, by using new supporter interface * Set ILM noop supporter to disable ILM in APM * adapt system tests to use default indices configuration by default fixes #1480 fixes #1852
- Loading branch information
Showing
13 changed files
with
754 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package idxmgmt | ||
|
|
||
| const defaultIndex = "apm-%{[observer.version]}-%{+yyyy.MM.dd}" | ||
|
|
||
| var defaultIndices = []map[string]interface{}{ | ||
| { | ||
| "index": "apm-%{[observer.version]}-sourcemap", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "sourcemap"}}, | ||
| }, { | ||
| "index": "apm-%{[observer.version]}-error-%{+yyyy.MM.dd}", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "error"}}, | ||
| }, { | ||
| "index": "apm-%{[observer.version]}-transaction-%{+yyyy.MM.dd}", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "transaction"}}, | ||
| }, { | ||
| "index": "apm-%{[observer.version]}-span-%{+yyyy.MM.dd}", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "span"}}, | ||
| }, { | ||
| "index": "apm-%{[observer.version]}-metric-%{+yyyy.MM.dd}", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "metric"}}, | ||
| }, { | ||
| "index": "apm-%{[observer.version]}-onboarding-%{+yyyy.MM.dd}", | ||
| "when": map[string]interface{}{"contains": map[string]interface{}{"processor.event": "onboarding"}}, | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package ilm | ||
|
|
||
| import ( | ||
| "github.com/elastic/beats/libbeat/beat" | ||
| "github.com/elastic/beats/libbeat/common" | ||
| "github.com/elastic/beats/libbeat/idxmgmt/ilm" | ||
| "github.com/elastic/beats/libbeat/logp" | ||
| ) | ||
|
|
||
| // MakeDefaultSupporter creates the ILM supporter for APM that is passed to libbeat. | ||
| // Currently ILM is disabled by using a NoopSupport. | ||
| func MakeDefaultSupporter(_ *logp.Logger, info beat.Info, config *common.Config) (ilm.Supporter, error) { | ||
| return ilm.NoopSupport(info, config) | ||
| } |
Oops, something went wrong.