Merge pull request #110 from skalenetwork/develop

New beta release (fixed watchdog metrics)

bounty/requirements.txt

@@ -1,7 +1,7 @@
-docker==3.2.1
-skale-py==2.1dev14
+docker==4.2.0
+skale-py==2.1.dev16
 schedule==0.6.0
 tenacity==6.0.0
-mysqlclient==1.4.5
-peewee==3.7.1
+mysqlclient==1.4.6
+peewee==3.13.1
 apscheduler==3.6.3

sla/metrics.py

@@ -101,15 +101,18 @@ def get_containers_healthcheck(host):
         logger.info(f'Request failed, status code: {response.status_code}')
         return 1
 
-    json = response.json()
-    if json['res'] != 1:
-        for error in response.json()['errors']:
-            logger.info(error)
+    res = response.json()
+    if res.get('error') is not None:
+        logger.info(res['error'])
         return 1
-    else:
-        data = json['data']
+    data = res.get('data')
+    if data is None:
+        logger.info(f'No data found checking {url}')
+        return 1
+
     for container in data:
         if not container['state']['Running'] or container['state']['Paused']:
+            logger.info(f'{container["name"]} is not running or paused')
             return 1
     return 0
 

sla/requirements.txt

@@ -1,7 +1,7 @@
-docker==3.2.1
+docker==4.2.0
 skale-py==2.1dev14
-pingparsing==0.13.2
+pingparsing==0.18.2
 schedule==0.6.0
 tenacity==6.0.0
-mysqlclient==1.4.5
-peewee==3.11.2
+mysqlclient==1.4.6
+peewee==3.13.1

tests/unit/test_healthcheck.py

@@ -44,15 +44,17 @@ def json(self):
     data_bad2 = [{'name': 'container_name', 'state': {'Running': False, 'Paused': True}}]
 
     if args[0] == get_test_url('url_ok1'):
-        return MockResponse({'res': 1, 'data': data_ok1}, 200)
+        return MockResponse({'error': None, 'data': data_ok1}, 200)
     elif args[0] == get_test_url('url_bad1'):
-        return MockResponse({'res': 1, 'data': data_bad1}, 200)
+        return MockResponse({'error': None, 'data': data_bad1}, 200)
     elif args[0] == get_test_url('url_bad2'):
-        return MockResponse({'res': 0, 'data': data_ok1, 'errors': ["Error1"]}, 200)
+        return MockResponse({'error': 'any_error', 'data': data_ok1}, 200)
     elif args[0] == get_test_url('url_bad3'):
-        return MockResponse({'res': 1, 'data': data_ok1}, 500)
+        return MockResponse({'error': None, 'data': data_ok1}, 500)
     elif args[0] == get_test_url('url_bad4'):
-        return MockResponse({'res': 1, 'data': data_bad2}, 200)
+        return MockResponse({'error': None, 'data': data_bad2}, 200)
+    elif args[0] == get_test_url('url_bad5'):
+        return MockResponse({'error': None}, 200)
 
     return MockResponse(None, 404)
 
@@ -83,6 +85,8 @@ def test_healthcheck_neg(mock_get):
     assert res == 1
     res = get_containers_healthcheck('url_bad5')
     assert res == 1
+    res = get_containers_healthcheck('url_bad6')
+    assert res == 1
 
 
 @mock.patch('sla.metrics.requests.get', side_effect=connection_error)