plugin: update cpu for collectd 5.8 #801
Conversation
| @@ -5,6 +5,8 @@ | |||
| Boolean $reportbycpu = true, | |||
| Boolean $valuespercentage = false, | |||
| Boolean $reportnumcpu = false, | |||
| Boolean $reportgueststate = false, | |||
templates/plugin/cpu.conf.erb
Outdated
| @@ -6,5 +6,9 @@ | |||
| <% if scope.lookupvar('collectd::collectd_version_real') and scope.function_versioncmp([scope.lookupvar('collectd::collectd_version_real'), '5.6']) >= 0 -%> | |||
| ReportNumCpu <%= @reportnumcpu %> | |||
| <% end -%> | |||
| <% if scope.lookupvar('collectd::collectd_version_real') and scope.function_versioncmp([scope.lookupvar('collectd::collectd_version_real'), '5.8']) >= 0 -%> | |||
There was a problem hiding this comment.
if @collectd::collectd_version_real should work as well. scope.lookupvar() is legacy stuff to be compatible with very old puppet versions. It isn't needed anymore
There was a problem hiding this comment.
I don't get why this is even needed, I have checked how this variable is built, and if the fact return null or undef, we pick the minimal_version. So it can never be null or I miss something ?
There was a problem hiding this comment.
I'm not 100% sure if that's still needed. That's something we could check and cleanup.
templates/plugin/cpu.conf.erb
Outdated
| <% if scope.lookupvar('collectd::collectd_version_real') and scope.function_versioncmp([scope.lookupvar('collectd::collectd_version_real'), '5.8']) >= 0 -%> | ||
| ReportGuestState <%= @reportgueststate %> | ||
| SubtractGuestState <%= @subtractgueststate %> | ||
| <% end -%> |
There was a problem hiding this comment.
are you interested in converting this erb template into epp? This is not required, but we would be very happy about it :)
There was a problem hiding this comment.
It's OK, the file small enought, I done it :)
bastelfreak
added
enhancement
|
Thanks for the PR @sileht ! I added some inline comments. |
This change adds options for cpu plugin present since collectd 5.8
This change adds cpu plugin options added in collectd 5.8