Add MQTT input to Filebeat #15287
Merged
Add MQTT input to Filebeat #15287
Conversation
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
faec
reviewed
Jan 2, 2020
There was a problem hiding this comment.
Thanks! The overall structure looks good, though I have lots of smallish comments about naming and error handling / propagation. Aside from those, the next step is testing. We probably at least want to run the input against a live mqtt broker. This kind of thing is mostly done by python system tests right now, though if you can find a reasonable way to do it from a go test instead that would be lovely :-)
filebeat/input/mqtt/client.go
Outdated
| } | ||
|
|
||
| // ParseTopics will parse the config file and return a map with topic:QoS | ||
| func (input *mqttInput) parseTopics(topics []string, qos int) map[string]byte { |
There was a problem hiding this comment.
It looks like this doesn't need input and could be a standalone helper. The name / description and comments are also a little misleading (no parsing is happening here), maybe a more descriptive name like subscriptionsForTopics which would also be more clear from the call site.
filebeat/input/mqtt/client.go
Outdated
| logp.Info("Current status: %v", input.client.IsConnected()) | ||
|
|
||
| // Mqtt client - Subscribe to every topic in the config file, and bind with message handler | ||
| if token := input.client.SubscribeMultiple(subscriptions, input.onMessage); token.Wait() && token.Error() != nil { |
There was a problem hiding this comment.
It looks like this line can potentially wait forever. WaitTimeout is probably a better choice. (Contexts or lifetime channels would be preferable but it looks like this library doesn't support them.) Same thing above in connect.
filebeat/input/mqtt/input.go
Outdated
| } | ||
|
|
||
| // We've successfully connected, reset the backoff timer. | ||
| backoff.Reset() |
There was a problem hiding this comment.
Right now this Reset is redundant since backoff goes out of scope immediately after. Is there supposed to be a loop here, or will all reconnections / error handling after the initial connect be taken care of by the mqtt library? If the latter, this can be removed.
There was a problem hiding this comment.
I'm not really sure what the best way is to do this.
Now I added input.run at the end of connectionLostHandler
From testing of Machinebeat I also know that it can happen that their is a disconnect that the connectionLostHandler does not recognize. For this situation we need to test from time to time weather the connection is still alive. And if not try the reconnect until it is up and running again.
Any ideas how to achieve this?
filebeat/input/mqtt/client.go
Outdated
| logp.Info("[MQTT] Set the Certs") | ||
| cert, err := tls.LoadX509KeyPair(config.ClientCert, config.ClientKey) | ||
| if err != nil { | ||
| panic(err) |
There was a problem hiding this comment.
return err instead of panicking
faec
reviewed
Jan 7, 2020
| logp.Warn("[MQTT] Connection lost: %s", reason.Error()) | ||
|
|
||
| //Rerun the input | ||
| input.Run() |
There was a problem hiding this comment.
This won't do anything, because of the once guard in Run... that once is because the calling code might call Run multiple times, which is the right behavior for the log input but not most of the others. If this is the right program flow (which seems plausible) then you should split Run into public and internal pieces, with run doing the actual logic and Run just protecting it with a Once. Then the internal version can be called here.
|
|
||
| // Stop disconnects the MQTT client | ||
| func (input *mqttInput) Stop() { | ||
| input.client.Disconnect(250) |
There was a problem hiding this comment.
Waiting for asynchronous completion should happen in Wait, not Stop. I'd suggest putting the Disconnect call in a goroutine and use a WaitGroup in mqttInput to signal when it returns. That way you can trigger the disconnect here, and then wait on the WaitGroup in Wait if needed.
|
@felix-lessoer |
faec
approved these changes
Jan 15, 2020
mtojek
added a commit
that referenced
this pull request
Feb 12, 2020
* Add MQTT input to Filebeat (#15287) * Inital commit for MQTT input * Improved naming and error handling * Improved naming and connection procedure * Merge "master" branch into "feature-mqtt-input" (#15745) * [Filebeat] Fixes for NetFlow v9 devices from various vendors (#15449) - Allow for zero scope fields in options template NetFlow v9 spec allows for options templates that contain no scope fields. The netflow input was treating this case as an error and discarding the template, but that is only applicable to IPFIX. - Use additional fields to populate bytes/pkt counters Some devices out there (Cisco NSEL) use fields 231/232 as bytes counters, when those are supposed to be layer 4 payload counters. This updates the ECS fields populator to use those fields when the expected ones are not found. - Support a classId of 32 bits While the spec mandates a classId of 8 bits, some Cisco ASA devices actually use a 32 bit version of this field. This patches the field to allow up to 32-bit integers and updates the index pattern to use `long` for the `netflow.class_id` field. - Add more fields from v9 Cisco devices Fixes #14212 * update settings for `decode_csv_fields` (#15249) (#15550) Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> * docs: updates to output config (#15272) * [Filebeat] Handle error message in handleS3Objects function (#15545) * Handle error message in handleS3Objects function * remove s3Context.Fail and use setError and done instead * Add changelog * Fix use of wrong fields in Cisco ASA dashboard (#15553) This dashboard wasn't updated after a couple of fields were renamed. Fixes: #15420 * Add test for publisher spool encode and decode. (#15534) * Add test for publisher queue encode and decode. * Run mage fmt. * Fixes from code review. * Fix convert processor conversion of string with leading zeros to integer (#15557) The conversion failed when for strings with leading zeroes and a decimal digit 8 or 9, as the underlying runtime function would try to parse that as an octal number. This is fixed by only allowing decimal and hex, which in turns makes the processor more aligned to its Elasticsearch counterpart. Fixes #15513 * New mage target: generate pkg file to test the manager (#15580) This PR adds a new mage target to Functionbeat named `buildPkgForFunction`. It generates the folder `pkg` with the functions to make testing the manager more comfortable during development. * Packetbeat TLS: Replace array fields with keyword (#15597) Use of `type: array` in some fields (which was inconsistent) causes those fields to be excluded from the template. This prevents pointing aliases to those fields, which we need in 7.6+. Setting those fields to `keyword` explicitly so that they are included in the template. Fixes #15588 * Add a pull request template providing valuable information when reviewing a PR (#15388) * Add a PR template that provides valuable information when reviewing a PR * Add CLA check * Fix typo * Address comments during review * SF: Fix typo * Add deprecation as PR type * Make it clear how to strike through in markdown * Add default configuration files to the checklist * [Metricbeat] Implement IBM MQ module (#15301) * Modify cockroachdb source * Define testdata * Do not publish ports * Update docs * mage fmt update * Describe containerized environment * Update CHANGELOG.next.asciidoc Co-Authored-By: Chris Mark <chrismarkou92@gmail.com> * Update data.json * Rename image * Update source after review * Filter ibmmq_ metrics * mage check * Fix: mage check * Don't expose port * Rename status to qmgr * Add subscriptions overview dashboard for IBM MQ module * Add calls, messages overview dashboard for IBM MQ module * Add screenshots * Fix: mage check * Fix: CHANGELOG * Add explanation * Fix: mage check Co-authored-by: Chris Mark <chrismarkou92@gmail.com> * Cleanup changelogs for master (#15617) * Cleanup changelogs for master * Remove extra header in CHANGELOG.asciidoc * [Metricbeat] Add lambda metricset in aws module (#15260) * Add lambda metricset * Adds missing imports (#15624) * [docs] Clarify privileges required for the writer role (#15604) * Mask password discovered via module autodiscover hint (#15616) * Mask password is string representation of config * Rename method * Adding unit test * Use const for module config password setting name * Using common.DebugString * Simplifying * Removing now-invalid unit test * Removing now-unnecessary const * Refactoring: moving debug-related var and func to common file * Refactoring: rename from black list to mask list * Implement fmt.Formatter for common.MapStr * Reintroduce debug statement * Make MarshalLogObject always filter MapStr object for logging purposes * Refactoring: renaming to be bit more generic * Forgot to add license header to new file * Fixing verb syntax * Update KQL to get estimated cost without dimension ServiceName (#15640) * Adding monitoring.cloud.* settings to reference files (#15648) * Adding monitoring.cloud.* settings to reference files * Missed winlogbeat somehow * Missed x-pack/winlogbeat * remove lablels (#15644) * Fix panic: don't send events if client is nil (#15568) * Fix panic: don't send events if client is nil * Use mutex * Add CHANGELOG entry * Rename changelog entry * Fix: changelog * Temporarily use specific logstash release * [Metricbeat] Add Istio mesh metricset (#15535) * [Metricbeat] Fix changelog (#15681) * Fix changelog * ci: use APM pipeline library (#15636) it uses APM pipeline library configured in the instance * AWS Lambda: downgrade Kibana dashboard (#15682) * AWS Lambda: downgrade Kibana dashboard * Downgrade other AWS dashboards * Log command error if setup dashboards fails * Another downgrade * Use github.com/godror/godror instead of goracle.v2 (#15683) From the README of goracle: > Goracle is deprecated because of naming (trademark) issues. From now on we are using github.com/godror/godror instead. * Move pdh query to shared location in order for new modules/metricsets to reuse (#15503) * Move pdh query to shared location * Update changelog * Fix make update * mage fmt * fix changelog * Remove datasource option from SQL module and add tests (#15686) Remove datasource option from SQL module. This option was intended to set the DSN of a database connection, and we were ignoring the hosts setting. In other SQL modules we are using the values in hosts as DSNs, do here the same for consistency. Host is redacted when we cannot parse it as it can contain passwords. StandardizeEvent is exposed in mbtest.Fetcher interface so we can more easily check contents of events in tests. Add integration tests of the module with MySQL and PostgreSQL. Add real data.json with data from MySQL and PostgreSQL. * [metricbeat] add service metricset to reference documentation (#15643) * add service metricset to ref docs * update xpack docs * [metricbeat] Add divide by zero check to docker/diskio (#15649) * add NaN check to docker/diskio * return 0 * Change joda style pattern to java style (#15695) since 7.0 elasticsearch is using java.time style patterns. YYYY becomes yyyy * [DOCS] Add missing config options to shared file (#15136) * [DOCS] Add missing config options to shared file * Add fixes from review * Run mage fmt update to fix build error * [Heartbeat] Support for multiple status codes #13595 (#15587) Allow for multiple status codes in config. Fixes #13595 * Add missing changelog entry for #15587 (#15721) * Update github.com/godror/godror to v0.10.4 (#15737) ## What does this PR do? This PR updates the dependency `github.com/godror/godror` to v0.10.4. ## Why is it important? Packaging of Metricbeat fails due to the issue in the `godror` version we are currently using. See more about the problem: godror/godror#8 * Collect normalized CPU percentages by default (#15729) * Collect normalized CPU percentages by default * Adding CHANGELOG entry * Updating x-pack/metricbeat * Fix: mage check * Detect Eclipse Public License Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> * [Filebeat] Refactor mqtt input (#16014) * Refactor mqtt input * Fix: comment * Add unit tests * Test: input run * Fix Test: run and stop * Test: backoff * Adjust code after review * MQTT: update docs (#16152) * MQTT: add integration test (#16143) * Create mosquitto image * MQTT input: add integration test * Fix * Verify connectivity * Fix * Fix: mage check * Fix * Fix * Fix: remove global var * Update changelog * Fix: regenerate notice file * Remove unused dependency * Fix: zero qos * Wait asynchronously for client being disconnected Co-authored-by: Felix <felix.roessel@elastic.co> Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
mtojek
added a commit
to mtojek/beats
that referenced
this pull request
Feb 12, 2020
* Add MQTT input to Filebeat (elastic#15287) * Inital commit for MQTT input * Improved naming and error handling * Improved naming and connection procedure * Merge "master" branch into "feature-mqtt-input" (elastic#15745) * [Filebeat] Fixes for NetFlow v9 devices from various vendors (elastic#15449) - Allow for zero scope fields in options template NetFlow v9 spec allows for options templates that contain no scope fields. The netflow input was treating this case as an error and discarding the template, but that is only applicable to IPFIX. - Use additional fields to populate bytes/pkt counters Some devices out there (Cisco NSEL) use fields 231/232 as bytes counters, when those are supposed to be layer 4 payload counters. This updates the ECS fields populator to use those fields when the expected ones are not found. - Support a classId of 32 bits While the spec mandates a classId of 8 bits, some Cisco ASA devices actually use a 32 bit version of this field. This patches the field to allow up to 32-bit integers and updates the index pattern to use `long` for the `netflow.class_id` field. - Add more fields from v9 Cisco devices Fixes elastic#14212 * update settings for `decode_csv_fields` (elastic#15249) (elastic#15550) Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> * docs: updates to output config (elastic#15272) * [Filebeat] Handle error message in handleS3Objects function (elastic#15545) * Handle error message in handleS3Objects function * remove s3Context.Fail and use setError and done instead * Add changelog * Fix use of wrong fields in Cisco ASA dashboard (elastic#15553) This dashboard wasn't updated after a couple of fields were renamed. Fixes: elastic#15420 * Add test for publisher spool encode and decode. (elastic#15534) * Add test for publisher queue encode and decode. * Run mage fmt. * Fixes from code review. * Fix convert processor conversion of string with leading zeros to integer (elastic#15557) The conversion failed when for strings with leading zeroes and a decimal digit 8 or 9, as the underlying runtime function would try to parse that as an octal number. This is fixed by only allowing decimal and hex, which in turns makes the processor more aligned to its Elasticsearch counterpart. Fixes elastic#15513 * New mage target: generate pkg file to test the manager (elastic#15580) This PR adds a new mage target to Functionbeat named `buildPkgForFunction`. It generates the folder `pkg` with the functions to make testing the manager more comfortable during development. * Packetbeat TLS: Replace array fields with keyword (elastic#15597) Use of `type: array` in some fields (which was inconsistent) causes those fields to be excluded from the template. This prevents pointing aliases to those fields, which we need in 7.6+. Setting those fields to `keyword` explicitly so that they are included in the template. Fixes elastic#15588 * Add a pull request template providing valuable information when reviewing a PR (elastic#15388) * Add a PR template that provides valuable information when reviewing a PR * Add CLA check * Fix typo * Address comments during review * SF: Fix typo * Add deprecation as PR type * Make it clear how to strike through in markdown * Add default configuration files to the checklist * [Metricbeat] Implement IBM MQ module (elastic#15301) * Modify cockroachdb source * Define testdata * Do not publish ports * Update docs * mage fmt update * Describe containerized environment * Update CHANGELOG.next.asciidoc Co-Authored-By: Chris Mark <chrismarkou92@gmail.com> * Update data.json * Rename image * Update source after review * Filter ibmmq_ metrics * mage check * Fix: mage check * Don't expose port * Rename status to qmgr * Add subscriptions overview dashboard for IBM MQ module * Add calls, messages overview dashboard for IBM MQ module * Add screenshots * Fix: mage check * Fix: CHANGELOG * Add explanation * Fix: mage check Co-authored-by: Chris Mark <chrismarkou92@gmail.com> * Cleanup changelogs for master (elastic#15617) * Cleanup changelogs for master * Remove extra header in CHANGELOG.asciidoc * [Metricbeat] Add lambda metricset in aws module (elastic#15260) * Add lambda metricset * Adds missing imports (elastic#15624) * [docs] Clarify privileges required for the writer role (elastic#15604) * Mask password discovered via module autodiscover hint (elastic#15616) * Mask password is string representation of config * Rename method * Adding unit test * Use const for module config password setting name * Using common.DebugString * Simplifying * Removing now-invalid unit test * Removing now-unnecessary const * Refactoring: moving debug-related var and func to common file * Refactoring: rename from black list to mask list * Implement fmt.Formatter for common.MapStr * Reintroduce debug statement * Make MarshalLogObject always filter MapStr object for logging purposes * Refactoring: renaming to be bit more generic * Forgot to add license header to new file * Fixing verb syntax * Update KQL to get estimated cost without dimension ServiceName (elastic#15640) * Adding monitoring.cloud.* settings to reference files (elastic#15648) * Adding monitoring.cloud.* settings to reference files * Missed winlogbeat somehow * Missed x-pack/winlogbeat * remove lablels (elastic#15644) * Fix panic: don't send events if client is nil (elastic#15568) * Fix panic: don't send events if client is nil * Use mutex * Add CHANGELOG entry * Rename changelog entry * Fix: changelog * Temporarily use specific logstash release * [Metricbeat] Add Istio mesh metricset (elastic#15535) * [Metricbeat] Fix changelog (elastic#15681) * Fix changelog * ci: use APM pipeline library (elastic#15636) it uses APM pipeline library configured in the instance * AWS Lambda: downgrade Kibana dashboard (elastic#15682) * AWS Lambda: downgrade Kibana dashboard * Downgrade other AWS dashboards * Log command error if setup dashboards fails * Another downgrade * Use github.com/godror/godror instead of goracle.v2 (elastic#15683) From the README of goracle: > Goracle is deprecated because of naming (trademark) issues. From now on we are using github.com/godror/godror instead. * Move pdh query to shared location in order for new modules/metricsets to reuse (elastic#15503) * Move pdh query to shared location * Update changelog * Fix make update * mage fmt * fix changelog * Remove datasource option from SQL module and add tests (elastic#15686) Remove datasource option from SQL module. This option was intended to set the DSN of a database connection, and we were ignoring the hosts setting. In other SQL modules we are using the values in hosts as DSNs, do here the same for consistency. Host is redacted when we cannot parse it as it can contain passwords. StandardizeEvent is exposed in mbtest.Fetcher interface so we can more easily check contents of events in tests. Add integration tests of the module with MySQL and PostgreSQL. Add real data.json with data from MySQL and PostgreSQL. * [metricbeat] add service metricset to reference documentation (elastic#15643) * add service metricset to ref docs * update xpack docs * [metricbeat] Add divide by zero check to docker/diskio (elastic#15649) * add NaN check to docker/diskio * return 0 * Change joda style pattern to java style (elastic#15695) since 7.0 elasticsearch is using java.time style patterns. YYYY becomes yyyy * [DOCS] Add missing config options to shared file (elastic#15136) * [DOCS] Add missing config options to shared file * Add fixes from review * Run mage fmt update to fix build error * [Heartbeat] Support for multiple status codes elastic#13595 (elastic#15587) Allow for multiple status codes in config. Fixes elastic#13595 * Add missing changelog entry for elastic#15587 (elastic#15721) * Update github.com/godror/godror to v0.10.4 (elastic#15737) ## What does this PR do? This PR updates the dependency `github.com/godror/godror` to v0.10.4. ## Why is it important? Packaging of Metricbeat fails due to the issue in the `godror` version we are currently using. See more about the problem: godror/godror#8 * Collect normalized CPU percentages by default (elastic#15729) * Collect normalized CPU percentages by default * Adding CHANGELOG entry * Updating x-pack/metricbeat * Fix: mage check * Detect Eclipse Public License Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> * [Filebeat] Refactor mqtt input (elastic#16014) * Refactor mqtt input * Fix: comment * Add unit tests * Test: input run * Fix Test: run and stop * Test: backoff * Adjust code after review * MQTT: update docs (elastic#16152) * MQTT: add integration test (elastic#16143) * Create mosquitto image * MQTT input: add integration test * Fix * Verify connectivity * Fix * Fix: mage check * Fix * Fix * Fix: remove global var * Update changelog * Fix: regenerate notice file * Remove unused dependency * Fix: zero qos * Wait asynchronously for client being disconnected Co-authored-by: Felix <felix.roessel@elastic.co> Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> (cherry picked from commit 56c93e5)
mtojek
added a commit
that referenced
this pull request
Feb 12, 2020
…6284) * Filebeat: Merge "mqtt" input to master (#16204) * Add MQTT input to Filebeat (#15287) * Inital commit for MQTT input * Improved naming and error handling * Improved naming and connection procedure * Merge "master" branch into "feature-mqtt-input" (#15745) * [Filebeat] Fixes for NetFlow v9 devices from various vendors (#15449) - Allow for zero scope fields in options template NetFlow v9 spec allows for options templates that contain no scope fields. The netflow input was treating this case as an error and discarding the template, but that is only applicable to IPFIX. - Use additional fields to populate bytes/pkt counters Some devices out there (Cisco NSEL) use fields 231/232 as bytes counters, when those are supposed to be layer 4 payload counters. This updates the ECS fields populator to use those fields when the expected ones are not found. - Support a classId of 32 bits While the spec mandates a classId of 8 bits, some Cisco ASA devices actually use a 32 bit version of this field. This patches the field to allow up to 32-bit integers and updates the index pattern to use `long` for the `netflow.class_id` field. - Add more fields from v9 Cisco devices Fixes #14212 * update settings for `decode_csv_fields` (#15249) (#15550) Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> * docs: updates to output config (#15272) * [Filebeat] Handle error message in handleS3Objects function (#15545) * Handle error message in handleS3Objects function * remove s3Context.Fail and use setError and done instead * Add changelog * Fix use of wrong fields in Cisco ASA dashboard (#15553) This dashboard wasn't updated after a couple of fields were renamed. Fixes: #15420 * Add test for publisher spool encode and decode. (#15534) * Add test for publisher queue encode and decode. * Run mage fmt. * Fixes from code review. * Fix convert processor conversion of string with leading zeros to integer (#15557) The conversion failed when for strings with leading zeroes and a decimal digit 8 or 9, as the underlying runtime function would try to parse that as an octal number. This is fixed by only allowing decimal and hex, which in turns makes the processor more aligned to its Elasticsearch counterpart. Fixes #15513 * New mage target: generate pkg file to test the manager (#15580) This PR adds a new mage target to Functionbeat named `buildPkgForFunction`. It generates the folder `pkg` with the functions to make testing the manager more comfortable during development. * Packetbeat TLS: Replace array fields with keyword (#15597) Use of `type: array` in some fields (which was inconsistent) causes those fields to be excluded from the template. This prevents pointing aliases to those fields, which we need in 7.6+. Setting those fields to `keyword` explicitly so that they are included in the template. Fixes #15588 * Add a pull request template providing valuable information when reviewing a PR (#15388) * Add a PR template that provides valuable information when reviewing a PR * Add CLA check * Fix typo * Address comments during review * SF: Fix typo * Add deprecation as PR type * Make it clear how to strike through in markdown * Add default configuration files to the checklist * [Metricbeat] Implement IBM MQ module (#15301) * Modify cockroachdb source * Define testdata * Do not publish ports * Update docs * mage fmt update * Describe containerized environment * Update CHANGELOG.next.asciidoc Co-Authored-By: Chris Mark <chrismarkou92@gmail.com> * Update data.json * Rename image * Update source after review * Filter ibmmq_ metrics * mage check * Fix: mage check * Don't expose port * Rename status to qmgr * Add subscriptions overview dashboard for IBM MQ module * Add calls, messages overview dashboard for IBM MQ module * Add screenshots * Fix: mage check * Fix: CHANGELOG * Add explanation * Fix: mage check Co-authored-by: Chris Mark <chrismarkou92@gmail.com> * Cleanup changelogs for master (#15617) * Cleanup changelogs for master * Remove extra header in CHANGELOG.asciidoc * [Metricbeat] Add lambda metricset in aws module (#15260) * Add lambda metricset * Adds missing imports (#15624) * [docs] Clarify privileges required for the writer role (#15604) * Mask password discovered via module autodiscover hint (#15616) * Mask password is string representation of config * Rename method * Adding unit test * Use const for module config password setting name * Using common.DebugString * Simplifying * Removing now-invalid unit test * Removing now-unnecessary const * Refactoring: moving debug-related var and func to common file * Refactoring: rename from black list to mask list * Implement fmt.Formatter for common.MapStr * Reintroduce debug statement * Make MarshalLogObject always filter MapStr object for logging purposes * Refactoring: renaming to be bit more generic * Forgot to add license header to new file * Fixing verb syntax * Update KQL to get estimated cost without dimension ServiceName (#15640) * Adding monitoring.cloud.* settings to reference files (#15648) * Adding monitoring.cloud.* settings to reference files * Missed winlogbeat somehow * Missed x-pack/winlogbeat * remove lablels (#15644) * Fix panic: don't send events if client is nil (#15568) * Fix panic: don't send events if client is nil * Use mutex * Add CHANGELOG entry * Rename changelog entry * Fix: changelog * Temporarily use specific logstash release * [Metricbeat] Add Istio mesh metricset (#15535) * [Metricbeat] Fix changelog (#15681) * Fix changelog * ci: use APM pipeline library (#15636) it uses APM pipeline library configured in the instance * AWS Lambda: downgrade Kibana dashboard (#15682) * AWS Lambda: downgrade Kibana dashboard * Downgrade other AWS dashboards * Log command error if setup dashboards fails * Another downgrade * Use github.com/godror/godror instead of goracle.v2 (#15683) From the README of goracle: > Goracle is deprecated because of naming (trademark) issues. From now on we are using github.com/godror/godror instead. * Move pdh query to shared location in order for new modules/metricsets to reuse (#15503) * Move pdh query to shared location * Update changelog * Fix make update * mage fmt * fix changelog * Remove datasource option from SQL module and add tests (#15686) Remove datasource option from SQL module. This option was intended to set the DSN of a database connection, and we were ignoring the hosts setting. In other SQL modules we are using the values in hosts as DSNs, do here the same for consistency. Host is redacted when we cannot parse it as it can contain passwords. StandardizeEvent is exposed in mbtest.Fetcher interface so we can more easily check contents of events in tests. Add integration tests of the module with MySQL and PostgreSQL. Add real data.json with data from MySQL and PostgreSQL. * [metricbeat] add service metricset to reference documentation (#15643) * add service metricset to ref docs * update xpack docs * [metricbeat] Add divide by zero check to docker/diskio (#15649) * add NaN check to docker/diskio * return 0 * Change joda style pattern to java style (#15695) since 7.0 elasticsearch is using java.time style patterns. YYYY becomes yyyy * [DOCS] Add missing config options to shared file (#15136) * [DOCS] Add missing config options to shared file * Add fixes from review * Run mage fmt update to fix build error * [Heartbeat] Support for multiple status codes #13595 (#15587) Allow for multiple status codes in config. Fixes #13595 * Add missing changelog entry for #15587 (#15721) * Update github.com/godror/godror to v0.10.4 (#15737) ## What does this PR do? This PR updates the dependency `github.com/godror/godror` to v0.10.4. ## Why is it important? Packaging of Metricbeat fails due to the issue in the `godror` version we are currently using. See more about the problem: godror/godror#8 * Collect normalized CPU percentages by default (#15729) * Collect normalized CPU percentages by default * Adding CHANGELOG entry * Updating x-pack/metricbeat * Fix: mage check * Detect Eclipse Public License Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> * [Filebeat] Refactor mqtt input (#16014) * Refactor mqtt input * Fix: comment * Add unit tests * Test: input run * Fix Test: run and stop * Test: backoff * Adjust code after review * MQTT: update docs (#16152) * MQTT: add integration test (#16143) * Create mosquitto image * MQTT input: add integration test * Fix * Verify connectivity * Fix * Fix: mage check * Fix * Fix * Fix: remove global var * Update changelog * Fix: regenerate notice file * Remove unused dependency * Fix: zero qos * Wait asynchronously for client being disconnected Co-authored-by: Felix <felix.roessel@elastic.co> Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> (cherry picked from commit 56c93e5) * Update CHANGELOG
kvch
added a commit
to kvch/beats
that referenced
this pull request
Feb 20, 2020
* Add MQTT input to Filebeat (elastic#15287) * Inital commit for MQTT input * Improved naming and error handling * Improved naming and connection procedure * Merge "master" branch into "feature-mqtt-input" (elastic#15745) * [Filebeat] Fixes for NetFlow v9 devices from various vendors (elastic#15449) - Allow for zero scope fields in options template NetFlow v9 spec allows for options templates that contain no scope fields. The netflow input was treating this case as an error and discarding the template, but that is only applicable to IPFIX. - Use additional fields to populate bytes/pkt counters Some devices out there (Cisco NSEL) use fields 231/232 as bytes counters, when those are supposed to be layer 4 payload counters. This updates the ECS fields populator to use those fields when the expected ones are not found. - Support a classId of 32 bits While the spec mandates a classId of 8 bits, some Cisco ASA devices actually use a 32 bit version of this field. This patches the field to allow up to 32-bit integers and updates the index pattern to use `long` for the `netflow.class_id` field. - Add more fields from v9 Cisco devices Fixes elastic#14212 * update settings for `decode_csv_fields` (elastic#15249) (elastic#15550) Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> * docs: updates to output config (elastic#15272) * [Filebeat] Handle error message in handleS3Objects function (elastic#15545) * Handle error message in handleS3Objects function * remove s3Context.Fail and use setError and done instead * Add changelog * Fix use of wrong fields in Cisco ASA dashboard (elastic#15553) This dashboard wasn't updated after a couple of fields were renamed. Fixes: elastic#15420 * Add test for publisher spool encode and decode. (elastic#15534) * Add test for publisher queue encode and decode. * Run mage fmt. * Fixes from code review. * Fix convert processor conversion of string with leading zeros to integer (elastic#15557) The conversion failed when for strings with leading zeroes and a decimal digit 8 or 9, as the underlying runtime function would try to parse that as an octal number. This is fixed by only allowing decimal and hex, which in turns makes the processor more aligned to its Elasticsearch counterpart. Fixes elastic#15513 * New mage target: generate pkg file to test the manager (elastic#15580) This PR adds a new mage target to Functionbeat named `buildPkgForFunction`. It generates the folder `pkg` with the functions to make testing the manager more comfortable during development. * Packetbeat TLS: Replace array fields with keyword (elastic#15597) Use of `type: array` in some fields (which was inconsistent) causes those fields to be excluded from the template. This prevents pointing aliases to those fields, which we need in 7.6+. Setting those fields to `keyword` explicitly so that they are included in the template. Fixes elastic#15588 * Add a pull request template providing valuable information when reviewing a PR (elastic#15388) * Add a PR template that provides valuable information when reviewing a PR * Add CLA check * Fix typo * Address comments during review * SF: Fix typo * Add deprecation as PR type * Make it clear how to strike through in markdown * Add default configuration files to the checklist * [Metricbeat] Implement IBM MQ module (elastic#15301) * Modify cockroachdb source * Define testdata * Do not publish ports * Update docs * mage fmt update * Describe containerized environment * Update CHANGELOG.next.asciidoc Co-Authored-By: Chris Mark <chrismarkou92@gmail.com> * Update data.json * Rename image * Update source after review * Filter ibmmq_ metrics * mage check * Fix: mage check * Don't expose port * Rename status to qmgr * Add subscriptions overview dashboard for IBM MQ module * Add calls, messages overview dashboard for IBM MQ module * Add screenshots * Fix: mage check * Fix: CHANGELOG * Add explanation * Fix: mage check Co-authored-by: Chris Mark <chrismarkou92@gmail.com> * Cleanup changelogs for master (elastic#15617) * Cleanup changelogs for master * Remove extra header in CHANGELOG.asciidoc * [Metricbeat] Add lambda metricset in aws module (elastic#15260) * Add lambda metricset * Adds missing imports (elastic#15624) * [docs] Clarify privileges required for the writer role (elastic#15604) * Mask password discovered via module autodiscover hint (elastic#15616) * Mask password is string representation of config * Rename method * Adding unit test * Use const for module config password setting name * Using common.DebugString * Simplifying * Removing now-invalid unit test * Removing now-unnecessary const * Refactoring: moving debug-related var and func to common file * Refactoring: rename from black list to mask list * Implement fmt.Formatter for common.MapStr * Reintroduce debug statement * Make MarshalLogObject always filter MapStr object for logging purposes * Refactoring: renaming to be bit more generic * Forgot to add license header to new file * Fixing verb syntax * Update KQL to get estimated cost without dimension ServiceName (elastic#15640) * Adding monitoring.cloud.* settings to reference files (elastic#15648) * Adding monitoring.cloud.* settings to reference files * Missed winlogbeat somehow * Missed x-pack/winlogbeat * remove lablels (elastic#15644) * Fix panic: don't send events if client is nil (elastic#15568) * Fix panic: don't send events if client is nil * Use mutex * Add CHANGELOG entry * Rename changelog entry * Fix: changelog * Temporarily use specific logstash release * [Metricbeat] Add Istio mesh metricset (elastic#15535) * [Metricbeat] Fix changelog (elastic#15681) * Fix changelog * ci: use APM pipeline library (elastic#15636) it uses APM pipeline library configured in the instance * AWS Lambda: downgrade Kibana dashboard (elastic#15682) * AWS Lambda: downgrade Kibana dashboard * Downgrade other AWS dashboards * Log command error if setup dashboards fails * Another downgrade * Use github.com/godror/godror instead of goracle.v2 (elastic#15683) From the README of goracle: > Goracle is deprecated because of naming (trademark) issues. From now on we are using github.com/godror/godror instead. * Move pdh query to shared location in order for new modules/metricsets to reuse (elastic#15503) * Move pdh query to shared location * Update changelog * Fix make update * mage fmt * fix changelog * Remove datasource option from SQL module and add tests (elastic#15686) Remove datasource option from SQL module. This option was intended to set the DSN of a database connection, and we were ignoring the hosts setting. In other SQL modules we are using the values in hosts as DSNs, do here the same for consistency. Host is redacted when we cannot parse it as it can contain passwords. StandardizeEvent is exposed in mbtest.Fetcher interface so we can more easily check contents of events in tests. Add integration tests of the module with MySQL and PostgreSQL. Add real data.json with data from MySQL and PostgreSQL. * [metricbeat] add service metricset to reference documentation (elastic#15643) * add service metricset to ref docs * update xpack docs * [metricbeat] Add divide by zero check to docker/diskio (elastic#15649) * add NaN check to docker/diskio * return 0 * Change joda style pattern to java style (elastic#15695) since 7.0 elasticsearch is using java.time style patterns. YYYY becomes yyyy * [DOCS] Add missing config options to shared file (elastic#15136) * [DOCS] Add missing config options to shared file * Add fixes from review * Run mage fmt update to fix build error * [Heartbeat] Support for multiple status codes elastic#13595 (elastic#15587) Allow for multiple status codes in config. Fixes elastic#13595 * Add missing changelog entry for elastic#15587 (elastic#15721) * Update github.com/godror/godror to v0.10.4 (elastic#15737) ## What does this PR do? This PR updates the dependency `github.com/godror/godror` to v0.10.4. ## Why is it important? Packaging of Metricbeat fails due to the issue in the `godror` version we are currently using. See more about the problem: godror/godror#8 * Collect normalized CPU percentages by default (elastic#15729) * Collect normalized CPU percentages by default * Adding CHANGELOG entry * Updating x-pack/metricbeat * Fix: mage check * Detect Eclipse Public License Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com> * [Filebeat] Refactor mqtt input (elastic#16014) * Refactor mqtt input * Fix: comment * Add unit tests * Test: input run * Fix Test: run and stop * Test: backoff * Adjust code after review * MQTT: update docs (elastic#16152) * MQTT: add integration test (elastic#16143) * Create mosquitto image * MQTT input: add integration test * Fix * Verify connectivity * Fix * Fix: mage check * Fix * Fix * Fix: remove global var * Update changelog * Fix: regenerate notice file * Remove unused dependency * Fix: zero qos * Wait asynchronously for client being disconnected Co-authored-by: Felix <felix.roessel@elastic.co> Co-authored-by: Adrian Serrano <adrisr83@gmail.com> Co-authored-by: DeDe Morton <dede.morton@elastic.co> Co-authored-by: Sophia Xu <sophia.xu@elastic.co> Co-authored-by: Brandon Morelli <bmorelli25@gmail.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com> Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com> Co-authored-by: Chris Mark <chrismarkou92@gmail.com> Co-authored-by: Michael Madden <mikemadden42@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Pablo Mercado <pablo.mercado@elastic.co> Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Mariana Dima <mariana@elastic.co> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: Alex K. <8418476+fearful-symmetry@users.noreply.github.com> Co-authored-by: Przemyslaw Gomulka <przemyslaw.gomulka@elastic.co> Co-authored-by: Amanda H. L. de Andrade Katz <amanda.andrade@serpro.gov.br> Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Inital commit for MQTT input * Improved naming and error handling * Improved naming and connection procedure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is to add MQTT as an input data source to Filebeat. I used the Kafka input as a reference implementation. Some things are copy paste from there.
Current state:
The integration works. Data is coming in.
Features for MQTT are the same as in Machinebeat
ACK is not implemented at the moment.
Tests are not implemented at the moment.
Please review the code and let me know how we can proceed here.
@urso @faec