Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Use the puppetserver.jruby metrics in the dashboard examples #79

Merged
merged 1 commit into from
Jan 15, 2020
Merged

Use the puppetserver.jruby metrics in the dashboard examples #79

merged 1 commit into from
Jan 15, 2020

Conversation

jarretlavallee
Copy link
Contributor

Prior to this commit, we used the pe-jruby metrics in the example
dashboards. Since these were released into the open source puppet
versions in 5.3.x, we can now use the jruby to ensure compatiblity with
OSP and puppetlabs-puppet_metrics_collector/pull/29. This change updates
the dashboards to use puppetserver.jruby instead of puppetserver.pe-jruby.

@genebean
Copy link
Contributor

genebean commented Jan 2, 2020

I think #82 is the cause of your CI failure and think #83 will take care of it.

@suckatrash
Copy link
Contributor

Rebasing off master should get tests working again

Prior to this commit, we used the pe-jruby metrics in the example
dashboards. Since these were released into the open source puppet
versions in 5.3.x, we can now use the `jruby` to ensure compatiblity with
OSP and puppetlabs-puppet_metrics_collector/pull/29. This change updates
the dashboards to use `puppetserver.jruby` instead of `puppetserver.pe-jruby`.
@jarretlavallee
Copy link
Contributor Author

Thanks @genebean and @suckatrash. I just rebased so hopefully the tests pass now.

@jarretlavallee
Copy link
Contributor Author

It looks like #85 included most of the changes in this PR. Only dashboard is left to change.

@genebean genebean merged commit f329978 into puppetlabs:master Jan 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants