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.

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

x-pack/metricbeat/module/sql: Fix bad type handling for sql module #40048

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

shmsr
Copy link
Member

@shmsr shmsr commented Jun 27, 2024

Proposed commit message

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 27, 2024
@shmsr shmsr self-assigned this Jun 27, 2024
Copy link
Contributor

mergify bot commented Jun 27, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @shmsr? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@shmsr shmsr added the Team:Service-Integrations Label for the Service Integrations team label Jun 27, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 27, 2024
Comment on lines +374 to +383
ret["keyword"] = stringMetrics
}

if len(boolMetrics) > 0 {
ret["bool"] = boolMetrics
ret["boolean"] = boolMetrics
}
if len(dateMetrics) > 0 {
ret["date"] = dateMetrics
}
if len(objectMetrics) > 0 {
ret["object"] = objectMetrics
Copy link
Member Author

@shmsr shmsr Jun 27, 2024

Choose a reason for hiding this comment

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

Decided on these keys from ES docs. Not sure why it was previously "string" and not "keyword" (or "bool" and not "boolean".

Here: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html

case float64:
numericMetrics[k] = v
switch val := v.(type) {
case float32, float64, int16, int32, int64, uint32, uint64:
Copy link
Member Author

Choose a reason for hiding this comment

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

Add all those types present in numeric

case uint:
return uint64(val)
case uint32:
return uint64(val)
Copy link
Member Author

@shmsr shmsr Jun 27, 2024

Choose a reason for hiding this comment

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

Did this as uint64 is only supported in numeric. See: https://www.elastic.co/guide/en/elasticsearch/reference/current/number.html

So typecasted uint32 -> uint64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug bugfix Team:Service-Integrations Label for the Service Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant