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

Add connection metricset of nats module #10095

Merged
merged 3 commits into from
Jan 17, 2019
Merged

Add connection metricset of nats module #10095

merged 3 commits into from
Jan 17, 2019

Conversation

ChrsMark
Copy link
Member

@ChrsMark ChrsMark commented Jan 15, 2019

This PR adds connections metricset to nats module as part of #10071.

connections metricset retrieves metrics from connz monitoring URI of nats.


Co-Authored-By: Stamatis Katsaounis katsaouniss@gmail.com, @skatsaounis
Co-Authored-By: Michael Katsoulis michaelkatsoulis88@gmail.com, @MichaelKatsoulis

Signed-off-by: Chris <chrismarkou92@gmail.com>

Co-Authored-By: Stamatis Katsaounis <katsaouniss@gmail.com>
Co-Authored-By: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark ChrsMark requested review from a team as code owners January 15, 2019 22:15
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@kaiyan-sheng
Copy link
Contributor

jenkins, test this

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

This will need a changelog. Perhaps we can just update the previous changelog.

metricbeat/module/nats/connections/_meta/fields.yml Outdated Show resolved Hide resolved
metricbeat/module/nats/connections/_meta/fields.yml Outdated Show resolved Hide resolved
metricbeat/module/nats/connections/data.go Outdated Show resolved Hide resolved
metricbeat/modules.d/nats.yml.disabled Outdated Show resolved Hide resolved
metricbeat/module/nats/_meta/config.yml Outdated Show resolved Hide resolved
metricbeat/module/nats/_meta/test/connectionsmetrics.json Outdated Show resolved Hide resolved
ChrsMark and others added 2 commits January 16, 2019 19:02
Signed-off-by: Chris <chrismarkou92@gmail.com>

Co-Authored-By: Stamatis Katsaounis <katsaouniss@gmail.com>
Co-Authored-By: Michael Katsoulis <michaelkatsoulis88@gmail.com>
Signed-off-by: Chris <chrismarkou92@gmail.com>

Co-Authored-By: Stamatis Katsaounis <katsaouniss@gmail.com>
Co-Authored-By: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark
Copy link
Member Author

ChrsMark commented Jan 17, 2019

@ruflin, changes applied, feel free to comment and/or trigger the tests!

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. Review can also be addressed in follow up PR's.

@@ -102,6 +101,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

- Add `key` metricset to the Redis module. {issue}9582[9582] {pull}9657[9657] {pull}9746[9746]
- Add `socket_summary` metricset to system defaults, removing experimental tag and supporting Windows {pull}9709[9709]
- Add `nats` module with `stats` metricset. {pull}9825[9825]
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice find :-) Could you perhaps move both of these lines to CHANGELOG.next.asciidoc. We recently introduced this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure! I'm in for addressing this in follow up PRs, in order to have it merged and add new metricsets on top of schema changes introduced here.

cc: @skatsaounis, @MichaelKatsoulis

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi both @ruflin, @ChrsMark. I will apply this change to the second commit I am preparing for the new pr regarding routes metricset #10149

cc: @MichaelKatsoulis

"rtt":44269
},
"nats":{
"server_id": "bUAdpRFtMWddIBWw80Yd9D",
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you expect more info about the server then just the id? If yes, perhaps we should make this server.id.

Copy link
Member Author

@ChrsMark ChrsMark Jan 17, 2019

Choose a reason for hiding this comment

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

I had similar thoughts about merging server_id and now fields in something like:

{
 "server": {
    "id": "foobar",
    "reporting_time": ....
 }
}

How about introducing this too in follow up PRs?

cc: @skatsaounis, @MichaelKatsoulis

Copy link
Contributor

Choose a reason for hiding this comment

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

I like the idea. Is it reporting_time or is this actually the time of the server? server.time?

Copy link
Member Author

Choose a reason for hiding this comment

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

Basically, it's the same thing. So let's keep it as sever.time for simplicity.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ChrsMark Can you follow up on this and also do the change for the changelog?

@ruflin
Copy link
Contributor

ruflin commented Jan 17, 2019

jenkins, test this

@ChrsMark
Copy link
Member Author

@ruflin, will it make sense to retry the ci build?

@ruflin ruflin merged commit ac6aa32 into elastic:master Jan 17, 2019
@ruflin
Copy link
Contributor

ruflin commented Jan 17, 2019

@ChrsMark Merging as Travis is green. We have some CI issues at the moment which we couldn't solve yet. Strange things are happening ... :-(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants