Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
simonmeggle committed Dec 13, 2021
2 parents 02a4949 + eef13e1 commit 1b812bc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6 - 2021-12-13

* Check: performance data are only created for a S/T/K if the RF result is PASS (#177).

## 1.2.5 - 2021-12-13

* Check: Fixed #178 when the suite ran, but procudes a fatal error.
Expand Down
2 changes: 1 addition & 1 deletion agents_plugins/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

local_tz = datetime.utcnow().astimezone().tzinfo

ROBOTMK_VERSION = 'v1.2.5'
ROBOTMK_VERSION = 'v1.2.6'

class RMKConfig():
_PRESERVED_WORDS = [
Expand Down
2 changes: 1 addition & 1 deletion bakery/v1/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.

ROBOTMK_VERSION = 'v1.2.5'
ROBOTMK_VERSION = 'v1.2.6'

import cmk.utils.paths
import os
Expand Down
2 changes: 1 addition & 1 deletion bakery/v2/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.

ROBOTMK_VERSION = 'v1.2.5'
ROBOTMK_VERSION = 'v1.2.6'

from typing import Iterable, TypedDict, List
from pathlib import Path
Expand Down
5 changes: 3 additions & 2 deletions checks/v1/robotmk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ from collections import namedtuple
iam = "robotmk"
# DO NOT DELETE
inventory_robotmk_rules = []
ROBOTMK_VERSION = 'v1.2.5'
ROBOTMK_VERSION = 'v1.2.6'
DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')

Expand Down Expand Up @@ -676,7 +676,8 @@ class RobotItem(object):
check_params)
perfdata_wanted = self._get_pattern_value('perfdata_creation',
check_params)
if perfdata_wanted and self.elapsed_time != None:
# Only generate perfdata for RF PASS state.
if perfdata_wanted and self.elapsed_time != None and self.status == 'PASS':
perflabel = get_perflabel("%s_%s" % (self.id, self.name))
if runtime_threshold:
cmk_perfdata = (
Expand Down
5 changes: 3 additions & 2 deletions checks/v2/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.5'
ROBOTMK_VERSION = 'v1.2.6'
DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'local/share/addons/robotmk')

Expand Down Expand Up @@ -684,7 +684,8 @@ def _eval_node_cmk_perfdata(self, check_params):
check_params)
perfdata_wanted = self._get_pattern_value('perfdata_creation',
check_params)
if perfdata_wanted and self.elapsed_time != None:
# Only generate perfdata for RF PASS state.
if perfdata_wanted and self.elapsed_time != None and self.status == 'PASS':
perflabel = get_perflabel("%s_%s" % (self.id, self.name))
if runtime_threshold:
cmk_perfdata = Metric(
Expand Down

0 comments on commit 1b812bc

Please sign in to comment.