Merge branch 'develop'

CHANGELOG.md

@@ -5,6 +5,10 @@ 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.5 - 2021-12-13
+
+* Check: Fixed #178 when the suite ran, but procudes a fatal error. 
+
 ## 1.2.4 - 2021-12-07
 
 * Check: Check crashes when the suite never ran. In this case, no XML is present

agents_plugins/robotmk.py

@@ -49,7 +49,7 @@
 
 local_tz = datetime.utcnow().astimezone().tzinfo
 
-ROBOTMK_VERSION = 'v1.2.4'
+ROBOTMK_VERSION = 'v1.2.5'
 
 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.4'
+ROBOTMK_VERSION = 'v1.2.5'
 
 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.4'
+ROBOTMK_VERSION = 'v1.2.5'
 
 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.4'
+ROBOTMK_VERSION = 'v1.2.5'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')
 
@@ -85,7 +85,7 @@ def parse_robot(info):
                     else:
                         d_decomp = d
                     json_suite[k] = d_decomp
-        if 'xml' in json_suite:
+        if json_suite.get('xml') != None:
             # TODO: his should not be done for HTML 
             # Leave the XML data binary here, because ElementTree has its own decoding
             # mechaism, see https://stackoverflow.com/a/12349894/14845044

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.4'
+ROBOTMK_VERSION = 'v1.2.5'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')
 
@@ -86,7 +86,7 @@ def parse_robotmk(params, string_table):
                     else:
                         d_decomp = d
                     json_suite[k] = d_decomp
-        if 'xml' in json_suite:
+        if json_suite.get('xml') != None:
             xml = ET.fromstring(json_suite['xml'])
             xml_root_suite = xml.find('./suite')
             setting = pattern_match(robot_discovery_settings,