Index: /branches/amp_3_7_1/extensions/monitoring/model/__init__.py
===================================================================
--- /branches/amp_3_7_1/extensions/monitoring/model/__init__.py	(revision 2386)
+++ /branches/amp_3_7_1/extensions/monitoring/model/__init__.py	(working copy)
@@ -29,7 +29,8 @@
                     device_ip = options['device_ip']
                     vs_name = options['vs_name']
                     url = options['url']
-                    save_sql = "INSERT INTO monitor_adc_vs_url(device_ip, vs_name, url) values ('%s', '%s', '%s')" % (device_ip, vs_name, url)
+                    device_uuid = options['device_id']
+                    save_sql = "INSERT INTO monitor_adc_vs_url(device_ip, vs_name, url, device_id) values ('%s', '%s', '%s', '%s')" % (device_ip, vs_name, url, device_uuid)
                     db = DB.get_connected_db()
                     db.execute_sql(save_sql)
                     db.close()
Index: /branches/amp_3_7_1/extensions/monitoring/monitor_db.py
===================================================================
--- /branches/amp_3_7_1/extensions/monitoring/monitor_db.py	(revision 2386)
+++ /branches/amp_3_7_1/extensions/monitoring/monitor_db.py	(working copy)
@@ -76,9 +76,12 @@
     def create_table(self):
         print('Creating table monitor_adc_vs_url...')
         create_table_sql = '''CREATE TABLE IF NOT EXISTS monitor_adc_vs_url (
-                              device_ip varchar(64) NOT NULL,
-                              vs_name varchar(512) NOT NULL,
-                              url varchar(1024) NOT NULL
+			                    id SERIAL PRIMARY KEY,
+                                device_ip varchar(64) NOT NULL,
+                                vs_name varchar(512) NOT NULL,
+                                url varchar(1024) NOT NULL,
+			                    device_id varchar(64) NOT NULL,
+			                    FOREIGN KEY (device_id) REFERENCES device(id) ON DELETE CASCADE
                             )'''
         self.execute_sql(create_table_sql)
 
Index: /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/log_location.py
===================================================================
--- /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/log_location.py	(revision 2386)
+++ /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/log_location.py	(working copy)
@@ -35,8 +35,9 @@
             if str(storage_type).strip() == 'secondary':
                 response_data = log_service.get_secondary_drive_info()
                 if not response_data['is_disk_available']:
-                    response_data = {'status', 'There is no secondary disk attached to the system.'
-                                               'Please contact Administrator to add additional disk space'}
+                    response_data = {'is_disk_available': False,
+                                     'message': 'There is no secondary disk attached to the system.'
+                                                'Please contact Administrator to add additional disk space'}
             else:
                 return HttpResponse(json.dumps({
                     'error': 500,
@@ -105,7 +106,8 @@
     except ge.GenericError as e:
         # Log the error (optional)
         oper_log('error', 'system', 'Error while creating partition: {}'.format(e))
-        e.message = "Error while creating partition"
+        if (e.message is None):
+            e.message = "Error while creating partition"
         return ge.handle_exception(e)
     except Exception as e:
         # Handle unexpected exceptions
Index: /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/services/log_location_service.py
===================================================================
--- /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/services/log_location_service.py	(revision 2386)
+++ /branches/amp_3_7_1/src/webui/webui/htdocs/new/src/hive/services/log_location_service.py	(working copy)
@@ -151,8 +151,9 @@
                     create_partition(secondary_drive_info)
                 create_elastic_search_dir()
             else:
-                return {'status', 'There is no secondary disk attached to the system.'
-                                  'Please contact Administrator to add additional disk space'}
+                return {'is_disk_available': False,
+                        'message': 'There is no secondary disk attached to the system.'
+                                   'Please contact Administrator to add additional disk space'}
 
         elif log_location == const.PRIMARY:
             log_location = const.PRIMARY_LOG_LOCATION