diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index aef57d40002d..509a2cbc7416 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -35303,7 +35303,7 @@ GCP module -*`event.metric_names_hash`*:: +*`gcp.metric_names_fingerprint`*:: + -- The SHA-256 hash of the comma-separated list metric names collected in the batch. For example, l3.external.ingress_packets.count,l3.external.ingress.bytes > 24848afd85b65b9e168fa5dee12bd3e121c58a504cc0b4386a15bd9bcd065a5d. Required to support TSDB. @@ -35313,7 +35313,6 @@ type: keyword -- - *`gcp.labels`*:: + -- diff --git a/x-pack/metricbeat/module/gcp/_meta/fields.yml b/x-pack/metricbeat/module/gcp/_meta/fields.yml index f0e5cc118b39..09b7ca1cceee 100644 --- a/x-pack/metricbeat/module/gcp/_meta/fields.yml +++ b/x-pack/metricbeat/module/gcp/_meta/fields.yml @@ -4,16 +4,13 @@ description: > GCP module fields: - - name: event + - name: gcp type: group fields: - - name: metric_names_hash + - name: metric_names_fingerprint type: keyword description: > The SHA-256 hash of the comma-separated list metric names collected in the batch. For example, l3.external.ingress_packets.count,l3.external.ingress.bytes > 24848afd85b65b9e168fa5dee12bd3e121c58a504cc0b4386a15bd9bcd065a5d. Required to support TSDB. - - name: gcp - type: group - fields: - name: labels type: object description: > diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go index 42680355d7df..d8b87818f86e 100644 --- a/x-pack/metricbeat/module/gcp/fields.go +++ b/x-pack/metricbeat/module/gcp/fields.go @@ -19,5 +19,5 @@ func init() { // AssetGcp returns asset data. // This is the base64 encoded zlib format compressed contents of module/gcp. func AssetGcp() string { - return "eJzsXVuPGzeyfvevIPJi+2CsxFd4jYMA4/E6MdaTHWTGAc5TL5ssSbTYZJtkz1j59Qe89UVqSa2+aDLBZl/Wo27WVxcWq4pF9jO0gvU7tCD5I4QMMxzeoce/SLnggC64LCi64tjMpcoeP0JIAQes4R1a4EcIUdBEsdwwKd6hnx8hhNAvF1cok7Tg8AihOQNO9Tv3wzMkcAbvENyCMO4vCJl1bodSssjDX+pv1N/KwChGEvsPnSyxXpZPxFFWsL6Titb+3oIu/nezBHT96/mzF6/fIDsaknNkloCIzDL8TEOOFTZAEWfaBNoOiEZEcg7E/saEeyXFhixn6KNUCL7jLOdwhvjLGXw3oATmMyYWCrROckxWYPSMyEKYs5YnZunagEY/oxev3r56i+f07ev0zev0H/D8zds5fk0Bnr9I6Ut4/uI5ef0Wv/7pFSE/pa9evn2Dn79O6T9SQn968xq/pjP0O3wrmAKKjES6yHOpDLq5/vB+1tCEV/lxeuA4Ba63hC/Tr0BMN9l7CxHMSMXEIkhXb4+8CaEOo9CgZv/T+GknFPuf/2Oyy1IadoYpNniqwS2rk4yt19pANsnQCrQsFIHRBo8D/1AKxP/vh8N21RiXyiJ1fqbl1yTDec7EIjz6Q2PwPdZ5GczRLLFBCkyhBFA0VzJDDad4fvUJfStArWdbbKWMcyYWu+g1hnnvn42mUXun6WmbYqnPVNQ6VSIWIrWXx6NtxbXpvIH0QmrjntWICcILCkjBouBYnSGDv58hTL8W2mQgzBnCgiIlC0Gt0EEpqWYteJi4lYxAkklhln0wRYEpcF7NjdNGKFfS2QKjfahc+bfRpw9xZUibdFPgUiw0MrKNuJEG8xa6cy6x2U31xr5WUsKZXSm2zYtglUrRybou3KPoo5QmV0yYfWaWghliaKPJ2y3DHve8xN1J6hGC/dcQEPb9ATA0qFtr4v0kce3ftpKYS9UOo9B4AftI10YcgqH2xx5gFCx60v/dvdlC8gDFEtRME5nD8+Nn4LV9Dz3f4rIDtRczLgneIfJOZF+0Cdd6gjjwsxRroHYSLyWVXC7WnXBlWK3AjI7KD9sL08u+YF4eqRk5n2swuq8rDsTCKC2uWGZ5YaCbL/bPTrbSz5mCO8z5jCqZ50B9OtHCufVduxn/JIjMrHp9NhIGQ+naTcVIpAP9mPAkLuGZ3WJetHnljmjCYEfgYUIbLAjMSF7MFFjXCDQhUoHeCWYroNyA81uRpaBsSODGQXFYJH0uuLQBUwgYIv1D0Jw3SwzLYKaB9AD1xQ7gnCXmPABjAmkgUlDdifwsJ23+4RBlm0XPFSZugQhsY+68FVB0cfXFR9FMI1IoBcLwtUVWaIgC6yIkyvRqpgD3tegLa38WnrdoO5KP5+3AnQgnMh9mxiUEO6RH8OnfSOagnF/fqySH4k4xA+Pwb4cyIJCR3QTgSI8sATdmdxFkkEm1nqXWtqSYKZwlmv0JPaFYq3UBeoiwLSpPIZZ0/ricoZsl07HywzSSgq8RvsWM45T72fbHZcgSfThoBWpfhhdojjPGW9fBfSwVGmhPli49/GqW2bHujxt9h/OEiZ72avWzpRk3Z5gIqBYFaOMnMTMayTuBLE2kc0zgXriVhRmT3ThJHYsVx0beB78CzJ1Uq2adcrgbJsBuY2nFgglkjkHSqKn2RxSDi0GYYEThaLD/ugXVE8TIcjkaTpHviWf2E69CrBDABB+GllijFEAgVQjBxGKvyXoAiXPzvWD8k+Pc+lA7DNJMEIg47rBG2mBlgJ7V4qwZunbFf4rgFtQavfmp+uV8bkAhbX9nYnGGKDbYTlQhDbplmsVZWuR2Yj5/Ub26lXHYV3MlSaeU40N4ePSco5YB8UIbULMlneuZBSckhTbD2yn2rYifMhs/er2L0hp+/fDx2jH0myXgnRlWEK3Bqp5RQLhEdBiuNlLZ2JvgHBNm1i2L755IeCfuOFyJ2pfmS6RSRBjWfH55fwTSwjDO/nQB0yCwds3JQREQxuYOJVBPZiOO6ICvEEvA3CzXScolWU2h/5IE8iSiwl2BqIvKv8p0NseMA50A3VeZBptc4ltAno7VdEd7tOCiX5sSXX3GHIdOF2lmY5ITSM95+ZKedYkdcZbZxHSKrhKWIequgE6n9E2k/VRfIZ3SAFql2tsM1liJWVmHSHxInVT+bmTX+X/nv/9WJpC6KoB0AZnnU/hKTAy7BQ8M5zlnvnysOyAiUhjMBKgpcDlANQqH4QTd7cj2+6zOFlFdY3boLuuwg2ODmwwLvJhQPja+uQw0NqOb7uafg9+IHUuA1uxDWFCl5N9sUnrmpXdW1voCaTthU0Dzgs8Z51XJVpMl0IJ34uKWKVNgHqq24ws8jF8VTa0GDq+FRNpI3w7t67a7BXu4N2LJtJELhbND0neZiF8ppVxZ6QYYUKWr7hn7fwptEw7nOzXC9rWY8rtHysTAb2hqxHyVNgx4wHVZEdBCHQpDJ+HdrQw6t2bI7CK2YLd2lTDYQNeF7P60V1/mjtZh+fKImqyEcg/6rEmjk1brG002U+m27fYxPj1hEkwlKTIQZkbBCn2Ao7ppuCddEAJazwtekkCexI61swTitkumhGEJaG+03wpQDDSSCnEpV0V+CJzfzJgSnaPQUj1ZrHYazeP/LFbwnxid+IUiq/eC3dmlS+G87Aa7uELXBpMVVewWlGsIC2+73fHtDse5VO6tX/71z8ejWWG1FR3CKrerZxe0ZPDO4kWRFRy7WPLi6ovvu3C5Q7nP6PYZwsJeIuhWFTvIA2cZMwM3bC1sj9SNVrX5RkKD8dVLMuPtolrcHnHXHdSwC+AEhQgWQhoE3wkARc8R1kF5zR/s+47KeMXLF6+OkGCIIEfblK+0HUZuMc6J67SHWJ3GXCp2j9l03zQZG64vFGDjCv1YbBhO3WoCwXuwG8iXkIHCPAnVSj8Pe+67fJYEc1SOWVZA/dxjwu/H9PUS21ij3MZFG0adAK+r/44L1tvTUKhhD3aI7sOmefvCMCrAiWZ9Vmfgga0TnZ1nkGNuQ5k5LrjpualZrRK5a5eyQ+kzlCq5AoGovBNuqVjncIYy/FUq19CeMdHex74FcNjMvmyUVHpZ48QKONUCFoz6b72GBZEOcK7BXsbxpTZBxmr4xLKZht4w3CV2XZJ+v/werHdvJ8JBS2UZ1JIZb5Tb/DW6Eo7SgZDUd2GGTQOcchgtGq6NWYuMw/xxlIdjncYbbCLv7gxONJVLWZw0z66prneKXSJ3rTEDbc03yYuW/GuYlW3HoTWLGDkc9Q1XdYsbGztzLTHJXEHfjtWPCuoVLz+gxcnbmRoTtm+h6tlpu2EfpwHuEfdsxnSId1nJ2JYxQXblgdbLcj3Rhhhl+MSrObcQ202I8QQL0sAAtUu+1ULutNF/XbpDplMVjIQJVDY4j+dwhwfTE1po7MuNncWJ12PPvtwKp9gQbNm5XIO71bE7AL8GYabCbhQWOjT5jAw/ZzTxhYv+R0Uy/B1d+XPg/74eaKsWz4BjHs2Nr9gbkitJQOt43GMoyIRiyKS4t20kp3sOt8Bj46wHNCjkjUyNnHnHlpZNnD3S8VzSLW8x3J8d8hO5pAPnWR239RLjY27xD+PAvpW8yMaIFyvE7nRbSCnKAzihX8OSPNUCXmNvgK3/1sZXfa7uZ+kArkkiNT94S3SWgvWVdfD7IrT9VcSN0ng4TFjqO2AIh7NOciyES0xTzLEgXS+e+SwxRe/jK5OdSl8ak+tZiskKBE2GFcmby1/tpBQuN3xDS8qvNzdXP147qSAvFqtIiQKOVtNsR9ov2tlYqCO2cFg8XZdA3NGLFrBdAOpcCt03K9svSz90EGaJ9YlUiGCyhKdWlvH6Mof/yfXTrgycygYIZyCMtlCPk/DEqj8WzKnUvGvOBDm2QaxfYjfo+ONOmA5ZaWk3F1c/fvlwFVf8DazBTivMcU2Yc3nnL+i7ubhy/9KImccaOQ1Xd13YkLTqlkfaKMCZO03bjflk2LHLphAaZy/HE8MBRoYd8d2vxoCm7jo6cTKt6lqvZxxdd715b0fPxPSz7tPn9y229GQ+QBdPu7EzsS7aGTs8SUqUp5kkdZjTSv3UU6DGWevleSRPtOZJruT39Yxwqd29PUIA8aeY+hVP6nf3lGPF1l4FyIDKmHA317jU0s7P6+vPyMM4iHPQTNysk1ZS++OyZqP+3q2OgIZZ6W5ElR7/uDwOkYC7E+iRuLytnxJlDmIEiBfhoFTtgGNhbLLpzkU1YStZLJbO9RzE2kwAODYgCNuzfdtyYKPDcY0GJ+c28zeKpUU9yfak14hgTgrupO1M424Jot5a4+9KsJKI9QLLWqyHROdm3Riv/bx9C0fprR1tbZxN+vA6RMc7pVWu8/42Qsz/K7+B8vONAw9FelsFTyeiTZEtpEHnF/9qODgpvKyijJzQdgtqrqQw1q6sR1Fm947DZHL5/eYGZYB1oaxEpEKAybLmbVAK5g5ARAaxoId8TRkiPORJE5loz3Anm1LosFQf9lTqItcJJtrDFlqjanYKodVzXWXMfQrO3Q6OjGK5PwAaBHlWea0YszVipHgNcCm61oz5UJJzj7w3HPNOFsvpFAsDTdNwmd/hCPb+lyGdSWmWQB3bT5hAmX5asV9fhh9rJwhtMFmd+dUqY6Iw0MhkOV6DCllIjnWoVpZu28+H+o5I+8aF+8jJ9i5H+35Gn1t8d30xIy9SXaSdBr8q0usinWwvRguc66U0bjXncjFoz9Otd+7yjPI0itZ44faYXW809Ue5S6IdAPkOkyRdJz7aPCnArbMgXicByT70RIo5WyRFTvEoDTIk3r/nBw4n8xFZYrEAfeY17udS7VKAdQ7+GwygC75f3KLIkiiNwVn4EL3XgdTUPjGk/pqWnII2EXKCF/3uODxfgPOMYTv3abRQP3yE30eg2wBrYj051OMFXaQl7Rkmq8jIiHOqtA1MVkLecaALP5XOq3+X23aNuUaBM7eHb0kfRD+Jjy1EA3XJyxM8W83wDAWi5Q9Pgz7qwA4CXxtIiOy9Q9sQuj/LVt30UYv1qjYp137BQmeJkfER9K2QBqN6n8gh7Kf1xFWSXQcxwD/XWaGAacLBGFBTzoK8SDnTSy94SxN5msjInJEGLx2BZ5ImdurawTgTMCX6u6XUgCIll3B53TvAl5Ky+fqcrD7EB0aY17vYS+oXDI3F6DYH0eHWp9QIOhrW89ANeqvwOwK2gUKthj5B9BKsIF40WKf+2E4TvUQgaC6ZsMtaYVyX1hpMYx3pxEchSlrj8XGKlSEEF3GttxZUsTBVMNTG1ma4MSoTg+PQcRkaFkMFbp11TK+rdiPcZYMDTLCFn6nVtoO3kfWVF5wntcB3klWlxkjH9cR14GBEYc4Ei8Wetlc11GoZP1bFjAaXPx5eQ8O3RjqLa/z1Cx9KBzquXA7ilNq0BP4OahxfhU4yw3Snl5Pg0kuEjYEsb8eFvgjOVuAY0Ge+YGrfcU2kCrEs55CBMD6zoBJ8z7j7ErG/NrKMK9C19ClKebWI4OvqljspoPHCzN9vXCOmrOJ9f5H7qKe1Dlle0Vh/192vgfMcsEJZwQ3Lub/psbVs3RB0czUeN2duj4sGRBAbocOkNctjwQ9bfTTAFK7UDrvX3g/jEmbKNDLuFjddnvt2tkNhY+zQBj0gc/QteTZ7Ockqfx3JXVk3+PdZ81vEOIHJRiLNRQTdMbNEQopn1pbXDaky2s+2m+xMaREbTJ3KDP6XSAo/9zKGY4V3ytpMc35tlzuGVWgOcXZvJr/NqN9wHIHJsnVmQqbCkZc+aGPSOemCv6uOM3yldwXd4dX9YSX9WjHfVc9dib+9rcHBfShbqx5tdDdWobsbr0fovPiw0XcRqvilX3YAXDXDgXi6E/FDqIaFnYhe5v7XrBcN4eivln0M4UWDoBPXRprz4sFEvDX5TFF/8FI5sjQSMP3V12wP8/4X634TY6sD4iQ9i5vrCSYrVBK27GSMc1ZeXHDjfUPZCct09UGS2GTuumGbk0S7U+S4nFL1jbYqxXYrbcvboZNWIyzaejVCmygue1KOqu7dj5hdnS3ir+TtmiYZUTIuLXstv+TN3wD3aAftRqPhdbgtbqpOQ5yzgcfoPwA3uPIJ7uMa2FVDa6KwRmd/ycAsJXW0Y5zmm6Jt5tlmB7gwyz9nmPAkxRpoEhSJ3ZdExkFc5k/OJr3SnGMQwWzCjSQLhYUBijxtpCUHvka0cNMjPHl+8bk1Rq7YqFannui/6PA1u/OLz/Uv87Tcj70bSRCjzoGwOSOJRZYVZsiqviHV2HmTYVoXUKS4U1Ij3ay0gWbjTqXNG4nGsdURLldqhd36UedxIMf7Lb12+p4n3rhayQ+mUQ4KpQVZgWmALb9dy7HWjSt93LfRY/e9IO7zjYji9Zljxl0aFJ9TkPvDo9iExq5wOY/vzr/FPJ7YlIW/CZri1uNTjbtIXRCSxNXz4VjeeBeqxqAJc17qMVxX9xdT5f8HAAD//6o0Ldc=" + return "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" } diff --git a/x-pack/metricbeat/module/gcp/metrics/timeseries.go b/x-pack/metricbeat/module/gcp/metrics/timeseries.go index 4aafe827dba2..f1aec994e8ba 100644 --- a/x-pack/metricbeat/module/gcp/metrics/timeseries.go +++ b/x-pack/metricbeat/module/gcp/metrics/timeseries.go @@ -147,7 +147,7 @@ func createEventsFromGroups(service string, groups map[string][]KeyValuePoint) [ // current TSDB dimension field limit (1024). metricNamesHash := hash(strings.Join(metricNames, ",")) - _, _ = event.RootFields.Put("event.metric_names_hash", metricNamesHash) + _, _ = event.ModuleFields.Put("metric_names_fingerprint", metricNamesHash) events = append(events, event) } diff --git a/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go b/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go index b1f158d68422..10fe5fad5589 100644 --- a/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go +++ b/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go @@ -453,6 +453,7 @@ func TestCreateEventsFromGroup(t *testing.T) { { Timestamp: timestampGroup1, ModuleFields: mapstr.M{ + "metric_names_fingerprint": "2a990d0ce61c177d3bc05def9f536de164d3ea10056b7120414ad370a0f686c0", "labels": mapstr.M{ "user.deployment": "deploy-1", "user.division": "div-1", @@ -474,14 +475,12 @@ func TestCreateEventsFromGroup(t *testing.T) { "cloud.instance.id": "1", "cloud.provider": "gcp", "cloud.region": "us-west", - "event": mapstr.M{ - "metric_names_hash": "2a990d0ce61c177d3bc05def9f536de164d3ea10056b7120414ad370a0f686c0", - }, }, }, { Timestamp: timestampGroup2, ModuleFields: mapstr.M{ + "metric_names_fingerprint": "f7c8d8a9a75411effbd2171a8fa984a5e618eeca3911829b03c7e3e3d6e74522", "labels": mapstr.M{ "user.deployment": "deploy-1", "user.division": "div-1", @@ -503,14 +502,12 @@ func TestCreateEventsFromGroup(t *testing.T) { "cloud.instance.id": "1", "cloud.provider": "gcp", "cloud.region": "us-east", - "event": mapstr.M{ - "metric_names_hash": "f7c8d8a9a75411effbd2171a8fa984a5e618eeca3911829b03c7e3e3d6e74522", - }, }, }, { Timestamp: timestampGroup3, ModuleFields: mapstr.M{ + "metric_names_fingerprint": "ce7dee36d9ab56de52176bf05d21c0bc446da9a3134727bf5e300604f2ca63ef", "labels": mapstr.M{ "user.deployment": "deploy-1", "user.division": "div-1", @@ -531,9 +528,6 @@ func TestCreateEventsFromGroup(t *testing.T) { "cloud.instance.id": "2", "cloud.provider": "gcp", "cloud.region": "us-east", - "event": mapstr.M{ - "metric_names_hash": "ce7dee36d9ab56de52176bf05d21c0bc446da9a3134727bf5e300604f2ca63ef", - }, }, }, }