Merge pull request #11 from ARGOeu-Metrics/devel

Version 0.3.0

README.md

@@ -32,5 +32,5 @@ Example execution of `check_status.py`
 ```
 # /usr/libexec/argo/probes/argo-servicestatus/check_status.py -t 30 -u https://wiki.eoscfuture.eu/status
 
-OK - Service available
+OK - Service available|time=0.076267s;size=19B
 ```

argo-probe-argo-servicestatus.spec

@@ -1,7 +1,7 @@
 %global __python %{python3}
 
 Name:		argo-probe-argo-servicestatus
-Version:	0.2.0
+Version:	0.3.0
 Release:	1%{?dist}
 Summary:	Monitoring scripts that check service status
 License:	GPLv3+
@@ -34,6 +34,8 @@ install -m 755 check_status.py %{buildroot}/%{_libexecdir}/argo/probes/argo-serv
 %attr(0755,root,root) /%{_libexecdir}/argo/probes/argo-servicestatus/check_status.py
 
 %changelog
+* Thu Mar 7 2024 Katarina Zailac <kzailac@srce.hr> - 0.3.0-1
+- ARGO-4476 Add performance data to argo-probe-argo-servicestatus
 * Thu Jul 6 2023 Katarina Zailac <kzailac@srce.hr> - 0.2.0-1
 - ARGO-4329 Fix an error in probe
 - ARGO-4320 Generalize argo-probe-argo-servicestatus probe

check_status.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 import argparse
+import json
 import sys
 
 import requests
@@ -36,18 +37,29 @@ def get_statuscode(self):
 
 def check_status(args):
     probe = ProbeResponse()
+    perf_data = ""
     try:
         response = requests.get(args.url, timeout=args.timeout)
 
-        response.raise_for_status()
+        response_time = response.elapsed.total_seconds()
+        response_size = len(response.content)
+
+        perf_data = f"|time={response_time}s;size={response_size}B"
 
         status = response.json()[args.key]
 
+        response.raise_for_status()
+
         if status.lower() == args.value:
-            probe.write_ok("Service available")
+            probe.write_ok(f"Service available{perf_data}")
 
         else:
-            probe.write_warning(f"Service not available: {status}")
+            probe.write_critical(f"Service not available: {status}{perf_data}")
+
+    except json.decoder.JSONDecodeError as err:
+        probe.write_critical(
+            f"Error decoding JSON: {str(err)}{perf_data}"
+        )
 
     except (
         requests.exceptions.HTTPError,
@@ -56,7 +68,11 @@ def check_status(args):
         ValueError,
         KeyError
     ) as err:
-        probe.write_critical(str(err))
+        msg = str(err)
+        if perf_data:
+            msg = f"{msg}{perf_data}"
+
+        probe.write_critical(msg)
 
     except Exception as err:
         probe.write_unknown(str(err))