-
Notifications
You must be signed in to change notification settings - Fork 392
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
[Fleet] Fix metric types for GCP + elastic package registry integrations #6128
Conversation
🌐 Coverage report
|
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.
LGTM changes in elastic-package-registry 👍
@elastic/security-external-integrations and @elastic/obs-cloud-monitoring could I get code owner review here? This is blocking some fixes we'd like to land before 8.8 FF. Thanks in advance! |
…whether `index_mode: "time_series"` is set (#157047) ## Summary Blocked by elastic/integrations#6128 This PR changes Fleet's mapping generation logic in `@package` component templates such that `time_series_dimension: true` and `metric_type` properties are generated for all mappings regardless of whether `index_mode: "time_series"` is set. Previously, Elasticsearch would error if this were the case, however in newer versions of Elasticsearch it's simply a no-op when `index_mode` is not set to `time_series` and TSDS fields are declared. This allows us to more easily toggle TSDB on/off via API requests for user trial. --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Package elastic_package_registry - 0.0.7 containing this change is available at https://epr.elastic.co/search?package=elastic_package_registry |
…whether `index_mode: "time_series"` is set (elastic#157047) ## Summary Blocked by elastic/integrations#6128 This PR changes Fleet's mapping generation logic in `@package` component templates such that `time_series_dimension: true` and `metric_type` properties are generated for all mappings regardless of whether `index_mode: "time_series"` is set. Previously, Elasticsearch would error if this were the case, however in newer versions of Elasticsearch it's simply a no-op when `index_mode` is not set to `time_series` and TSDS fields are declared. This allows us to more easily toggle TSDB on/off via API requests for user trial. --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit c21f2a9)
Package gcp - 2.20.1 containing this change is available at https://epr.elastic.co/search?package=gcp |
…ss of whether `index_mode: "time_series"` is set (#157047) (#157378) # Backport This will backport the following commits from `main` to `8.8`: - [[Fleet] Always generate time series metrics/dimensions regardless of whether `index_mode: "time_series"` is set (#157047)](#157047) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Kyle Pollich","email":"kyle.pollich@elastic.co"},"sourceCommit":{"committedDate":"2023-05-11T11:41:06Z","message":"[Fleet] Always generate time series metrics/dimensions regardless of whether `index_mode: \"time_series\"` is set (#157047)\n\n## Summary\r\n\r\nBlocked by elastic/integrations#6128 PR changes Fleet's mapping generation logic in `@package` component\r\ntemplates such that `time_series_dimension: true` and `metric_type`\r\nproperties are generated for all mappings regardless of whether\r\n`index_mode: \"time_series\"` is set. Previously, Elasticsearch would\r\nerror if this were the case, however in newer versions of Elasticsearch\r\nit's simply a no-op when `index_mode` is not set to `time_series` and\r\nTSDS fields are declared.\r\n\r\nThis allows us to more easily toggle TSDB on/off via API requests for\r\nuser trial.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"c21f2a978f1a9b849d437ed91b3c7708d87c04b9","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.9.0"],"number":157047,"url":"#157047 Always generate time series metrics/dimensions regardless of whether `index_mode: \"time_series\"` is set (#157047)\n\n## Summary\r\n\r\nBlocked by elastic/integrations#6128 PR changes Fleet's mapping generation logic in `@package` component\r\ntemplates such that `time_series_dimension: true` and `metric_type`\r\nproperties are generated for all mappings regardless of whether\r\n`index_mode: \"time_series\"` is set. Previously, Elasticsearch would\r\nerror if this were the case, however in newer versions of Elasticsearch\r\nit's simply a no-op when `index_mode` is not set to `time_series` and\r\nTSDS fields are declared.\r\n\r\nThis allows us to more easily toggle TSDB on/off via API requests for\r\nuser trial.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"c21f2a978f1a9b849d437ed91b3c7708d87c04b9"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"#157047 Always generate time series metrics/dimensions regardless of whether `index_mode: \"time_series\"` is set (#157047)\n\n## Summary\r\n\r\nBlocked by elastic/integrations#6128 PR changes Fleet's mapping generation logic in `@package` component\r\ntemplates such that `time_series_dimension: true` and `metric_type`\r\nproperties are generated for all mappings regardless of whether\r\n`index_mode: \"time_series\"` is set. Previously, Elasticsearch would\r\nerror if this were the case, however in newer versions of Elasticsearch\r\nit's simply a no-op when `index_mode` is not set to `time_series` and\r\nTSDS fields are declared.\r\n\r\nThis allows us to more easily toggle TSDB on/off via API requests for\r\nuser trial.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"c21f2a978f1a9b849d437ed91b3c7708d87c04b9"}}]}] BACKPORT--> Co-authored-by: Kyle Pollich <kyle.pollich@elastic.co>
What does this PR do?
Fix
metric_type
declarations for GCP and Elastic Package Registry integrations. These integrations hadgauge
metrics declared for non-numeric fields like booleans and dates, which resulted in Elasticsearch errors when enabling TSDB or generating time series metrics in mappings.Checklist
changelog.yml
file.