Merge branch 'develop'

CHANGELOG.md

@@ -5,6 +5,11 @@ 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.7 - 2021-12-23
+
+* Agent plugin: Fixed a bug in failed test re-execution when the output XML files 
+  were not processed in the correct chronological order. (#185)
+
 ## 1.2.6 - 2021-12-13
 
 * Check: performance data are only created for a S/T/K if the RF result is PASS (#177).

README.md

@@ -122,6 +122,8 @@ Robotmk works with any Checkmk 1.6x and 2.x version and edition (CEE and CRE).
 
 ## Installation
 
+### Installing the Robotmk server component
+
 You can choose between two ways of installing Robotmk: 
 
 * Installing as [MKP](https://checkmk.com/cms_mkps.html) is the preferred way. 
@@ -142,6 +144,15 @@ robotmk     tcp    (no man page present)
 
 In a distributed monitoring environment, make sure to check the option `Replicate extensions` in the remote site's connection options. 
 
+### Preparing the Robotmk agent 
+
+By using Checkmk Enterprise (highly recommended), the bakery automatically deploys the Robotmk Python plugin scripts as well as `robotmk.yml` automatically.
+The only thing to install on the agent beforehand are the following **Python modules** (beside of them the Robot Framework tests need, of course): 
+
+    pip3 install robotframework pyyaml mergedeep python-dateutil
+
+If you are in doubt if CEE is the right choice for you but want to start with the Raw Edition (CRE): the best way to learn what and how to deploy files by hand is to use the ["free" edition of CEE](https://checkmk.com/download?edition=cfe&version=stable) (free up to 25 hosts). You will see then how `robotmk.yml` gets built and where it installs the plugins. 
+
 ## Documentation
 
 All Robotmk rules come with a very **detailled and comprehensive context help**. This covers 95% of all information which is needed to work with Robotmk. 
@@ -231,4 +242,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

agents_plugins/robotmk.py

@@ -49,7 +49,7 @@
 
 local_tz = datetime.utcnow().astimezone().tzinfo
 
-ROBOTMK_VERSION = 'v1.2.6'
+ROBOTMK_VERSION = 'v1.2.7'
 
 class RMKConfig():
     _PRESERVED_WORDS = [
@@ -1030,6 +1030,7 @@ def merge_results(self, suite):
         # output files without attempt suffix
         suite.update_output_filenames()
         outputfiles = self.glob_suite_outputfiles(suite)
+        outputfiles.sort()
         self.logdebug("Merging the results of the following result files into %s: " % suite.output)
         filenames = [Path(f).name for f in outputfiles]
         for f in filenames: 

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.6'
+ROBOTMK_VERSION = 'v1.2.7'
 
 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.6'
+ROBOTMK_VERSION = 'v1.2.7'
 
 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.6'
+ROBOTMK_VERSION = 'v1.2.7'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')
 

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.6'
+ROBOTMK_VERSION = 'v1.2.7'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')