Sup-346 update to include puppetserver metrics for versions < 2018.1.0

[daniel5119]

As per Sup-346 this is to include puppetserver metrics for versions < 2018.1.0

[Sharpie]

Couple of small changes:

• When comparing version numbers, we should use the versioncmp() function as string comparison does odd things like treating 10 as being less than 2.

• Using a collector override isn't necessary in this instance as we can pass the additional metrics directly to the puppet_metrics_collector::pe_metric declaration on line 15.

Something like the following:

if versioncmp($facts['pe_server_version'], '2018.1.0') < 0 {
  $additional_metrics = [
    ...
  ]
} else {
  $additional_metrics = []
}

puppet_metrics_collector::pe_metric { 'puppetserver' :
  ...,
  additional_metrics => $additional_metrics,
}

[Sharpie]

Almost there! There's an ordering issue, a parse failure, and some style lint that needs to be fixed up.

[Sharpie]

Variables must be declared before they are used. This if block has to appear before the puppet_metrics_collector::pe_metric that uses it.

[Sharpie]

This else block is indented too far --- the braces should line up with the if above and then enclosed statements should be indented by one level.

[Sharpie]

There's an extra space before the final brace here that should be removed.

[Sharpie]

Since this is the end of a variable assignment, the trailing comma is causing a parse failure. Would be appropriate for resource parameters, but doesn't work with assignment.

[Sharpie]

Looks good! 👍