Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/lib/postgres_db.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/lib/postgres_db.py (revision 2517) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/lib/postgres_db.py (working copy) @@ -541,7 +541,8 @@ time TIME NOT NULL, day_of_the_week integer DEFAULT NULL, day_of_the_month integer DEFAULT NULL, - month integer DEFAULT NULL CHECK (month BETWEEN 1 AND 12) + month integer DEFAULT NULL CHECK (month BETWEEN 1 AND 12), + destination varchar(64) DEFAULT NULL ); ''' self.execute_sql(create_table_sql) Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/backup_service.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/backup_service.py (revision 2517) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/backup_service.py (working copy) @@ -52,6 +52,7 @@ os.makedirs(TMP_BACKUP_DIR) backup_logger.info("Starting backup...") + oper_log('info', 'system', "Backup started") self.update_backups_db(BACKUP_FILE, "Started", 'insert', destination) # Backup InfluxDB @@ -136,6 +137,7 @@ ServiceUtils.run_command("rm -rf {}".format(backup_file), backup_logger) backup_logger.info("Backup completed: " + BACKUP_FILE) + oper_log('info', 'system', "Backup completed: " + BACKUP_FILE) except Exception as e: self.update_backups_db(BACKUP_FILE, "Failed", 'update') Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/restore_service.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/restore_service.py (revision 2517) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/restore_service.py (working copy) @@ -40,6 +40,7 @@ os.makedirs(RESTORE_DIR) backup_file = None + oper_log('info', 'system', "Restoring backup: " + filename) if destination == ServiceUtils.REMOTE: result = fetch_remote_storage_details() # Persist the data in remote storage @@ -135,6 +136,7 @@ ServiceUtils.run_command("rsync -av {}/logs/ /var/log/".format(RESTORE_DIR), restore_logger) restore_logger.info("Restore completed") + oper_log('info', 'system', "Restore completed") time.sleep(5) os.system("shutdown -r +1") Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/schedule_backup.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/schedule_backup.py (revision 2517) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/schedule_backup.py (working copy) @@ -9,8 +9,6 @@ from cm.lib.libbasic_operation import oper_log from hive.utils import andebug, get_current_session from hive.services.service_utils import ServiceUtils -from hive.session import ANSession -from lib.crontab import CronTab from cm.lib.postgres_db import DB # Configure Logging @@ -34,22 +32,24 @@ time_str = hours + ':' + minutes if not data: insert_sql = """INSERT INTO backup_schedule - (frequency, time, day_of_the_month, day_of_the_week, month) - VALUES ('{}', '{}', {}, {}, {})""".format( + (frequency, time, day_of_the_month, day_of_the_week, month, destination) + VALUES ('{}', '{}', {}, {}, {}, '{}')""".format( frequency, time_str, "NULL" if day_of_the_month is None else day_of_the_month, "NULL" if day_of_the_week is None else day_of_the_week, - "NULL" if month is None else month + "NULL" if month is None else month, + ServiceUtils.LOCAL if backup_target is None else str(backup_target) ) db.execute_sql(insert_sql) else: row_id = data[0][0] update_sql = """UPDATE backup_schedule set frequency='{}', time='{}', day_of_the_month={}, day_of_the_week={}, - month={} where id = {}""".format( + month={}, destination='{}' where id = {}""".format( frequency, time_str, "NULL" if day_of_the_month is None else day_of_the_month, "NULL" if day_of_the_week is None else day_of_the_week, "NULL" if month is None else month, + ServiceUtils.LOCAL if backup_target is None else str(backup_target), row_id ) db.execute_sql(update_sql) @@ -189,11 +189,12 @@ """ Deploys the scheduled backup job details """ try: db = DB.get_connected_db() - fetchall_sql = '''SELECT frequency, time, day_of_the_month, day_of_the_week, month FROM backup_schedule''' + fetchall_sql = '''SELECT frequency, time, day_of_the_month, day_of_the_week, month, destination + FROM backup_schedule''' data = db.fetchall(fetchall_sql) if data: - key = ['frequency', 'time', 'day_of_the_month', 'day_of_the_week', 'month'] + key = ['frequency', 'time', 'day_of_the_month', 'day_of_the_week', 'month', 'destination'] values = list(data[0]) # Convert `datetime.time` to a string (HH:MM format) @@ -201,10 +202,9 @@ values[1] = values[1].strftime("%H:%M") # Convert to HH:MM string result = dict(zip(key, values)) - else: - result = None - if result: + # Rename 'destination' to 'backup_target' + result['backup_target'] = result.pop('destination') return HttpResponse(json.dumps(result), content_type="application/json") else: Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/service_utils.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/service_utils.py (revision 2517) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/service_utils.py (working copy) @@ -6,7 +6,7 @@ class ServiceUtils: # Set Variables BACKUP_LOG_FILE = "/var/backup.log" - BACKUP_CRON_LOG_FILE = "/var/log/backup_cron.log" + BACKUP_CRON_LOG_FILE = "/var/backup_cron.log" POSTGRES_USER = "postgres" POSTGRES_DB = "cm" POSTGRES_HOST = "127.0.0.1"