diff --git a/NOTICE.txt b/NOTICE.txt index 7d281a6b5649..fd9bbc4d7866 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -25519,6 +25519,218 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf limitations under the License. +-------------------------------------------------------------------------------- +Dependency : go.opentelemetry.io/collector/confmap/provider/fileprovider +Version: v1.33.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/confmap/provider/fileprovider@v1.33.0/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 : go.opentelemetry.io/collector/consumer Version: v1.33.0 @@ -65560,218 +65772,6 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf limitations under the License. --------------------------------------------------------------------------------- -Dependency : go.opentelemetry.io/collector/confmap/provider/fileprovider -Version: v1.33.0 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/confmap/provider/fileprovider@v1.33.0/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 : go.opentelemetry.io/collector/confmap/provider/yamlprovider Version: v1.33.0 diff --git a/go.mod b/go.mod index 542b3b4f023b..487f264f5fa5 100644 --- a/go.mod +++ b/go.mod @@ -222,6 +222,7 @@ require ( go.opentelemetry.io/collector/component v1.33.0 go.opentelemetry.io/collector/config/configtls v1.33.0 go.opentelemetry.io/collector/confmap v1.33.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0 go.opentelemetry.io/collector/consumer v1.33.0 go.opentelemetry.io/collector/consumer/consumererror v0.127.0 go.opentelemetry.io/collector/exporter/debugexporter v0.127.0 diff --git a/libbeat/otelbeat/beatconverter/beatconverter.go b/libbeat/otelbeat/beatconverter/beatconverter.go index 8321d2fe622f..f46f6f94e8e9 100644 --- a/libbeat/otelbeat/beatconverter/beatconverter.go +++ b/libbeat/otelbeat/beatconverter/beatconverter.go @@ -94,6 +94,8 @@ func (c converter) Convert(_ context.Context, conf *confmap.Conf) error { if err != nil { return err } + // noop, it will get replaced by otelconsumer below + case "otelconsumer": default: return fmt.Errorf("output type %q is unsupported in OTel mode", key) } @@ -114,7 +116,7 @@ func (c converter) Convert(_ context.Context, conf *confmap.Conf) error { // inject log level receiverConfig, err := config.NewConfigFrom(receiverCfg.ToStringMap()) if err != nil { - return fmt.Errorf("Error getting receiver config: %w", err) + return fmt.Errorf("error getting receiver config: %w", err) } if level, _ := receiverConfig.String("logging.level", -1); level != "" { diff --git a/x-pack/filebeat/tests/integration/otel_test.go b/x-pack/filebeat/tests/integration/otel_test.go index 10271fe1b73f..94901a71244b 100644 --- a/x-pack/filebeat/tests/integration/otel_test.go +++ b/x-pack/filebeat/tests/integration/otel_test.go @@ -73,6 +73,7 @@ http.port: %d filebeatOTel.WriteConfigFile(fmt.Sprintf(beatsCfgFile, logFilePath, "logs-integration-default", 5066)) writeEventsToLogFile(t, logFilePath, numEvents) filebeatOTel.Start() + defer filebeatOTel.Stop() // start filebeat filebeat := integration.NewBeat( @@ -86,6 +87,7 @@ http.port: %d filebeat.WriteConfigFile(s) filebeat.Start() + defer filebeat.Stop() // prepare to query ES es := integration.GetESClient(t, "http") @@ -122,7 +124,7 @@ http.port: %d } assertMapsEqual(t, filebeatDoc, otelDoc, ignoredFields, "expected documents to be equal") - assertMonitoring(t) + assertMonitoring(t, 5066) } func TestHTTPJSONInputOTel(t *testing.T) { @@ -286,16 +288,317 @@ func assertMapsEqual(t *testing.T, m1, m2 mapstr.M, ignoredFields []string, msg require.Equal(t, "", cmp.Diff(flatM1, flatM2), "expected maps to be equal") } -func assertMonitoring(t *testing.T) { - r, err := http.Get("http://localhost:5066") //nolint:noctx,bodyclose // fine for tests +func assertMonitoring(t *testing.T, port int) { + address := fmt.Sprintf("http://localhost:%d", port) + r, err := http.Get(address) //nolint:noctx,bodyclose,gosec // fine for tests require.NoError(t, err) require.Equal(t, http.StatusOK, r.StatusCode, "incorrect status code") - r, err = http.Get("http://localhost:5066/stats") //nolint:noctx,bodyclose // fine for tests + r, err = http.Get(address + "/stats") //nolint:noctx,bodyclose // fine for tests require.NoError(t, err) require.Equal(t, http.StatusOK, r.StatusCode, "incorrect status code") - r, err = http.Get("http://localhost:5066/not-exist") //nolint:noctx,bodyclose // fine for tests + r, err = http.Get(address + "/not-exist") //nolint:noctx,bodyclose // fine for tests require.NoError(t, err) require.Equal(t, http.StatusNotFound, r.StatusCode, "incorrect status code") } + +func TestFilebeatOTelReceiverE2E(t *testing.T) { + integration.EnsureESIsRunning(t) + wantEvents := 1 + + // start filebeat in otel mode + filebeatOTel := integration.NewBeat( + t, + "filebeat-otel", + "../../filebeat.test", + "otel", + ) + + otelConfig := struct { + Index string + MonitoringPort int + InputFile string + PathHome string + }{ + Index: "logs-integration-default", + MonitoringPort: 5066, + InputFile: filepath.Join(filebeatOTel.TempDir(), "log.log"), + PathHome: filebeatOTel.TempDir(), + } + + cfg := `receivers: + filebeatreceiver: + filebeat: + inputs: + - type: filestream + id: filestream-fbreceiver + enabled: true + paths: + - {{.InputFile}} + prospector.scanner.fingerprint.enabled: false + file_identity.native: ~ + output: + otelconsumer: + logging: + level: info + selectors: + - '*' + queue.mem.flush.timeout: 0s + path.home: {{.PathHome}} + http.enabled: true + http.host: localhost + http.port: {{.MonitoringPort}} +exporters: + debug: + use_internal_logger: false + verbosity: detailed + elasticsearch/log: + endpoints: + - http://localhost:9200 + compression: none + user: admin + password: testing + logs_index: {{.Index}} + batcher: + enabled: true + flush_timeout: 1s + mapping: + mode: bodymap +service: + pipelines: + logs: + receivers: + - filebeatreceiver + exporters: + - elasticsearch/log + - debug +` + var configBuffer bytes.Buffer + require.NoError(t, + template.Must(template.New("config").Parse(cfg)).Execute(&configBuffer, otelConfig)) + configContents := configBuffer.Bytes() + t.Cleanup(func() { + if t.Failed() { + t.Logf("Config contents:\n%s", configContents) + } + }) + + filebeatOTel.WriteConfigFile(string(configContents)) + writeEventsToLogFile(t, otelConfig.InputFile, wantEvents) + filebeatOTel.Start() + defer filebeatOTel.Stop() + + // start filebeat + filebeat := integration.NewBeat( + t, + "filebeat", + "../../filebeat.test", + ) + + beatsCfgFile := ` +filebeat.inputs: + - type: filestream + id: filestream-input-id + enabled: true + file_identity.native: ~ + prospector.scanner.fingerprint.enabled: false + paths: + - %s +output: + elasticsearch: + hosts: + - localhost:9200 + username: admin + password: testing + index: %s +queue.mem.flush.timeout: 0s +setup.template.enabled: false +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + - add_docker_metadata: ~ + - add_kubernetes_metadata: ~ +setup.template.name: logs-filebeat-default +setup.template.pattern: logs-filebeat-default +http.enabled: true +http.host: localhost +http.port: %d +` + logFilePath := filepath.Join(filebeat.TempDir(), "log.log") + writeEventsToLogFile(t, logFilePath, wantEvents) + s := fmt.Sprintf(beatsCfgFile, logFilePath, "logs-filebeat-default", 5067) + filebeat.WriteConfigFile(s) + filebeat.Start() + defer filebeat.Stop() + + es := integration.GetESClient(t, "http") + + var filebeatDocs estools.Documents + var otelDocs estools.Documents + var err error + + // wait for logs to be published + require.Eventuallyf(t, + func() bool { + findCtx, findCancel := context.WithTimeout(context.Background(), 10*time.Second) + defer findCancel() + + otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-integration-default*") + require.NoError(t, err) + + filebeatDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-filebeat-default*") + require.NoError(t, err) + + return otelDocs.Hits.Total.Value >= wantEvents && filebeatDocs.Hits.Total.Value >= wantEvents + }, + 2*time.Minute, 1*time.Second, "expected at least %d events, got filebeat: %d and otel: %d", wantEvents, filebeatDocs.Hits.Total.Value, otelDocs.Hits.Total.Value) + + filebeatDoc := filebeatDocs.Hits.Hits[0].Source + otelDoc := otelDocs.Hits.Hits[0].Source + ignoredFields := []string{ + // Expected to change between agentDocs and OtelDocs + "@timestamp", + "agent.ephemeral_id", + "agent.id", + "log.file.inode", + "log.file.path", + } + + assertMapsEqual(t, filebeatDoc, otelDoc, ignoredFields, "expected documents to be equal") + assertMonitoring(t, otelConfig.MonitoringPort) + assertMonitoring(t, 5067) // filebeat +} + +func TestFilebeatOTelMultipleReceiversE2E(t *testing.T) { + integration.EnsureESIsRunning(t) + wantEvents := 100 + + // start filebeat in otel mode + filebeatOTel := integration.NewBeat( + t, + "filebeat-otel", + "../../filebeat.test", + "otel", + ) + + // write events to log file + logFilePath := filepath.Join(filebeatOTel.TempDir(), "log.log") + writeEventsToLogFile(t, logFilePath, wantEvents) + + type receiverConfig struct { + MonitoringPort int + InputFile string + PathHome string + } + + otelConfig := struct { + Index string + Receivers []receiverConfig + }{ + Index: "logs-integration-default", + Receivers: []receiverConfig{ + { + MonitoringPort: 5066, + InputFile: logFilePath, + PathHome: filebeatOTel.TempDir(), + }, + { + MonitoringPort: 5067, + InputFile: logFilePath, + PathHome: filebeatOTel.TempDir(), + }, + }, + } + + cfg := `receivers: +{{range $i, $receiver := .Receivers}} + filebeatreceiver/{{$i}}: + filebeat: + inputs: + - type: filestream + id: filestream-fbreceiver + enabled: true + paths: + - {{$receiver.InputFile}} + prospector.scanner.fingerprint.enabled: false + file_identity.native: ~ + output: + otelconsumer: + logging: + level: info + selectors: + - '*' + queue.mem.flush.timeout: 0s + path.home: {{$receiver.PathHome}} +{{if $receiver.MonitoringPort}} + http.enabled: true + http.host: localhost + http.port: {{$receiver.MonitoringPort}} +{{end}} +{{end}} +exporters: + debug: + use_internal_logger: false + verbosity: detailed + elasticsearch/log: + endpoints: + - http://localhost:9200 + compression: none + user: admin + password: testing + logs_index: {{.Index}} + batcher: + enabled: true + flush_timeout: 1s + mapping: + mode: bodymap +service: + pipelines: + logs: + receivers: +{{range $i, $receiver := .Receivers}} + - filebeatreceiver/{{$i}} +{{end}} + exporters: + - debug + - elasticsearch/log +` + var configBuffer bytes.Buffer + require.NoError(t, + template.Must(template.New("config").Parse(cfg)).Execute(&configBuffer, otelConfig)) + configContents := configBuffer.Bytes() + + t.Cleanup(func() { + if t.Failed() { + t.Logf("Config contents:\n%s", configContents) + } + }) + + filebeatOTel.WriteConfigFile(string(configContents)) + writeEventsToLogFile(t, logFilePath, wantEvents) + filebeatOTel.Start() + defer filebeatOTel.Stop() + + es := integration.GetESClient(t, "http") + + var otelDocs estools.Documents + var err error + + // wait for logs to be published + wantTotalLogs := wantEvents * len(otelConfig.Receivers) + require.Eventuallyf(t, + func() bool { + findCtx, findCancel := context.WithTimeout(t.Context(), 10*time.Second) + defer findCancel() + + otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-integration-default*") + require.NoError(t, err) + + return otelDocs.Hits.Total.Value >= wantTotalLogs + }, + 2*time.Minute, 100*time.Millisecond, "expected at least %d events, got %d", wantTotalLogs, otelDocs.Hits.Total.Value) + for _, rec := range otelConfig.Receivers { + assertMonitoring(t, rec.MonitoringPort) + } +} diff --git a/x-pack/libbeat/common/otelbeat/otel.go b/x-pack/libbeat/common/otelbeat/otel.go index f338584cde9a..551ec161f30a 100644 --- a/x-pack/libbeat/common/otelbeat/otel.go +++ b/x-pack/libbeat/common/otelbeat/otel.go @@ -7,18 +7,24 @@ package otelbeat import ( "context" "fmt" + "os" + "path/filepath" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter" "github.com/spf13/cobra" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/exporter/debugexporter" "go.opentelemetry.io/collector/otelcol" + "gopkg.in/yaml.v3" + "github.com/elastic/beats/v7/libbeat/cfgfile" "github.com/elastic/beats/v7/libbeat/otelbeat/beatconverter" "github.com/elastic/beats/v7/libbeat/otelbeat/providers/fbprovider" "github.com/elastic/beats/v7/x-pack/filebeat/fbreceiver" "github.com/elastic/elastic-agent-libs/logp" + "github.com/elastic/elastic-agent-libs/mapstr" ) var schemeMap = map[string]string{ @@ -36,10 +42,20 @@ func OTelCmd(beatname string) *cobra.Command { // get beat configuration file beatCfg, _ := cmd.Flags().GetString("config") - // adds scheme name as prefix - beatCfg = schemeMap[beatname] + ":" + beatCfg + beatCfgFile := filepath.Join(cfgfile.GetPathConfig(), beatCfg) - set := getCollectorSettings(beatCfg) + isOtelConfig, err := isOtelConfigFile(beatCfgFile) + if err != nil { + return err + } + + // add scheme as prefix + cfg := schemeMap[beatname] + ":" + beatCfg + if isOtelConfig { + cfg = "file:" + beatCfgFile + } + + set := getCollectorSettings(cfg) col, err := otelcol.NewCollector(set) if err != nil { panic(fmt.Errorf("error initializing collector process: %w", err)) @@ -76,6 +92,27 @@ func getComponent() (otelcol.Factories, error) { } +func isOtelConfigFile(path string) (bool, error) { + f, err := os.Open(path) + if err != nil { + return false, fmt.Errorf("error opening file %s: %w", path, err) + } + defer f.Close() + + var m mapstr.M + if err = yaml.NewDecoder(f).Decode(&m); err != nil { + return false, fmt.Errorf("error decoding file %s: %w", path, err) + } + + for _, k := range []string{"receivers", "exporters", "service"} { + if _, ok := m[k]; ok { + return true, nil + } + } + + return false, nil +} + func getCollectorSettings(filename string) otelcol.CollectorSettings { // initialize collector settings info := component.BuildInfo{ @@ -91,6 +128,7 @@ func getCollectorSettings(filename string) otelcol.CollectorSettings { ResolverSettings: confmap.ResolverSettings{ URIs: []string{filename}, ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), fbprovider.NewFactory(), }, ConverterFactories: []confmap.ConverterFactory{