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

Merge pull request #105 from peekjef72/master

add configuration attribute to set backup file name
parents 42bfd455 e4d4cf5f
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"debug": true, "debug": true,
"verify_ssl": true, "verify_ssl": true,
"backup_dir": "_OUTPUT_", "backup_dir": "_OUTPUT_",
"backup_file_format": "%Y%m%d%H%M",
"pretty_print": false "pretty_print": false
}, },
"grafana": { "grafana": {
...@@ -14,3 +15,4 @@ ...@@ -14,3 +15,4 @@
"admin_password": "" "admin_password": ""
} }
} }
...@@ -24,6 +24,7 @@ def main(config_path): ...@@ -24,6 +24,7 @@ def main(config_path):
verify_ssl = config.get('general', {}).get('verify_ssl', False) verify_ssl = config.get('general', {}).get('verify_ssl', False)
client_cert = config.get('general', {}).get('client_cert', None) client_cert = config.get('general', {}).get('client_cert', None)
backup_dir = config.get('general', {}).get('backup_dir', '_OUTPUT_') backup_dir = config.get('general', {}).get('backup_dir', '_OUTPUT_')
backup_file_format = config.get('general', {}).get('backup_file_format', '%Y%m%d%H%M')
pretty_print = config.get('general', {}).get('pretty_print', False) pretty_print = config.get('general', {}).get('pretty_print', False)
aws_s3_bucket_name = config.get('aws', {}).get('s3_bucket_name', '') aws_s3_bucket_name = config.get('aws', {}).get('s3_bucket_name', '')
aws_s3_bucket_key = config.get('aws', {}).get('s3_bucket_key', '') aws_s3_bucket_key = config.get('aws', {}).get('s3_bucket_key', '')
...@@ -80,7 +81,7 @@ def main(config_path): ...@@ -80,7 +81,7 @@ def main(config_path):
HTTP_GET_HEADERS.update({k: v}) HTTP_GET_HEADERS.update({k: v})
HTTP_POST_HEADERS.update({k: v}) HTTP_POST_HEADERS.update({k: v})
TIMESTAMP = datetime.today().strftime('%Y%m%d%H%M') TIMESTAMP = datetime.today().strftime(backup_file_format)
config_dict['GRAFANA_URL'] = GRAFANA_URL config_dict['GRAFANA_URL'] = GRAFANA_URL
config_dict['GRAFANA_ADMIN_ACCOUNT'] = ADMIN_ACCOUNT config_dict['GRAFANA_ADMIN_ACCOUNT'] = ADMIN_ACCOUNT
......
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