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

Rabbitmq queue metricset message rates #6606

Closed
wants to merge 10 commits into from
Closed

Rabbitmq queue metricset message rates #6606

wants to merge 10 commits into from

Conversation

kvalev
Copy link
Contributor

@kvalev kvalev commented Mar 20, 2018

This pull requests extends the existing RabbitMQ queue metricset to include the message rates.

Related to #6442

@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?

Copy link
Member

@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.

Left 2 comments. Thanks for splitting this up in separate PR's.

@@ -171,6 +171,11 @@ func Bool(key string, opts ...schema.SchemaOption) schema.Conv {
return schema.SetOptions(schema.Conv{Key: key, Func: toBool}, opts)
}

// Float creates a Conv object for parsing floats
func Float(key string, opts ...schema.SchemaOption) schema.Conv {
return schema.SetOptions(schema.Conv{Key: key, Func: toInteger}, opts)
Copy link
Member

Choose a reason for hiding this comment

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

You use the toInteger function here which I think does not return the expected result?

@@ -256,6 +255,8 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Making the MongoDB module GA. {pull}6554[6554]
- Allow to disable labels `dedot` in Docker module, in favor of a safe way to keep dots. {pull}6490[6490]
- Add experimental module to collect metrics from munin nodes. {pull}6517[6517]
- Add connections metricset to RabbitMQ module {pull}6548[6548]
Copy link
Member

Choose a reason for hiding this comment

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

This line should be removed for this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I can remove it, but currently this line is in the wrong section - Bugfixes, while it should be in Added.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I left the line in the change log, let me know if I should revert it.

Copy link
Member

Choose a reason for hiding this comment

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

I'm just realising now that this log line has been moved and not added.

+1 on moving it to the right section.

@ruflin ruflin requested a review from jsoriano March 21, 2018 14:25
@@ -171,6 +171,38 @@ func Bool(key string, opts ...schema.SchemaOption) schema.Conv {
return schema.SetOptions(schema.Conv{Key: key, Func: toBool}, opts)
}

func toFloat(key string, data map[string]interface{}) (interface{}, error) {
Copy link
Member

Choose a reason for hiding this comment

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

I think this function should be added to libbeat/common/coerce.go, so it can be reused.

@jsoriano
Copy link
Member

@kvalev branch needs rebase

@spotlesscoder
Copy link

@kvalev: any updates?

@jsoriano
Copy link
Member

jenkins, test this please

@@ -193,6 +193,8 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Added support for haproxy 1.7 and 1.8. {pull}6793[6793]
- Add accumulated I/O stats to diskio in the line of `docker stats`. {pull}6701[6701]
- Ignore virtual filesystem types by default in system module. {pull}6819[6819]
- Add connections metricset to RabbitMQ module {pull}6548[6548]
Copy link
Member

Choose a reason for hiding this comment

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

Was this line added on purpose? Was it missing in a previews PR? If yes, the PR number seems to be off.

@ruflin
Copy link
Member

ruflin commented Apr 18, 2018

@kvalev Could you rebase this PR again on master and fix the Changelog issue?

@ruflin
Copy link
Member

ruflin commented Apr 19, 2018

I resolved the changelog conflict myself. I'm kind of surprised the mapstriface change does not conflict with #6870

@jsoriano
Copy link
Member

jenkins, test this please

@spotlesscoder
Copy link

What else is needed here?

@ruflin
Copy link
Member

ruflin commented Apr 23, 2018

@CodingSpiderFox Could you rebase this again on master?

@spotlesscoder
Copy link

I'm not good doing git stuff. Still learning. How can I do the rebase? Fork this repo, pull the branch kvalev and push it to my repo, rebase it on master and then open another PR?

@jsoriano
Copy link
Member

@CodingSpiderFox yes, this is what you'd need to do if you want to follow with these changes 🙂
To pull kvalev's branch you will need to add his repository as a different remote, ping us if you get stuck at some step.
In any case let's wait a little bit to see if @kvalev can rebase the branch again, if not maybe we can also finish it.

@jsoriano
Copy link
Member

jenkins, test this again please

@jsoriano
Copy link
Member

There is some issue with imports formatting.

@ruflin
Copy link
Member

ruflin commented Apr 24, 2018

@CodingSpiderFox Sorry, my mistake. I somehow assumed you were the creator of the PR.

@spotlesscoder
Copy link

I need this feature very soon

@jsoriano
Copy link
Member

Continuing with this PR in #6964

@jsoriano
Copy link
Member

Rebased and merged as #6964

@jsoriano jsoriano closed this Apr 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants