diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 883174a20316..52d610f60a2e 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -460,6 +460,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Add support of additional `collstats` metrics in mongodb module. {pull}42171[42171] - Preserve queries for debugging when `merge_results: true` in SQL module {pull}42271[42271] - Collect more fields from ES node/stats metrics and only those that are necessary {pull}42421[42421] +- Add new metricset wmi for the windows module. {pull}42017[42017] +- Update beat module with apm-server tail sampling monitoring metrics fields {pull}42569[42569] *Metricbeat* - Add benchmark module {pull}41801[41801] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 0e5a1d381a77..b5c705d3b949 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -7573,6 +7573,91 @@ alias to: beat.stats.apm_server.root.unset -- + + +*`beats_stats.apm-server.sampling.tail.dynamic_service_groups`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.dynamic_service_groups + +-- + + +*`beats_stats.apm-server.sampling.tail.events.dropped`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.dropped + +-- + +*`beats_stats.apm-server.sampling.tail.events.failed_writes`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.failed_writes + +-- + +*`beats_stats.apm-server.sampling.tail.events.head_unsampled`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.head_unsampled + +-- + +*`beats_stats.apm-server.sampling.tail.events.processed`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.processed + +-- + +*`beats_stats.apm-server.sampling.tail.events.sampled`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.sampled + +-- + +*`beats_stats.apm-server.sampling.tail.events.stored`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.events.stored + +-- + + +*`beats_stats.apm-server.sampling.tail.storage.lsm_size`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.storage.lsm_size + +-- + +*`beats_stats.apm-server.sampling.tail.storage.value_log_size`*:: ++ +-- +type: alias + +alias to: beat.stats.apm_server.sampling.tail.storage.value_log_size + +-- + *`beats_stats.apm-server.sampling.transactions_dropped`*:: + -- @@ -9663,6 +9748,73 @@ type: long -- + + +*`beat.stats.apm_server.sampling.tail.dynamic_service_groups`*:: ++ +-- +type: long + +-- + + +*`beat.stats.apm_server.sampling.tail.events.dropped`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.events.failed_writes`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.events.head_unsampled`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.events.processed`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.events.sampled`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.events.stored`*:: ++ +-- +type: long + +-- + + +*`beat.stats.apm_server.sampling.tail.storage.lsm_size`*:: ++ +-- +type: long + +-- + +*`beat.stats.apm_server.sampling.tail.storage.value_log_size`*:: ++ +-- +type: long + +-- + *`beat.stats.apm_server.sampling.transactions_dropped`*:: + -- diff --git a/metricbeat/module/beat/_meta/fields.yml b/metricbeat/module/beat/_meta/fields.yml index b4ba9ae25890..25a859aba8be 100644 --- a/metricbeat/module/beat/_meta/fields.yml +++ b/metricbeat/module/beat/_meta/fields.yml @@ -477,9 +477,48 @@ - name: unset type: alias path: beat.stats.apm_server.root.unset - - name: sampling.transactions_dropped - type: alias - path: beat.stats.apm_server.sampling.transactions_dropped + - name: sampling + type: group + fields: + - name: tail + type: group + fields: + - name: dynamic_service_groups + type: alias + path: beat.stats.apm_server.sampling.tail.dynamic_service_groups + - name: events + type: group + fields: + - name: dropped + type: alias + path: beat.stats.apm_server.sampling.tail.events.dropped + - name: failed_writes + type: alias + path: beat.stats.apm_server.sampling.tail.events.failed_writes + - name: head_unsampled + type: alias + path: beat.stats.apm_server.sampling.tail.events.head_unsampled + - name: processed + type: alias + path: beat.stats.apm_server.sampling.tail.events.processed + - name: sampled + type: alias + path: beat.stats.apm_server.sampling.tail.events.sampled + - name: stored + type: alias + path: beat.stats.apm_server.sampling.tail.events.stored + - name: storage + type: group + fields: + - name: lsm_size + type: alias + path: beat.stats.apm_server.sampling.tail.storage.lsm_size + - name: value_log_size + type: alias + path: beat.stats.apm_server.sampling.tail.storage.value_log_size + - name: transactions_dropped + type: alias + path: beat.stats.apm_server.sampling.transactions_dropped - name: server type: group fields: diff --git a/metricbeat/module/beat/fields.go b/metricbeat/module/beat/fields.go index f0a40fd701af..4703c45c4070 100644 --- a/metricbeat/module/beat/fields.go +++ b/metricbeat/module/beat/fields.go @@ -32,5 +32,9 @@ func init() { // AssetBeat returns asset data. // This is the base64 encoded zlib format compressed contents of module/beat. func AssetBeat() string { +<<<<<<< HEAD return "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" +======= + return "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" +>>>>>>> 9134522bc (metricbeat: Update beat module with apm-server tail sampling monitoring metrics fields (#42569)) } diff --git a/metricbeat/module/beat/stats/_meta/fields.yml b/metricbeat/module/beat/stats/_meta/fields.yml index 8c1d8973e815..d12bfed9ab54 100644 --- a/metricbeat/module/beat/stats/_meta/fields.yml +++ b/metricbeat/module/beat/stats/_meta/fields.yml @@ -358,8 +358,38 @@ type: long - name: unset type: long - - name: sampling.transactions_dropped - type: long + - name: sampling + type: group + fields: + - name: tail + type: group + fields: + - name: dynamic_service_groups + type: long + - name: events + type: group + fields: + - name: dropped + type: long + - name: failed_writes + type: long + - name: head_unsampled + type: long + - name: processed + type: long + - name: sampled + type: long + - name: stored + type: long + - name: storage + type: group + fields: + - name: lsm_size + type: long + - name: value_log_size + type: long + - name: transactions_dropped + type: long - name: server type: group fields: diff --git a/metricbeat/module/beat/stats/_meta/test/apm-server.stats.712.json b/metricbeat/module/beat/stats/_meta/test/apm-server.stats.712.json index e1f81cd2ef64..e25bd55b5f28 100644 --- a/metricbeat/module/beat/stats/_meta/test/apm-server.stats.712.json +++ b/metricbeat/module/beat/stats/_meta/test/apm-server.stats.712.json @@ -36,7 +36,7 @@ "elasticsearch": { "cache.entries.count": 0, "cache.refresh.failures": 0, - "cache.refresh.successes": 220, + "cache.refresh.successes": 6, "fetch.es": 0, "fetch.fallback": 0, "fetch.invalid": 0, @@ -199,23 +199,23 @@ }, "processor": { "error": { - "transformations": 2563 + "transformations": 782 }, "metric": { - "transformations": 13792 + "transformations": 8295 }, "span": { - "transformations": 66999 + "transformations": 10234 }, "stream": { - "accepted": 111954, + "accepted": 41772, "errors": { "invalid": 0, "toolarge": 0 } }, "transaction": { - "transformations": 29994 + "transformations": 3004 } }, "root": { @@ -226,7 +226,7 @@ "count": 1, "errors": { "closed": 0, - "count": 0, + "count": 1, "decode": 0, "forbidden": 0, "internal": 0, @@ -235,7 +235,7 @@ "notfound": 0, "queue": 0, "ratelimit": 0, - "timeout": 0, + "timeout": 1, "toolarge": 0, "unauthorized": 0, "unavailable": 0, @@ -243,28 +243,43 @@ }, "valid": { "accepted": 0, - "count": 1, + "count": 0, "notmodified": 0, - "ok": 1 + "ok": 0 } }, "unset": 0 }, "sampling": { + "tail": { + "dynamic_service_groups": 4, + "events": { + "dropped": 2149, + "failed_writes": 0, + "head_unsampled": 0, + "processed": 34538, + "sampled": 13238, + "stored": 32389 + }, + "storage": { + "lsm_size": 525060325, + "value_log_size": 12058435 + } + }, "transactions_dropped": 0 }, "server": { "request": { - "count": 1492 + "count": 605 }, "response": { - "count": 1492, + "count": 605, "errors": { "closed": 0, - "count": 1, + "count": 0, "decode": 0, "forbidden": 0, - "internal": 1, + "internal": 0, "invalidquery": 0, "method": 0, "notfound": 0, @@ -277,8 +292,8 @@ "validate": 0 }, "valid": { - "accepted": 1491, - "count": 1491, + "accepted": 605, + "count": 605, "notmodified": 0, "ok": 0 } @@ -302,29 +317,29 @@ "id": "session-c2.scope", "mem": { "usage": { - "bytes": 37939621888 + "bytes": 30244999168 } } } }, "cpu": { "system": { - "ticks": 1720, + "ticks": 2360, "time": { - "ms": 1720 + "ms": 2360 } }, "total": { - "ticks": 16100, + "ticks": 12850, "time": { - "ms": 16100 + "ms": 12850 }, - "value": 16100 + "value": 12850 }, "user": { - "ticks": 14380, + "ticks": 10490, "time": { - "ms": 14380 + "ms": 10490 } } }, @@ -333,53 +348,53 @@ "hard": 1048576, "soft": 1048576 }, - "open": 18 + "open": 56 }, "info": { - "ephemeral_id": "87279482-5cbc-4232-b90e-a08d2d2f0ec9", + "ephemeral_id": "d57303bc-7918-4832-a917-e8f2467ca5fd", "name": "apm-server", "uptime": { - "ms": 6589405 + "ms": 179556 }, - "version": "8.14.3" + "version": "8.18.0" }, "memstats": { - "gc_next": 204429288, - "memory_alloc": 102433408, - "memory_sys": 267778360, - "memory_total": 1392024448, - "rss": 164769792 + "gc_next": 178933328, + "memory_alloc": 129688560, + "memory_sys": 226933048, + "memory_total": 1972011464, + "rss": 762793984 }, "runtime": { - "goroutines": 52 + "goroutines": 33 } }, "libbeat": { "output": { "events": { - "acked": 70666, - "active": 0, - "batches": 26, - "failed": 42682, - "toomany": 42682, - "total": 113348 + "acked": 18441, + "active": 3874, + "batches": 7, + "failed": 0, + "toomany": 0, + "total": 22315 }, "type": "elasticsearch", "write": { - "bytes": 24728235 + "bytes": 3220280 } }, "pipeline": { "events": { - "total": 113348 + "total": 22315 } } }, "output": { "elasticsearch": { "bulk_requests": { - "available": 60, - "completed": 26 + "available": 37, + "completed": 7 }, "indexers": { "active": 1, @@ -393,13 +408,13 @@ "cores": 16 }, "load": { - "1": 2.88, - "15": 1.86, - "5": 1.87, + "1": 14.04, + "15": 5.22, + "5": 8.9, "norm": { - "1": 0.18, - "15": 0.1163, - "5": 0.1169 + "1": 0.8775, + "15": 0.3263, + "5": 0.5563 } } }