Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not fetch grafana version when it is already specified via config #273

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not fetch grafana version when it is already specified via config #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f23ff
do not fetch grafana version when it is already specified via config
pmorelli92 Jul 11, 2024
55124f4
do not error when parsing json of a response that has no json
pmorelli92 Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions grafana_backup/create_alert_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@ def main(args, settings, file_path):
verify_ssl = settings.get('VERIFY_SSL')
client_cert = settings.get('CLIENT_CERT')
debug = settings.get('DEBUG')

grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)
grafana_version = version.parse(grafana_version_string)
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

with open(file_path, 'r') as f:
data = f.read()

try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.4.0')

if minimum_version <= grafana_version:
Expand Down
14 changes: 9 additions & 5 deletions grafana_backup/create_contact_point.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ def main(args, settings, file_path):
client_cert = settings.get('CLIENT_CERT')
debug = settings.get('DEBUG')

try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error
grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.4.0')

Expand Down
5 changes: 4 additions & 1 deletion grafana_backup/dashboardApi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,10 @@ def send_grafana_get(url, http_get_headers, verify_ssl, client_cert, debug):
verify=verify_ssl, cert=client_cert)
if debug:
log_response(r)
return (r.status_code, r.json())
try:
return (r.status_code, r.json())
except ValueError:
return (r.status_code, r.text)


def send_grafana_post(url, json_payload, http_post_headers, verify_ssl=False, client_cert=None, debug=True):
Expand Down
14 changes: 7 additions & 7 deletions grafana_backup/save_alert_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ def main(args, settings):
pretty_print = settings.get('PRETTY_PRINT')
folder_path = '{0}/alert_rules/{1}'.format(backup_dir, timestamp)
log_file = 'alert_rules_{0}.txt'.format(timestamp)

grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)

try:
grafana_version = get_grafana_version(
grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.4.0')

Expand Down
14 changes: 7 additions & 7 deletions grafana_backup/save_contact_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ def main(args, settings):
pretty_print = settings.get('PRETTY_PRINT')
folder_path = '{0}/contact_points/{1}'.format(backup_dir, timestamp)
log_file = 'contact_points_{0}.txt'.format(timestamp)
grafana_version_string = settings.get('GRAFANA_VERSION')

grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)

try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.0.0')
if minimum_version <= grafana_version:
Expand Down
14 changes: 7 additions & 7 deletions grafana_backup/save_notification_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ def main(args, settings):
pretty_print = settings.get('PRETTY_PRINT')
folder_path = '{0}/notification_policies/{1}'.format(backup_dir, timestamp)
log_file = 'notification_policies_{0}.txt'.format(timestamp)
grafana_version_string = settings.get('GRAFANA_VERSION')

grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)

try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.0.0')
if minimum_version <= grafana_version:
Expand Down
14 changes: 9 additions & 5 deletions grafana_backup/update_notification_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ def main(args, settings, file_path):
client_cert = settings.get('CLIENT_CERT')
debug = settings.get('DEBUG')

try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error
grafana_version_string = settings.get('GRAFANA_VERSION')
if grafana_version_string:
grafana_version = version.parse(grafana_version_string)
else:
try:
grafana_version = get_grafana_version(grafana_url, verify_ssl, http_get_headers)
except KeyError as error:
if not grafana_version:
raise Exception("Grafana version is not set.") from error

minimum_version = version.parse('9.4.0')

Expand Down