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.

Sign up for GitHub

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

Jump to bottom

Add Elasticsearch metric enhancements #823

Merged
merged 9 commits into from Sep 19, 2022
Merged

Add Elasticsearch metric enhancements #823

merged 9 commits into from Sep 19, 2022

Conversation

JonathanWamsley
Copy link
Collaborator

@JonathanWamsley JonathanWamsley commented Sep 1, 2022 •
edited

Description

Updates Elastic Search with additional metrics outlined in the metadata.yaml.

This PR is dependent on

Related issue

Reflects the scope doc
Recent metrics added:

How has this been tested?

Checklist:

  • Unit tests
    • Unit tests do not apply.
    • Unit tests have been added/modified and passed for this PR.
  • Integration tests
    • Integration tests do not apply.
    • Integration tests have been added/modified and passed for this PR.
  • Documentation
    • This PR introduces no user visible changes.
    • This PR introduces user visible changes and the corresponding documentation change has been made.
  • Minor version bump
    • This PR introduces no new features.
    • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
    • This PR bumps the version.

@JonathanWamsley JonathanWamsley added 3rd-party-app kokoro:force-run Forces kokoro to run integration tests on a CL labels Sep 1, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 1, 2022
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 12, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 12, 2022
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 12, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 12, 2022
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 13, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed kokoro:force-run Forces kokoro to run integration tests on a CL labels Sep 13, 2022
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 13, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 13, 2022
@JonathanWamsley JonathanWamsley mentioned this pull request Sep 14, 2022
Merged
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 14, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 14, 2022
@JonathanWamsley JonathanWamsley marked this pull request as ready for review September 14, 2022 17:08
@JonathanWamsley JonathanWamsley mentioned this pull request Sep 14, 2022
Merged
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 15, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 15, 2022
@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 16, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 16, 2022
braydonk
braydonk reviewed Sep 19, 2022
View reviewed changes
integration_test/third_party_apps_data/applications/elasticsearch/metadata.yaml
kind: GAUGE
monitored_resource: gce_instance
labels:
name: .*
Copy link
Contributor

Choose a reason for hiding this comment

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

In the scope doc this was circuit_breaker_name but here it's just name. I noticed most of the labels in this integration do that sort of shorten. Why did we do that instead of matching it to the scope doc? (or vice versa, why didn't the scope doc reflect these names)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The scope doc had the attributes listed names, but not the actual value which has been corrected. So for example in otel metadata.yaml, elasticsearch.breaker.memory.estimated metric has an attribute listed circuit_breaker_name which actualy has a value of name. The ops agent metadata.yaml is correct and the scope doc has been corrected so that circuit_breaker_name -> name along with other metrics.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for making that update. Looks good.

@JonathanWamsley JonathanWamsley added the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 19, 2022
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Sep 19, 2022
braydonk
braydonk approved these changes Sep 19, 2022
View reviewed changes
integration_test/third_party_apps_data/applications/elasticsearch/metadata.yaml
kind: GAUGE
monitored_resource: gce_instance
labels:
name: .*
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for making that update. Looks good.

@braydonk
Copy link
Contributor

Focal integration test has gotta be a flake. Going to merge.

@braydonk braydonk merged commit d2c77fa into GoogleCloudPlatform:master Sep 19, 2022
@qingling128
Copy link
Contributor

Looks like this PR needs to bump the minor version.

image

@qingling128 qingling128 mentioned this pull request Sep 20, 2022
Merged
9 tasks
@qingling128
Copy link
Contributor

Sent #863

franciscovalentecastro pushed a commit that referenced this pull request Oct 13, 2022
@JonathanWamsley @franciscovalentecastro
Add Elasticsearch metric enhancements (#823)
8a41b88 
* update metadata metrics

* remove duplicate metric

* update es in submodule

* update submodule packages

* update submodule to es enhancements with bug_fixes

* update lint

* update to submodule pointed in operations collector

* update submodule to master w/ es updates

* update operations collector submodule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@braydonk braydonk braydonk approved these changes

Assignees
No one assigned
Labels
3rd-party-app
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@JonathanWamsley @braydonk @qingling128 @stackdriver-instrumentation-release