Module: check_mk
Branch: master
Commit: d17d0668d11ce0bc62fd6123ed693b05e3ef545e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d17d0668d11ce0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Feb 18 18:13:32 2015 +0100
Fixed syntax error in error message
---
web/htdocs/metrics.py | 2 +-
web/plugins/metrics/check_mk.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py
index 2af29a1..3c0b52f 100644
--- a/web/htdocs/metrics.py
+++ b/web/htdocs/metrics.py
@@ -209,7 +209,7 @@ def evaluate_rpn(expression, translated_metrics):
stack.append(evaluate_literal(operator_name, translated_metrics))
if len(stack) != 1:
- raise MKGeneralException("Syntax error in expression '%s': too much
operands left" % expression)
+ raise MKGeneralException("Syntax error in expression '%s': too many
operands left" % expression)
return stack[0]
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index 1e1b033..bc972ac 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -449,7 +449,7 @@ perfometer_info.append(("linear", ( [ "user",
"system", "io_wait" ],
perfometer_info.append(("linear", ( [ "util", ],
100.0, None)))
perfometer_info.append(("linear", ( [ "fs_used(%)" ],
100.0, None)))
perfometer_info.append(("linear", ( [ "mem_used",
"swap_used", "caches", "mem_free", "swap_free" ],
None,
-("mem_total,mem_used,swap_used,+,/", "ratio"))))
+("mem_total,mem_used,+,swap_used,/", "ratio"))))
perfometer_info.append(("linear", ( [ "mem_used" ],
"mem_total", None)))
perfometer_info.append(("linear", ( [ "mem_used(%)" ],
100.0, None)))
perfometer_info.append(("logarithmic", ( "time_offset", 1.0,
10.0)))