-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
1 parent
2419c17
commit 36362e5
Showing
12 changed files
with
229 additions
and
21 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,79 @@ | ||
| // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| // or more contributor license agreements. Licensed under the Elastic License; | ||
| // you may not use this file except in compliance with the Elastic License. | ||
|
|
||
| package plugin | ||
|
|
||
| import ( | ||
| "gopkg.in/yaml.v2" | ||
|
|
||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/errors" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/program" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/config" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger" | ||
| ) | ||
|
|
||
| type configFetcher interface { | ||
| Config() string | ||
| } | ||
|
|
||
| // IsRestartNeeded returns true if | ||
| // - spec is configured to support restart on change | ||
| // - output changes in between configs | ||
| func IsRestartNeeded(log *logger.Logger, spec program.Spec, cfgFetch configFetcher, newCfg map[string]interface{}) bool { | ||
| // compare outputs | ||
| curCfgStr := cfgFetch.Config() | ||
| if curCfgStr == "" { | ||
| // no config currently applied | ||
| return false | ||
| } | ||
|
|
||
| currentOutput, err := getOutputConfigFromString(curCfgStr) | ||
| if err != nil { | ||
| log.Errorf("failed to retrieve output config from current state: %v", err) | ||
| return false | ||
| } | ||
|
|
||
| newOutput, err := getOutputConfigFromMap(newCfg) | ||
| if err != nil { | ||
| log.Errorf("failed to retrieve output config from new state: %v", err) | ||
| return false | ||
| } | ||
|
|
||
| // restart needed only if specified and output changed | ||
| return spec.RestartOnOutputChange && currentOutput != newOutput | ||
| } | ||
|
|
||
| func getOutputConfigFromString(cfgString string) (string, error) { | ||
| cfg, err := config.NewConfigFrom(cfgString) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| cfgMap, err := cfg.ToMapStr() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return getOutputConfigFromMap(cfgMap) | ||
| } | ||
|
|
||
| func getOutputConfigFromMap(cfgMap map[string]interface{}) (string, error) { | ||
| outputCfgIface, found := cfgMap["output"] | ||
| if !found { | ||
| // output not found not an error | ||
| return "", nil | ||
| } | ||
|
|
||
| outputCfg, ok := outputCfgIface.(map[string]interface{}) | ||
| if !ok { | ||
| return "", errors.New("not a map") | ||
| } | ||
|
|
||
| cfgStr, err := yaml.Marshal(outputCfg) | ||
| if err != nil { | ||
| return "", errors.New(err, errors.TypeApplication) | ||
| } | ||
|
|
||
| return string(cfgStr), nil | ||
| } |
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,95 @@ | ||
| // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| // or more contributor license agreements. Licensed under the Elastic License; | ||
| // you may not use this file except in compliance with the Elastic License. | ||
|
|
||
| package plugin | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "gopkg.in/yaml.v2" | ||
|
|
||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/errors" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/program" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger" | ||
| ) | ||
|
|
||
| func TestRestartNeeded(t *testing.T) { | ||
| tt := []struct { | ||
| Name string | ||
| OldOutput map[string]interface{} | ||
| NewOutput map[string]interface{} | ||
| ShouldRestart bool | ||
|
|
||
| ExpectedRestart bool | ||
| }{ | ||
| { | ||
| "same empty output", | ||
| map[string]interface{}{}, | ||
| map[string]interface{}{}, | ||
| true, | ||
| false, | ||
| }, | ||
| { | ||
| "same not empty output", | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "123456"}}, | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "123456"}}, | ||
| true, | ||
| false, | ||
| }, | ||
| { | ||
| "different empty output", | ||
| map[string]interface{}{}, | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "123456"}}, | ||
| true, | ||
| false, | ||
| }, | ||
| { | ||
| "different not empty output", | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "123456"}}, | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "s3cur3_Pa55;"}}, | ||
| true, | ||
| true, | ||
| }, | ||
| { | ||
| "different not empty output no restart required", | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "123456"}}, | ||
| map[string]interface{}{"output": map[string]interface{}{"username": "user", "password": "s3cur3_Pa55;"}}, | ||
| false, | ||
| false, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tt { | ||
| t.Run(tc.Name, func(t *testing.T) { | ||
| cf, err := newTestConfigFetcher(tc.OldOutput) | ||
| require.NoError(t, err) | ||
| s := testProgramSpec(tc.ShouldRestart) | ||
| l, _ := logger.New("tst", false) | ||
|
|
||
| IsRestartNeeded(l, s, cf, tc.NewOutput) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func newTestConfigFetcher(cfg map[string]interface{}) (*testConfigFetcher, error) { | ||
| cfgStr, err := yaml.Marshal(cfg) | ||
| if err != nil { | ||
| return nil, errors.New(err, errors.TypeApplication) | ||
| } | ||
|
|
||
| return &testConfigFetcher{cfg: string(cfgStr)}, nil | ||
| } | ||
|
|
||
| type testConfigFetcher struct { | ||
| cfg string | ||
| } | ||
|
|
||
| func (f testConfigFetcher) Config() string { return f.cfg } | ||
|
|
||
| func testProgramSpec(restartOnOutput bool) program.Spec { | ||
| return program.Spec{ | ||
| RestartOnOutputChange: restartOnOutput, | ||
| } | ||
| } |
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
Oops, something went wrong.