Skip versioncmp when pe_server_version is missing #23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
npwalker
reviewed
Jul 23, 2019
| @@ -18,7 +18,7 @@ | |||
| override_metrics_command => $override_metrics_command, | |||
| } | |||
|
|
|||
| if versioncmp($facts['pe_server_version'], '2018.1.0') < 0 { | |||
| if ($facts['pe_server_version'] =~ NotUndef) and (versioncmp($facts['pe_server_version'], '2018.1.0') < 0) { | |||
There was a problem hiding this comment.
Do we want to add a parameter that would allow users to enable these if they are on a new enough version of puppetserver?
There was a problem hiding this comment.
This will be enabled for open source Puppet Server 5.x or newer. I promoted these metrics to the /status API in that version. The pe_server_version check here is testing for older versions of PE and uses the /metrics API to retrieve the data there.
Most Puppet Server metrics were "PE only" prior to 5.x, so there isn't much to gain by backporting this specific check, but we should think about how to do version-specific metrics in a way that supports both PE and Open Source.
This commit updates the version checking logic in puppet_metrics_collector::puppetserver to skip `versioncmp()` when the `pe_server_version` fact is missing. This change allows the class to be applied to FOSS nodes without causing a compilation failure.
Sharpie
force-pushed
the
enable-foss-usage
branch
from
790f89a
to
10b58fb
Compare
|
@npwalker Are you alright with merging this one? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit updates the version checking logic in
puppet_metrics_collector::puppetserver to skip
versioncmp()when thepe_server_versionfact is missing. This change allows the class tobe applied to FOSS nodes without causing a compilation failure.