Skip to content
Snippets Groups Projects
Unverified Commit f5c9868a authored by ysde's avatar ysde Committed by GitHub
Browse files

Merge pull request #124 from acjohnson/master

fixed #123
parents 613b2d18 45679f48
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. ...@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
# [1.1.7] - 2021-01-13
### Added
### Changed
- #123 fixed Crash on save_folders.py
### Removed
# [1.1.6] - 2020-12-28 # [1.1.6] - 2020-12-28
### Added ### Added
......
import os import os
PKG_NAME = 'grafana-backup' PKG_NAME = 'grafana-backup'
PKG_VERSION = '1.1.6' PKG_VERSION = '1.1.7'
JSON_CONFIG_PATH = '{0}/.grafana-backup.json'.format(os.environ['HOME']) JSON_CONFIG_PATH = '{0}/.grafana-backup.json'.format(os.environ['HOME'])
...@@ -56,7 +56,8 @@ def get_individual_folder_setting_and_save(folders, folder_path, log_file, grafa ...@@ -56,7 +56,8 @@ def get_individual_folder_setting_and_save(folders, folder_path, log_file, grafa
else: else:
folder_uri = folder['uri'] folder_uri = folder['uri']
(status, content) = get_folder(folder_uri, grafana_url, http_get_headers, verify_ssl, client_cert, debug) (status, content) = get_folder(folder['uid'], grafana_url, http_get_headers, verify_ssl, client_cert, debug)
if status == 200: if status == 200:
save_folder_setting( save_folder_setting(
to_python2_and_3_compatible_string(folder['title']), to_python2_and_3_compatible_string(folder['title']),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment