[Fleet] Fix metric types for GCP + elastic package registry integrations #6128
Conversation
This file contains hidden or 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
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
🌐 Coverage report
|
mrodm approved these changes May 9, 2023
Collaborator
mrodm left a comment
mrodm left a comment There was a problem hiding this comment.
LGTM changes in elastic-package-registry 👍
Member Author
| @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! |
P1llus approved these changes May 11, 2023
kpollich added a commit to elastic/kibana that referenced this pull request May 11, 2023
…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 |
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request May 11, 2023
…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 |
kibanamachine referenced this pull request in elastic/kibana May 11, 2023
…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 https://github.com/elastic/integrations/pull/6128\r\n\r\nThis 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":"https://github.com/elastic/kibana/pull/157047","mergeCommit":{"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 https://github.com/elastic/integrations/pull/6128\r\n\r\nThis 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":"https://github.com/elastic/kibana/pull/157047","number":157047,"mergeCommit":{"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 https://github.com/elastic/integrations/pull/6128\r\n\r\nThis 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>
andrewkroh added Integration:elastic_package_registry Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
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.
What does this PR do?
Fix
metric_typedeclarations for GCP and Elastic Package Registry integrations. These integrations hadgaugemetrics 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.ymlfile.