Merge branch 'develop'

Author: simonmeggle

.vscode/v1/launch.json

@@ -45,6 +45,34 @@
             // allow to inspect also foreign code
             "justMyCode": false
         },        
+        {
+            "name": "devc V1.6 inventory localhost",
+            "type": "python",
+            "request": "launch",
+            "program": "/omd/sites/cmk/bin/cmk",
+            "args": [
+                "-IIv",
+                "localhost"
+            ],
+            "console": "integratedTerminal",
+            "python": "/omd/sites/cmk/bin/python",
+            // allow to inspect also foreign code
+            "justMyCode": false
+        },        
+        {
+            "name": "devc V1.6 check localhost",
+            "type": "python",
+            "request": "launch",
+            "program": "/omd/sites/cmk/bin/cmk",
+            "args": [
+                "-vv",
+                "localhost"
+            ],
+            "console": "integratedTerminal",
+            "python": "/omd/sites/cmk/bin/python",
+            // allow to inspect also foreign code
+            "justMyCode": false
+        },        
         {
             "name": "Python: Current File",
             "type": "python",

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.2.3 - 2021-11-29
+
+### Fixed
+
+* Check: If results are too old, the check now sets the services to stale (= they
+  keep their state, but appear faded), whereas the Robotmk service turns into 
+  CRITICAL. 
+
+
 ## 1.2.2 - 2021-11-04
 
 ### Fixed

agents_plugins/robotmk.py

@@ -49,7 +49,7 @@
 
 local_tz = datetime.utcnow().astimezone().tzinfo
 
-ROBOTMK_VERSION = 'v1.2.2'
+ROBOTMK_VERSION = 'v1.2.3'
 
 class RMKConfig():
     _PRESERVED_WORDS = [

bakery/v1/robotmk.py

@@ -18,7 +18,7 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
-ROBOTMK_VERSION = 'v1.2.2'
+ROBOTMK_VERSION = 'v1.2.3'
 
 import cmk.utils.paths
 import os

bakery/v2/robotmk.py

@@ -18,7 +18,7 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
-ROBOTMK_VERSION = 'v1.2.2'
+ROBOTMK_VERSION = 'v1.2.3'
 
 from typing import Iterable, TypedDict, List
 from pathlib import Path

checks/v1/robotmk

@@ -34,7 +34,7 @@ from collections import namedtuple
 iam = "robotmk"
 # DO NOT DELETE
 inventory_robotmk_rules = []
-ROBOTMK_VERSION = 'v1.2.2'
+ROBOTMK_VERSION = 'v1.2.3'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')
 
@@ -336,27 +336,18 @@ def check_robot(item, checkgroup_parameters, parsed):
                             return evaluate_robot_item(discovered_item,
                                                        checkgroup_parameters)
                         else:
-                            # Keeping the following only for recalling.
-                            # A stale result should not return anything here. 
-                            # It's enough to have it alarmed by the Robotmk 
-                            # stale monitoring check (see Ref. N2UC9N)
-                            pass
-                            # overdue_sec = round(
-                            #     age.total_seconds() - root_suite['cache_time'],
-                            #     1)
-                            # return ignore_robot_item(root_suite, last_end,
-                            #                          overdue_sec)
+                            ignore_robot_item(root_suite, last_end, age)
 
 
 
-def ignore_robot_item(root_suite, last_end, overdue_sec):
-    # TODO: (Perhaps make this configurable (OK/UNKNOWN))
+def ignore_robot_item(root_suite, last_end, age):
+    overdue_sec = round(age.total_seconds() - root_suite['cache_time'],1)
     last_end_fmt = last_end.strftime('%Y-%m-%d %H:%M:%S')
     out = "Result of suite '%s' is too old. " % root_suite['id'] + \
         "Last execution end: %s, " % last_end_fmt + \
         "overdue since %ss " % (overdue_sec) + \
         "(cache time: %ss)" % str(root_suite['cache_time'])
-    return 3, out
+    raise MKCounterWrapped(out)
 
 
 def evaluate_robot_item(robot_item, checkgroup_parameters):

checks/v2/robotmk.py

@@ -35,7 +35,7 @@
 from cmk.base.plugins.agent_based.agent_based_api.v1 import *
 from cmk.utils.exceptions import MKGeneralException
 
-ROBOTMK_VERSION = 'v1.2.2'
+ROBOTMK_VERSION = 'v1.2.3'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')
 
@@ -337,30 +337,19 @@ def check_robotmk(item, params, section):
                             for i in evaluate_robot_item(discovered_item, params_dict):
                                 yield i
                         else:
-                            # Keeping the following only for recalling....
-                            # A stale result should not return anything here. 
-                            # It's enough to have it alarmed by the Robotmk 
-                            # stale monitoring check (see Ref. N2UC9N)
-                            pass
-                            # overdue_sec = round(
-                            #     age.total_seconds() - root_suite['cache_time'],
-                            #     1)
-                            # yield ignore_robot_item(root_suite, last_end,
-                            #                         overdue_sec)
-
-    # We should not come here. Item cannot be found in parsed data.
-    # see PRO TIP: simple return if no data is found
-    # http://bit.ly/3epEcf3
+                            ignore = ignore_robot_item(root_suite, last_end, age)
+                            yield ignore
+
     return  
 
-def ignore_robot_item(root_suite, last_end, overdue_sec):
-    # TODO: (Perhaps make this configurable (OK/UNKNOWN))
+def ignore_robot_item(root_suite, last_end, age):
+    overdue_sec = round(age.total_seconds() - root_suite['cache_time'],1)
     last_end_fmt = last_end.strftime('%Y-%m-%d %H:%M:%S')
     out = "Result of suite '%s' is too old. " % root_suite['id'] + \
         "Last execution end: %s, " % last_end_fmt + \
         "overdue since %ss " % (overdue_sec) + \
         "(cache time: %ss)" % str(root_suite['cache_time'])
-    return 3, out
+    return IgnoreResults(out)
 
 
 def evaluate_robot_item(robot_item, params):