diff --git a/NOTICE.txt b/NOTICE.txt index f5986d684..84bd485d0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -438,11 +438,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto@v0. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-client/v7 -Version: v7.0.3 +Version: v7.1.1 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.0.3/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.1.1/LICENSE.txt: ELASTIC LICENSE AGREEMENT @@ -35629,6 +35629,218 @@ Contents of probable licence file $GOMODCACHE/github.com/google/licenseclassifie limitations under the License. +-------------------------------------------------------------------------------- +Dependency : github.com/google/pprof +Version: v0.0.0-20230426061923-93006964c1fc +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/google/pprof@v0.0.0-20230426061923-93006964c1fc/LICENSE: + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + + -------------------------------------------------------------------------------- Dependency : github.com/google/uuid Version: v1.3.0 diff --git a/go.mod b/go.mod index 17d127402..d1e9589b5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/deepmap/oapi-codegen v1.12.4 github.com/dgraph-io/ristretto v0.1.1 - github.com/elastic/elastic-agent-client/v7 v7.0.3 + github.com/elastic/elastic-agent-client/v7 v7.1.1 github.com/elastic/elastic-agent-libs v0.3.7 github.com/elastic/elastic-agent-system-metrics v0.6.1 github.com/elastic/go-elasticsearch/v8 v8.7.0 diff --git a/go.sum b/go.sum index bae5ac39f..807010542 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/elastic/elastic-agent-client/v7 v7.0.3 h1:YqZPnO7Z9rlj25sFZEUaxGGK3mZR4v0uSOcfO8GRv7s= -github.com/elastic/elastic-agent-client/v7 v7.0.3/go.mod h1:cHviLpA5fAwMbfBIHBVNl16qp90bO7pKHMAQaG+9raU= +github.com/elastic/elastic-agent-client/v7 v7.1.1 h1:Mob9Nme43P2FGyTQqLWQOWB1d5b54quXc7FPTPyzIic= +github.com/elastic/elastic-agent-client/v7 v7.1.1/go.mod h1:zz0T6l1XcG3kLyDrW8hY8bpI9fES9qkXI3vanY9e0d8= github.com/elastic/elastic-agent-libs v0.3.7 h1:81xd4P+aTBp98Gkm54RIvPUr/3306heUfSPyjUgiyjE= github.com/elastic/elastic-agent-libs v0.3.7/go.mod h1:h48hzjQcn6XPwfWRM5HimAKlsG0J92ULgAzdX+WedA8= github.com/elastic/elastic-agent-system-metrics v0.6.1 h1:LCN1lvQTkdUuU/rKlpKyVMDU/G/I8/iZWCaW6K+mo4o= @@ -224,6 +224,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 h1:OggOMmdI0JLwg1FkOKH9S7fVHF0oEm8PX6S8kAdpOps= +github.com/google/pprof v0.0.0-20230426061923-93006964c1fc h1:AGDHt781oIcL4EFk7cPnvBUYTwU8BEU6GDTO3ZMn1sE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= diff --git a/internal/pkg/server/agent.go b/internal/pkg/server/agent.go index 50f128c10..3606b2e20 100644 --- a/internal/pkg/server/agent.go +++ b/internal/pkg/server/agent.go @@ -19,7 +19,6 @@ import ( "github.com/elastic/fleet-server/v7/internal/pkg/state" "github.com/elastic/elastic-agent-client/v7/pkg/client" - "github.com/elastic/elastic-agent-client/v7/pkg/proto" "github.com/elastic/go-ucfg" "github.com/rs/zerolog/log" ) @@ -34,7 +33,7 @@ const ( ) type clientUnit interface { - Expected() (client.UnitState, client.UnitLogLevel, *proto.UnitExpectedConfig) + Expected() client.Expected UpdateState(state client.UnitState, message string, payload map[string]interface{}) error } @@ -158,10 +157,10 @@ func (a *Agent) UpdateState(state client.UnitState, message string, payload map[ func (a *Agent) unitAdded(ctx context.Context, unit *client.Unit) error { if unit.Type() == client.UnitTypeInput { - _, _, cfg := unit.Expected() - if cfg.Type != kFleetServer { + exp := unit.Expected() + if exp.Config.Type != kFleetServer { // not support input type - _ = unit.UpdateState(client.UnitStateFailed, fmt.Sprintf("%s is an unsupported input type", cfg.Type), nil) + _ = unit.UpdateState(client.UnitStateFailed, fmt.Sprintf("%s is an unsupported input type", exp.Config.Type), nil) return nil } if a.inputUnit != nil { @@ -177,10 +176,10 @@ func (a *Agent) unitAdded(ctx context.Context, unit *client.Unit) error { return a.start(ctx) } if unit.Type() == client.UnitTypeOutput { - _, _, cfg := unit.Expected() - if cfg.Type != kElasticsearch { + exp := unit.Expected() + if exp.Config.Type != kElasticsearch { // not support output type - _ = unit.UpdateState(client.UnitStateFailed, fmt.Sprintf("%s is an unsupported output type", cfg.Type), nil) + _ = unit.UpdateState(client.UnitStateFailed, fmt.Sprintf("%s is an unsupported output type", exp.Config.Type), nil) return nil } if a.outputUnit != nil { @@ -199,13 +198,13 @@ func (a *Agent) unitAdded(ctx context.Context, unit *client.Unit) error { } func (a *Agent) unitModified(ctx context.Context, unit *client.Unit) error { - state, _, _ := unit.Expected() + exp := unit.Expected() if unit.Type() == client.UnitTypeInput { if a.inputUnit != unit { // not our input unit; would have been marked failed in unitAdded; do nothing return nil } - if state == client.UnitStateHealthy { + if exp.State == client.UnitStateHealthy { if a.outputUnit == nil { // still no output unit; would have been marked starting already; do nothing return nil @@ -213,19 +212,19 @@ func (a *Agent) unitModified(ctx context.Context, unit *client.Unit) error { // configuration modified (should still be running) return a.reconfigure(ctx) - } else if state == client.UnitStateStopped { + } else if exp.State == client.UnitStateStopped { // unit should be stopped a.stop() return nil } - return fmt.Errorf("unknown unit state %v", state) + return fmt.Errorf("unknown unit state %v", exp.State) } if unit.Type() == client.UnitTypeOutput { if a.outputUnit != unit { // not our output unit; would have been marked failed in unitAdded; do nothing return nil } - if state == client.UnitStateHealthy { + if exp.State == client.UnitStateHealthy { if a.inputUnit == nil { // still no input unit; would have been marked starting already; do nothing return nil @@ -233,12 +232,12 @@ func (a *Agent) unitModified(ctx context.Context, unit *client.Unit) error { // configuration modified (should still be running) return a.reconfigure(ctx) - } else if state == client.UnitStateStopped { + } else if exp.State == client.UnitStateStopped { // unit should be stopped a.stop() return nil } - return fmt.Errorf("unknown unit state %v", state) + return fmt.Errorf("unknown unit state %v", exp.State) } return fmt.Errorf("unknown unit type %v", unit.Type()) } @@ -357,17 +356,17 @@ func (a *Agent) configFromUnits() (*config.Config, error) { agentID = agentInfo.ID agentVersion = agentInfo.Version } - _, inputLevel, inputCfg := a.inputUnit.Expected() - _, outputLevel, outputCfg := a.outputUnit.Expected() - logLevel := inputLevel - if outputLevel > logLevel { - logLevel = outputLevel + expInput := a.inputUnit.Expected() + expOutput := a.outputUnit.Expected() + logLevel := expInput.LogLevel + if expOutput.LogLevel > logLevel { + logLevel = expOutput.LogLevel } // pass inputs from policy through go-ucfg in order to flatten keys // if inputCfg.Source.AsMap() is passed directly, any additional server.* settings will be missed var input map[string]interface{} - inputsConfig, err := ucfg.NewFrom(inputCfg.Source.AsMap(), config.DefaultOptions...) + inputsConfig, err := ucfg.NewFrom(expInput.Config.Source.AsMap(), config.DefaultOptions...) if err != nil { return nil, err } @@ -386,7 +385,7 @@ func (a *Agent) configFromUnits() (*config.Config, error) { }, }, "output": map[string]interface{}{ - "elasticsearch": outputCfg.Source.AsMap(), + "elasticsearch": expOutput.Config.Source.AsMap(), }, "inputs": []interface{}{ input, diff --git a/internal/pkg/server/agent_test.go b/internal/pkg/server/agent_test.go index e6fcafb1c..898a78677 100644 --- a/internal/pkg/server/agent_test.go +++ b/internal/pkg/server/agent_test.go @@ -57,19 +57,23 @@ func TestCLIOverrides(t *testing.T) { mockInputUnit := &mockClientUnit{} mockInputUnit.On("Expected").Return( - client.UnitStateHealthy, - client.UnitLogLevelInfo, - &proto.UnitExpectedConfig{ - Source: sampleInputConfig, + client.Expected{ + State: client.UnitStateHealthy, + LogLevel: client.UnitLogLevelInfo, + Config: &proto.UnitExpectedConfig{ + Source: sampleInputConfig, + }, }, ) mockOutputUnit := &mockClientUnit{} mockOutputUnit.On("Expected").Return( - client.UnitStateHealthy, - client.UnitLogLevelInfo, - &proto.UnitExpectedConfig{ - Source: sampleOutputConfig, + client.Expected{ + State: client.UnitStateHealthy, + LogLevel: client.UnitLogLevelInfo, + Config: &proto.UnitExpectedConfig{ + Source: sampleOutputConfig, + }, }, ) @@ -126,13 +130,12 @@ type mockClientUnit struct { mock.Mock } -func (u *mockClientUnit) Expected() (client.UnitState, client.UnitLogLevel, *proto.UnitExpectedConfig) { +func (u *mockClientUnit) Expected() client.Expected { args := u.Called() - return args.Get(0).(client.UnitState), - args.Get(1).(client.UnitLogLevel), - args.Get(2).(*proto.UnitExpectedConfig) + return args.Get(0).(client.Expected) } + func (u *mockClientUnit) UpdateState(state client.UnitState, message string, payload map[string]interface{}) error { args := u.Called() return args.Get(0).(error) @@ -150,7 +153,12 @@ func Test_Agent_configFromUnits(t *testing.T) { }) require.NoError(t, err) mockOutClient := &mockClientUnit{} - mockOutClient.On("Expected").Return(client.UnitStateHealthy, client.UnitLogLevelInfo, &proto.UnitExpectedConfig{Source: outStruct}) + mockOutClient.On("Expected").Return( + client.Expected{ + State: client.UnitStateHealthy, + LogLevel: client.UnitLogLevelInfo, + Config: &proto.UnitExpectedConfig{Source: outStruct}, + }) inStruct, err := structpb.NewStruct(map[string]interface{}{ "type": "fleet-server", @@ -165,7 +173,12 @@ func Test_Agent_configFromUnits(t *testing.T) { }) require.NoError(t, err) mockInClient := &mockClientUnit{} - mockInClient.On("Expected").Return(client.UnitStateHealthy, client.UnitLogLevelInfo, &proto.UnitExpectedConfig{Source: inStruct}) + mockInClient.On("Expected").Return( + client.Expected{ + State: client.UnitStateHealthy, + LogLevel: client.UnitLogLevelInfo, + Config: &proto.UnitExpectedConfig{Source: inStruct}, + }) a := &Agent{ cliCfg: ucfg.New(), @@ -184,5 +197,4 @@ func Test_Agent_configFromUnits(t *testing.T) { assert.Equal(t, 1000, cfg.Inputs[0].Server.Limits.MaxAgents) assert.Equal(t, "test-token", cfg.Output.Elasticsearch.ServiceToken) }) - }