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][iis] capture extra .NET CLR metrics #41929

Merged
merged 27 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
de69a19
[x-pack][iis] capture extra .NET CLR metrics
stefans-elastic Dec 6, 2024
baf36bb
update changelog
stefans-elastic Dec 6, 2024
8cb8d8c
update docs
stefans-elastic Dec 6, 2024
7d1d16d
update docs
stefans-elastic Dec 6, 2024
b3a8349
remove unused field
stefans-elastic Dec 6, 2024
f17d6b9
fix error handling
stefans-elastic Dec 9, 2024
dcc6122
Merge branch 'main' into extra_iis_dotnet_metrics
stefans-elastic Dec 9, 2024
c6f27eb
fix missing import
stefans-elastic Dec 9, 2024
fa0e9a0
mage update changes
stefans-elastic Dec 9, 2024
b1fa68c
update docs
stefans-elastic Dec 9, 2024
cc47264
docs
stefans-elastic Dec 9, 2024
2a3a132
update net_clr fields mapping
stefans-elastic Dec 9, 2024
d6a974b
update docs
stefans-elastic Dec 9, 2024
26be568
correct fields naming for backwards compatibility
stefans-elastic Dec 9, 2024
cf5fed0
Merge branch 'extra_iis_dotnet_metrics' of github.com:stefans-elastic…
stefans-elastic Dec 9, 2024
4ef236e
Merge branch 'main' of github.com:stefans-elastic/beats into extra_ii…
stefans-elastic Dec 9, 2024
2b5cccf
doc update
stefans-elastic Dec 9, 2024
1e83dd5
Merge branch 'main' into extra_iis_dotnet_metrics
muthu-mps Dec 11, 2024
62d50f7
Update CHANGELOG.next.asciidoc
stefans-elastic Dec 11, 2024
eb65345
Merge branch 'main' of github.com:stefans-elastic/beats into extra_ii…
stefans-elastic Dec 12, 2024
44537c0
Merge branch 'main' of github.com:stefans-elastic/beats into extra_ii…
stefans-elastic Dec 12, 2024
6443951
Merge branch 'main' into extra_iis_dotnet_metrics
muthu-mps Dec 16, 2024
e481d49
Update x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml
stefans-elastic Dec 16, 2024
0f98b9e
update iis fields
stefans-elastic Dec 16, 2024
0dd3a70
update docs
stefans-elastic Dec 16, 2024
1f298cf
Merge branch 'main' into extra_iis_dotnet_metrics
muthu-mps Dec 18, 2024
e15d4c8
Merge branch 'main' into extra_iis_dotnet_metrics
muthu-mps Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Only watch metadata for ReplicaSets in metricbeat k8s module {pull}41289[41289]
- Add support for region/zone for Vertex AI service in GCP module {pull}41551[41551]
- Add support for location label as an optional configuration parameter in GCP metrics metricset. {issue}41550[41550] {pull}41626[41626]
- Collect extra .NET ASP (IIS) metrics {pull}41929[41929]
stefans-elastic marked this conversation as resolved.
Show resolved Hide resolved

*Metricbeat*
- Add benchmark module {pull}41801[41801]
Expand Down
169 changes: 165 additions & 4 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40886,7 +40886,14 @@ Common Language Runtime overview.



*`iis.application_pool.net_clr.finallys_per_sec`*::
[float]
=== exceptions

Exceptions overview.



*`iis.application_pool.net_clr.exceptions.finallys_per_sec`*::
+
--
The number of finallys per sec.
Expand All @@ -40896,7 +40903,7 @@ type: float

--

*`iis.application_pool.net_clr.throw_to_catch_depth_per_sec`*::
*`iis.application_pool.net_clr.exceptions.throw_to_catch_depth_per_sec`*::
+
--
Throw to catch depth count per sec.
Expand All @@ -40906,7 +40913,7 @@ type: float

--

*`iis.application_pool.net_clr.total_exceptions_thrown`*::
*`iis.application_pool.net_clr.exceptions.total_thrown`*::
+
--
Total number of exceptions thrown.
Expand All @@ -40916,12 +40923,166 @@ type: long

--

*`iis.application_pool.net_clr.filters_per_sec`*::
*`iis.application_pool.net_clr.exceptions.filters_per_sec`*::
+
--
Number of filters per sec.


type: float

--

*`iis.application_pool.net_clr.exceptions.thrown_per_sec`*::
+
--
Number of Exceps Thrown / sec.


type: float

--

[float]
=== memory

Memory overview.



*`iis.application_pool.net_clr.memory.bytes_in_all_heaps`*::
+
--
Number of bytes in all heaps.


type: float

--

*`iis.application_pool.net_clr.memory.gen_0_collections`*::
+
--
Number of Gen 0 Collections.


type: float

