Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generic SQL join results of multiple queries #32394

Merged
merged 11 commits into from
Jul 22, 2022
Merged

Generic SQL join results of multiple queries #32394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a201f83
SQL events merge
lalit-satapathy Jul 17, 2022
d9cc266
SQL events merge:
lalit-satapathy Jul 18, 2022
ec73740
Updated documentation.
lalit-satapathy Jul 19, 2022
66b810d
changelog and remove extra comment.
lalit-satapathy Jul 19, 2022
bd816b0
Remove sql.yml wrongly added.
lalit-satapathy Jul 19, 2022
211e617
updated pull request.
lalit-satapathy Jul 19, 2022
9d08c54
Merge branch 'main' into generic-sql-event-merge-1
lalit-satapathy Jul 19, 2022
7725de3
* Renamed request_merge to merge_results
lalit-satapathy Jul 21, 2022
4c7b310
Merge branch 'generic-sql-event-merge-1' of github.com:lalit-satapath…
lalit-satapathy Jul 21, 2022
dc5ca3a
* sql.query not populated for merged_results case.
lalit-satapathy Jul 21, 2022
212f651
Merge branch 'main' into generic-sql-event-merge-1
lalit-satapathy Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion metricbeat/docs/modules/sql.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@ This creates a combined event as below, where `blks_hit`, `blks_read`, `checkpoi
"address": "localhost"
},
"sql": {
"query": "",
"metrics": {
"blks_read": 21,
"checkpoints_req": 1,
Expand Down
1 change: 0 additions & 1 deletion x-pack/metricbeat/module/sql/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ This creates a combined event as below, where `blks_hit`, `blks_read`, `checkpoi
"address": "localhost"
},
"sql": {
"query": "",
"metrics": {
"blks_read": 21,
"checkpoints_req": 1,
Expand Down
36 changes: 24 additions & 12 deletions x-pack/metricbeat/module/sql/query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,32 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error {
func (m *MetricSet) reportEvent(ms mapstr.M, reporter mb.ReporterV2, qry string) {
if m.Config.RawData.Enabled {

Copy link
Member

@jsoriano jsoriano Jul 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another way to do this would be:

moduleFields := mapstr.M{
	"metrics": ms, // Individual metric
	"driver":  m.Config.Driver,
}
if qry != "" {
	moduleFields["query"] = qry
}
reporter.Event(mb.Event{
	ModuleFields: moduleFields,
})

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I hope we can stay with the current structure.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, you can do it this way in case you feel it complicates less the code 🙂 #32394 (comment)

reporter.Event(mb.Event{
// New usage.
// Only driver & query field mapped.
// metrics to be mapped by end user.
ModuleFields: mapstr.M{
"metrics": ms, // Individual metric
"driver": m.Config.Driver,
"query": qry,
},
})
// New usage.
// Only driver & query field mapped.
// metrics to be mapped by end user.
if len(qry) > 0 {
// set query.
reporter.Event(mb.Event{
ModuleFields: mapstr.M{
"metrics": ms, // Individual metric
"driver": m.Config.Driver,
"query": qry,
},
})
} else {
reporter.Event(mb.Event{
// Do not set query.
ModuleFields: mapstr.M{
"metrics": ms, // Individual metric
"driver": m.Config.Driver,
},
})

}
} else {
// Previous usage. Backword compartibility.
// Supports field mapping.
reporter.Event(mb.Event{
// Previous usage. Backword compartibility.
// Supports field mapping.
ModuleFields: mapstr.M{
"driver": m.Config.Driver,
"query": qry,
Expand Down