(PE-28451) switch from the v1 to v2 metrics api #57
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
With this commit ... We switch from the v1 to v2 Metrics API for additional metrics (for PuppetDB), and drop metrics for unsupported versions of PE. (This is required in response to PE-28451 / PE-28468. Note these additional metrics generate errors in PE 2019.4 via v2: puppetlabs.puppetdb.ha:name=failed-request-counter puppetlabs.puppetdb.mq:name=global.generate-retry-message-time puppetlabs.puppetdb.mq:name=global.retry-persistence-time
|
I've manually tested this on 2018111, 201921, and 201940; and metrics for puppetdb, puppetserver, and orchestrator are collected without error (after commenting out the three additional metrics for puppetdb as per the commit message). |
|
Like Krylon: No runs, no drips, no errors ... |
Sharpie
requested changes
Mar 14, 2020
There was a problem hiding this comment.
Looks good 👍
A couple notes about ActiveMQ metrics (I don't think we need to change anything there?) and a stray line of 2016.4/2016.5 logic that can be dropped.
Tested 2018.1.12 and 2018.1.13 w/ HA enabled and the only differences in output were the three metrics that are purposefully excluded:
- puppetlabs.puppetdb.ha:name=failed-request-counter
- puppetlabs.puppetdb.mq:name=global.generate-retry-message-time
- puppetlabs.puppetdb.mq:name=global.retry-persistence-time
These are problematic because the counters don't exist until the event happens for the first time. However, they seem a bit off the beaten path so we can re-enable them later if the need arises.
Restore additional activemq metrics. Delete PE 2016 conditionals. Restore counters that don't exist until a failure occurs.
Sharpie
previously approved these changes
Mar 16, 2020
manifests/service/puppetdb.pp
Outdated
| /^2017.(1|2)/ => {'catalogs' => 9, 'facts' => 5, 'reports' => 8}, | ||
| default => {'catalogs' => 9, 'facts' => 5, 'reports' => 8}, | ||
| } | ||
| $version = {'catalogs' => 9, 'facts' => 5, 'reports' => 8}, |
There was a problem hiding this comment.
Looks like there's a trailing comma at the end of this line that is failing the Travis tests.
There was a problem hiding this comment.
Commit for this pushed ...
m0dular
pushed a commit
to m0dular/puppetlabs-puppet_metrics_collector
that referenced
this pull request
Jul 7, 2020
…-support-script Add double quotes to copy_drop_match
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.
With this commit ...
We switch from the v1 to v2 Metrics API for additional metrics (for PuppetDB),
and drop metrics for unsupported versions of PE.
(This is required in response to PE-28451 / PE-28468.
Note these additional metrics generate errors in PE 2019.4 via v2:
puppetlabs.puppetdb.ha:name=failed-request-counter
puppetlabs.puppetdb.mq:name=global.generate-retry-message-time
puppetlabs.puppetdb.mq:name=global.retry-persistence-time