--

*`iis.application_pool.net_clr.memory.gen_1_collections`*::
+
--
Number of Gen 1 Collections.


type: float

--

*`iis.application_pool.net_clr.memory.gen_2_collections`*::
+
--
Number of Gen 2 Collections.


type: float

--

*`iis.application_pool.net_clr.memory.total_committed_bytes`*::
+
--
Number of total committed bytes.


type: float

--

*`iis.application_pool.net_clr.memory.allocated_bytes_per_sec`*::
+
--
Allocated Bytes/sec.


type: float

--

*`iis.application_pool.net_clr.memory.gen_0_heap_size`*::
+
--
Gen 0 heap size.


type: float

--

*`iis.application_pool.net_clr.memory.gen_1_heap_size`*::
+
--
Gen 1 heap size.


type: float

--

*`iis.application_pool.net_clr.memory.gen_2_heap_size`*::
+
--
Gen 2 heap size.


type: float

--

*`iis.application_pool.net_clr.memory.large_object_heap_size`*::
+
--
Large Object Heap size.


type: float

--

*`iis.application_pool.net_clr.memory.time_in_gc_perc`*::
+
--
% Time in GC.


type: float

--

[float]
=== locks_and_threads

LocksAndThreads overview.



*`iis.application_pool.net_clr.locks_and_threads.contention_rate_per_sec`*::
+
--
Contention Rate / sec.


type: float

--

*`iis.application_pool.net_clr.locks_and_threads.current_queue_length`*::
+
--
Current Queue Length.


type: float

--
Expand Down
25 changes: 24 additions & 1 deletion x-pack/metricbeat/module/iis/application_pool/_meta/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,30 @@
"application_pool": {
"name": "test.local",
"net_clr": {
"total_exceptions_thrown": 0
"locks_and_threads": {
"current_queue_length": 0,
"contention_rate_per_sec": 0
},
"memory": {
"gen_0_heap_size": 0,
"time_in_gc_perc": 0,
"gen_2_heap_size": 0,
"total_committed_bytes": 0,
"gen_1_heap_size": 0,
"bytes_in_all_heaps": 0,
"gen_0_collections": 0,
"allocated_bytes_per_sec": 0,
"gen_2_collections": 0,
"large_object_heap_size": 0,
"gen_1_collections": 0
},
"exceptions": {
"filters_per_sec": 0,
"thrown_per_sec": 0,
"finallys_per_sec": 0,
"throw_to_catch_depth_per_sec": 0,
"total_thrown": 0
}
},
"process": {
"handle_count": 532,
Expand Down
97 changes: 84 additions & 13 deletions x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,90 @@
description: >
Common Language Runtime overview.
fields:
- name: finallys_per_sec
type: float
- name: exceptions
stefans-elastic marked this conversation as resolved.
Show resolved Hide resolved
type: group
description: >
The number of finallys per sec.
- name: throw_to_catch_depth_per_sec
type: float
Exceptions overview.
fields:
- name: finallys_per_sec
type: float
description: >
The number of finallys per sec.
- name: throw_to_catch_depth_per_sec
type: float
description: >
Throw to catch depth count per sec.
- name: total_thrown
type: long
description: >
Total number of exceptions thrown.
- name: filters_per_sec
type: float
description: >
Number of filters per sec.
- name: thrown_per_sec
type: float
description: >
Number of Exceps Thrown / sec.
- name: memory
type: group
description: >
Throw to catch depth count per sec.
- name: total_exceptions_thrown
type: long
description: >
Total number of exceptions thrown.
- name: filters_per_sec
type: float
Memory overview.
fields:
- name: bytes_in_all_heaps
type: float
description: >
Number of bytes in all heaps.
- name: gen_0_collections
type: float
description: >
Number of Gen 0 Collections.
- name: gen_1_collections
type: float
description: >
Number of Gen 1 Collections.
- name: gen_2_collections
type: float
description: >
Number of Gen 2 Collections.
- name: total_committed_bytes
type: float
description: >
Number of total committed bytes.
- name: allocated_bytes_per_sec
type: float
description: >
Allocated Bytes/sec.
- name: gen_0_heap_size
type: float
description: >
Gen 0 heap size.
- name: gen_1_heap_size
type: float
description: >
Gen 1 heap size.
- name: gen_2_heap_size
type: float
description: >
Gen 2 heap size.
- name: large_object_heap_size
type: float
description: >
Large Object Heap size.
- name: time_in_gc_perc
type: float
description: >
% Time in GC.
- name: locks_and_threads
type: group
description: >
Number of filters per sec.
LocksAndThreads overview.
fields:
- name: contention_rate_per_sec
type: float
description: >
Contention Rate / sec.
- name: current_queue_length
type: float
description: >
Current Queue Length.
Loading
Loading