Merge pull request #119 from dynatrace-extensions/DAQ-7718-restore-warning-status

Reverted "WARNING status changed to GENERIC_ERROR

Author: KasperSerzysk00

dynatrace_extension/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 
 
-__version__ = "1.6.2"
+__version__ = "1.6.3"

dynatrace_extension/sdk/extension.py

@@ -1081,17 +1081,13 @@ def _build_current_status(self):
         # Build overall status
         overall_status = Status(StatusValue.OK, "\n".join(messages))
         if any_warning:
-            # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-            # overall_status.status = StatusValue.WARNING
-            overall_status.status = StatusValue.GENERIC_ERROR
+            overall_status.status = StatusValue.WARNING
         elif all_ok:
             overall_status.status = StatusValue.OK
         elif all_err:
             overall_status.status = StatusValue.GENERIC_ERROR
         else:
-            # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-            # overall_status.status = StatusValue.WARNING
-            overall_status.status = StatusValue.GENERIC_ERROR
+            overall_status.status = StatusValue.WARNING
 
         return overall_status
 

tests/sdk/test_status.py

@@ -192,11 +192,7 @@ def callback():
         time.sleep(1)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn("foo1", status.message)
         self.assertIn("foo2", status.message)
 
@@ -218,11 +214,7 @@ def callback():
         time.sleep(1)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn("foo1", status.message)
         self.assertIn("foo2", status.message)
 
@@ -244,11 +236,7 @@ def callback():
         time.sleep(1)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn("foo1", status.message)
         self.assertIn("foo2", status.message)
 
@@ -269,11 +257,7 @@ def callback():
         time.sleep(1)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn("foo1", status.message)
 
     def test_multistatus_error(self):
@@ -341,11 +325,7 @@ def callback():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn(
             "OK: 8 NOK: 2 NOK_reported_errors: 4.5.6.7:80 - DEVICE_CONNECTION_ERROR "
             "Invalid authorization scheme 2, 6.7.8.9:80 - DEVICE_CONNECTION_ERROR Invalid authorization scheme 3",
@@ -421,11 +401,7 @@ def callback():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn(
             "OK: 9 NOK: 1 NOK_reported_errors: 1.2.3.4:80 - AUTHENTICATION_ERROR Invalid authorization scheme 7",
             status.message,
@@ -504,11 +480,7 @@ def callback():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn(
             "OK: 0 NOK: 1 NOK_reported_errors: 1.2.3.4:80 - WARNING Invalid authorization scheme A", status.message
         )
@@ -614,11 +586,7 @@ def callback_ep_status_2():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn("OK: 1 NOK: 1 NOK_reported_errors: EP_HINT_2 - WARNING EP2 MSG", status.message)
 
     def test_overall_status_error(self):
@@ -715,11 +683,7 @@ def callback_status():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn(
             "Endpoints OK: 0 NOK: 1 NOK_reported_errors: EP_HINT - WARNING EP MSG\ncallback_multistatus: OK - MULTI MSG",
             status.message,
@@ -753,11 +717,7 @@ def callback_status():
         time.sleep(0.01)
 
         status = ext._build_current_status()
-
-        # TODO WARNING STATUS: to be restored after EEC 1.313 is released
-        # self.assertEqual(status.status, StatusValue.WARNING)
-        self.assertEqual(status.status, StatusValue.GENERIC_ERROR)
-
+        self.assertEqual(status.status, StatusValue.WARNING)
         self.assertIn(
             "Endpoints OK: 0 NOK: 1 NOK_reported_errors: EP_HINT - INVALID_CONFIG_ERROR "
             "\ncallback_multistatus: GENERIC_ERROR - \ncallback_status: WARNING - ",