[grafana] conf and logs from snap added #3289
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,29 +19,53 @@ class Grafana(Plugin, IndependentPlugin): | |
|
|
||
| packages = ('grafana',) | ||
|
|
||
| def _is_snap_installed(self): | ||
| grafana_pkg = self.policy.package_manager.pkg_by_name('grafana') | ||
| if grafana_pkg: | ||
| return grafana_pkg['pkg_manager'] == 'snap' | ||
| return False | ||
|
|
||
| def setup(self): | ||
| self._is_snap = self._is_snap_installed() | ||
| if self._is_snap: | ||
| grafana_cli = "grafana.grafana-cli" | ||
| log_path = "/var/snap/grafana/common/data/log/" | ||
| config_path = "/var/snap/grafana/current/conf/grafana.ini" | ||
|
|
||
| else: | ||
| grafana_cli = "grafana-cli" | ||
| log_path = "/var/log/grafana/" | ||
| config_path = "/etc/grafana/" | ||
|
|
||
| add_cmds = [ | ||
| f'{grafana_cli} plugins ls', | ||
| f'{grafana_cli} plugins list-remote', | ||
| 'snap info grafana' if self._is_snap else None, | ||
| f'{grafana_cli} -v' if not self._is_snap else None, | ||
| 'grafana-server -v' if not self._is_snap else None | ||
| ] | ||
| self.add_cmd_output(list(filter(None, add_cmds))) | ||
|
|
||
| log_file_pattern = "*.log*" if self.get_option("all_logs") else "*.log" | ||
|
|
||
| self.add_copy_spec([ | ||
| log_path + log_file_pattern, | ||
| config_path, | ||
| "/etc/sysconfig/grafana-server" if not self._is_snap else None | ||
|
There was a problem hiding this comment.
|
||
| ]) | ||
|
|
||
| def postproc(self): | ||
| protect_keys = [ | ||
| "admin_password", | ||
| "secret_key", | ||
| "password", | ||
| "client_secret" | ||
|
Comment on lines
-42
to
+62
There was a problem hiding this comment. +1, that helps also to non-snap instances. |
||
| ] | ||
| inifile = ( | ||
| "/var/snap/grafana/current/conf/grafana.ini" | ||
| if self._is_snap | ||
| else "/etc/grafana/grafana.ini" | ||
| ) | ||
|
|
||
| regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys) | ||
|
There was a problem hiding this comment. can you remove the |
||
| self.do_path_regex_sub(inifile, regexp, r"\1*********") | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do these commands not work with a snap installation? Or are they not present. Non-present commands are handled gracefully by
Plugin, so we don't need to set these toNoneand filter later.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Likewise we don't need to gate the
snap infocommand, we can just tuck anadd_cmd_output()under the conditional on line 30.