This repository has been archived by the owner on Jun 1, 2023. It is now read-only.
Stop creating /run/grafana on CentOS 7 #38
Merged
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
Sharpie
force-pushed
the
remove-rundir-creation
branch
from
38fe664
to
393bc6b
Compare
Sharpie
force-pushed
the
remove-rundir-creation
branch
from
393bc6b
to
85022fb
Compare
jarretlavallee
suggested changes
Mar 14, 2019
There was a problem hiding this comment.
Looks good to me. We just need to clean up the spec tests that included those two resources.
https://github.com/puppetlabs/puppet_metrics_dashboard/blob/master/spec/classes/service_spec.rb#L22-L31
RandellP
approved these changes
Mar 14, 2019
This commit updates the service management logic for grafana to drop the creation of the /run/grafana directory prior to starting the service on CentOS 7. Grafana 4.5.0 and later manage this by setting the RuntimeDirectory option in the grafana-server.service unit file. However, CentOS 7 uses systemd v219 which will fail during startup if the directory specified by RuntimeDirectory already exists. This failure causes the first catalog application that installs and starts grafana-server to fail --- which is particularly problematic for Bolt plans that only run once. Fixes puppetlabs#37.
Sharpie
force-pushed
the
remove-rundir-creation
branch
from
85022fb
to
5164dc0
Compare
|
Tests++ Updated PR with removal. |
Prior to this commit, the spec tests for the ubuntu /run/grafana resources were present but no longer valid. This commit removes these tests and removes the rubocop exclusion that allowed them.
|
My bad. It looks like more should have been removed than I put in. I pushed a commit with the other removals |
jarretlavallee
approved these changes
Mar 14, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 service management logic for grafana to drop the
creation of the /run/grafana directory prior to starting the service on
CentOS 7. Grafana 4.5.0 and later manage this by setting the RuntimeDirectory
in the grafana-server.service unit file. However, CentOS 7 uses systemd v219
which will fail during startup if the directory specified by RuntimeDirectory
already exists. This failure causes the first catalog application that installs
and starts grafana-server to fail --- which is particularly problematic for
Bolt plans that only run once.