Generic SQL join results of multiple queries #32394
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,8 @@ type config struct { | |
| ResponseFormat string `config:"sql_response_format"` | ||
| Query string `config:"sql_query" ` | ||
|
|
||
| Queries []query `config:"sql_queries" ` | ||
| MergeResults bool `config:"merge_results"` | ||
| } | ||
|
|
||
| // MetricSet holds any configuration or state information. It must implement | ||
|
|
@@ -124,6 +125,8 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error { | |
| queries = append(queries, one_query) | ||
| } | ||
|
|
||
| merged := mapstr.M{} | ||
|
|
||
| for _, q := range queries { | ||
| if q.ResponseFormat == tableResponseFormat { | ||
| // Table format | ||
|
|
@@ -133,7 +136,22 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error { | |
| } | ||
|
|
||
| for _, ms := range mss { | ||
| if m.Config.MergeResults { | ||
| if len(mss) > 1 { | ||
| return fmt.Errorf("can not merge query resulting with more than one rows: %s", q) | ||
| } else { | ||
| for k, v := range ms { | ||
| _, ok := merged[k] | ||
| if ok { | ||
| m.Logger().Warn("overwriting duplicate metrics: ", k) | ||
| } | ||
| merged[k] = v | ||
| } | ||
| } | ||
| } else { | ||
| // Report immediately for non-merged cases. | ||
| m.reportEvent(ms, reporter, q.Query) | ||
| } | ||
| } | ||
| } else { | ||
| // Variable format | ||
|
|
@@ -142,9 +160,24 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error { | |
| return fmt.Errorf("fetch variable mode failed: %w", err) | ||
| } | ||
|
|
||
| if m.Config.MergeResults { | ||
| for k, v := range ms { | ||
| _, ok := merged[k] | ||
| if ok { | ||
| m.Logger().Warn("overwriting duplicate metrics: ", k) | ||
| } | ||
| merged[k] = v | ||
| } | ||
| } else { | ||
| // Report immediately for non-merged cases. | ||
| m.reportEvent(ms, reporter, q.Query) | ||
| } | ||
| } | ||
| } | ||
| if m.Config.MergeResults { | ||
| // Report here for merged case. | ||
| m.reportEvent(merged, reporter, "") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
@@ -154,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 { | ||
|
|
||
|
There was a problem hiding this comment. Another way to do this would be: There was a problem hiding this comment. Yes. I hope we can stay with the current structure. There was a problem hiding this comment. I mean, you can do it this way in case you feel it complicates less the code 🙂 #32394 (comment) |
||
| // 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{ | ||
| ModuleFields: mapstr.M{ | ||
| "driver": m.Config.Driver, | ||
| "query": qry, | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit. This is getting more complicated now, maybe the code for variable and table format could be moved to separated functions.