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

Conversation

stefans-elastic
Copy link
Contributor

Proposed commit message

This is part of elastic/integrations#7992 (exposing extra .NET ASP metrics in IIS metricbeat module(x-pack)).

!! IMPORTANT NOTE: the metrics don't show up if ASP.NET isn't installed

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Relates elastic/integrations#7992

Use cases

Screenshots

Screenshot 2024-12-06 at 10 51 58 AM

Logs

@stefans-elastic stefans-elastic added enhancement Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team labels Dec 6, 2024
@stefans-elastic stefans-elastic self-assigned this Dec 6, 2024
@stefans-elastic stefans-elastic requested a review from a team as a code owner December 6, 2024 11:45
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 6, 2024
Copy link
Contributor

mergify bot commented Dec 6, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @stefans-elastic? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Dec 6, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 6, 2024
@muthu-mps
Copy link
Contributor

@stefans-elastic - Can you update the data.json file with the sample document with the memory and locksandthreads data?

@stefans-elastic
Copy link
Contributor Author

@stefans-elastic - Can you update the data.json file with the sample document with the memory and locksandthreads data?

done

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
"net_clr.memory.gen_1_heap_size": "\\.NET CLR Memory(w3wp*)\\Gen 1 heap size",
"net_clr.memory.gen_2_heap_size": "\\.NET CLR Memory(w3wp*)\\Gen 2 heap size",
"net_clr.memory.large_object_heap_size": "\\.NET CLR Memory(w3wp*)\\Large Object Heap size",
"net_clr.memory.time_in_gc_perc": "\\.NET CLR Memory(w3wp*)\\% Time in GC",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

time_in_gc_perc - What perc represents here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means percentage
I followed example from

	"process.cpu_usage_perc":               "\\Process(w3wp*)\\% Processor Time",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The naming convention for the percentage fields is something like, process.cpu_usage.pct. As the other fields already have _perc as a naming convention for percentage fields its better to align with the existing field name instead of introducing a different format for this field.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so I should leave it as it is, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, The reason for not changing is to keep it consistent with the existing fields.

muthu-mps and others added 2 commits December 11, 2024 11:13
Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
@@ -9,7 +9,28 @@
"application_pool": {
"name": "test.local",
"net_clr": {
"total_exceptions_thrown": 0
"total_exceptions_thrown": 0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we don't have the ASP.NET application setup to test the real metrics flow. This step will be done later by identifying a mechanism to test the actual metrics generated by running the .NET application.

Copy link
Contributor

@muthu-mps muthu-mps left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@stefans-elastic stefans-elastic merged commit d42aab1 into elastic:main Dec 19, 2024
32 checks passed
@stefans-elastic stefans-elastic deleted the extra_iis_dotnet_metrics branch December 19, 2024 08:31
mergify bot pushed a commit that referenced this pull request Dec 19, 2024
* [x-pack][iis] capture extra .NET CLR metrics

* update changelog

* update docs

* update docs

* remove unused field

* fix error handling

* fix missing import

* mage update changes

* update docs

* docs

* update net_clr fields mapping

* update docs

* correct fields naming for backwards compatibility

* doc update

* Update CHANGELOG.next.asciidoc

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* Update x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* update iis fields

* update docs

---------

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
(cherry picked from commit d42aab1)
stefans-elastic added a commit that referenced this pull request Dec 23, 2024
* [x-pack][iis] capture extra .NET CLR metrics

* update changelog

* update docs

* update docs

* remove unused field

* fix error handling

* fix missing import

* mage update changes

* update docs

* docs

* update net_clr fields mapping

* update docs

* correct fields naming for backwards compatibility

* doc update

* Update CHANGELOG.next.asciidoc

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* Update x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* update iis fields

* update docs

---------

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
(cherry picked from commit d42aab1)

Co-authored-by: stefans-elastic <stefan.stas@elastic.co>
@muthu-mps muthu-mps added the backport-8.17 Automated backport with mergify label Jan 17, 2025
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
* [x-pack][iis] capture extra .NET CLR metrics

* update changelog

* update docs

* update docs

* remove unused field

* fix error handling

* fix missing import

* mage update changes

* update docs

* docs

* update net_clr fields mapping

* update docs

* correct fields naming for backwards compatibility

* doc update

* Update CHANGELOG.next.asciidoc

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* Update x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* update iis fields

* update docs

---------

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
(cherry picked from commit d42aab1)
stefans-elastic added a commit that referenced this pull request Jan 17, 2025
…42334)

* [x-pack][iis] capture extra .NET CLR metrics (#41929)

* [x-pack][iis] capture extra .NET CLR metrics

* update changelog

* update docs

* update docs

* remove unused field

* fix error handling

* fix missing import

* mage update changes

* update docs

* docs

* update net_clr fields mapping

* update docs

* correct fields naming for backwards compatibility

* doc update

* Update CHANGELOG.next.asciidoc

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* Update x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>

* update iis fields

* update docs

---------

Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
(cherry picked from commit d42aab1)

* remove unrelated entries from changelog

---------

Co-authored-by: stefans-elastic <stefan.stas@elastic.co>
Co-authored-by: muthu-mps <101238137+muthu-mps@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.17 Automated backport with mergify enhancement Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants