Merge branch 'master' into migration_flipper_fox_graylog

Author: otherpirate

dbaas/notification/tasks_disk_resize.py

@@ -92,7 +92,17 @@ def zabbix_collect_used_disk(task):
                             message='Zabbix metrics not updated', level=4
                         )
 
-                if current_percentage >= threshold_disk_resize and \
+                size_metadata = database.databaseinfra.disk_offering.size_kb
+                if has_difference_between(size_metadata, current_size):
+                    problems += 1
+                    task.add_detail(
+                        message='Disk size different in metadata: {}kb'.format(
+                            size_metadata
+                        ),
+                        level=4
+                    )
+                    status = TaskHistory.STATUS_WARNING
+                elif current_percentage >= threshold_disk_resize and \
                         database.disk_auto_resize and \
                         not database_resized:
                     try:
@@ -224,3 +234,15 @@ def host_mount_data_percentage(address, task):
     )
 
     return values['percentage'], values['used'], values['total']
+
+
+def has_difference_between(metadata, collected):
+    threshold = Configuration.get_by_name_as_float(
+        "threshold_disk_size_difference", default=1.0
+    )
+
+    difference = (metadata * threshold)/100
+    max_value = metadata + difference
+    min_value = metadata - difference
+
+    return collected > max_value or collected < min_value

dbaas/physical/tests/test_host.py

@@ -7,7 +7,8 @@
 from ..models import Host
 from .factory import HostFactory
 
-SEARCH_FIELDS = ('hostname', 'nfsaas_host_attributes__nfsaas_path', 'address')
+SEARCH_FIELDS = ('hostname', 'nfsaas_host_attributes__nfsaas_path',
+                 'address', 'os_description')
 EDITING_READ_ONLY_FIELDS = ('nfsaas_size_kb', 'nfsaas_used_size_kb')
 
 

requirements.txt

@@ -53,7 +53,7 @@ wsgiref==0.1.2
 dbaas_cloudstack==0.8.4
 dbaas_credentials==1.1.10
 dbaas_nfsaas==0.6.13
-dbaas_zabbix==0.4.13
+dbaas_zabbix==0.4.14
 dbaas_dbmonitor==0.2.3
 dbaas_flipper==0.0.9
 django-filter==0.9.1