Module: check_mk
Branch: master
Commit: 5e41130dc7d6371f603551d5f064fe94dc32b030
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e41130dc7d637…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 28 12:25:37 2013 +0200
FIX: hr_mem: handle virtual memory correct on some devices
---
ChangeLog | 1 +
checks/hr_mem | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b3701e..d4382f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@
* cisco_wlc_clients: New check for the nummber of clients in a wlc wifi
* df: Negative integer levels for MB left on a device
* win_printers: Monitoring of printer queue on a windows printserver
+ * FIX: hr_mem: handle virtual memory correct on some devices
Notifications:
* notify.py: Matching service level: Use the hosts service level if a
diff --git a/checks/hr_mem b/checks/hr_mem
index ddfb601..7c37e4c 100644
--- a/checks/hr_mem
+++ b/checks/hr_mem
@@ -37,7 +37,7 @@ def inventory_hr_mem(info):
if saveint(hrsize) > 0: # some device have zero (broken) values
return [(None, "memused_default_levels")]
-def check_hr_mem(item, params, info):
+def check_hr_mem(_no_item, params, info):
usage = {}
for hrtype, hrdescr, hrunits, hrsize, hrused in info:
if hrtype in [ ".1.3.6.1.2.1.25.2.1.2",
@@ -47,7 +47,7 @@ def check_hr_mem(item, params, info):
# We use only the first entry of each type. We have
# seen devices (pfSense), that have lots of additional
# entries that are not useful.
- if hrtype not in usage:
+ if hrtype not in usage and hrdescr != "Virtual memory":
usage[hrtype] = (size, used)
# Account for cached memory (this works at least for systems using
Module: check_mk
Branch: master
Commit: a34a4e1161a4a22cbd9ed76c675fb92ec414c6c7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a34a4e1161a4a2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Aug 28 09:58:01 2013 +0200
Added missing help text
---
mkeventd/web/plugins/wato/mkeventd.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index e2a8477..8f56414 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -258,6 +258,9 @@ vs_mkeventd_rule = Dictionary(
Checkbox(
title = _("Automatic Deletion"),
label = _("Delete event immediately after the actions"),
+ help = _("Incoming messages might trigger actions (when configured above), "
+ "afterwards only an entry in the event history will be left. There "
+ "will be no \"open event\" to be handled by the administrators."),
)
),
( "count",
Module: check_mk
Branch: master
Commit: 7d81876c26166b7353e2fc66c11406bb30bba846
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d81876c26166b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Aug 28 10:08:30 2013 +0200
FIX: Fixed first toggle of flags in global settings when default is set to True
Conflicts:
web/htdocs/wato.py
---
ChangeLog | 1 +
web/htdocs/wato.py | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 88a058e..4b3701e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -321,6 +321,7 @@
* FIX: automation users can now be deleted again (bug was introduced in 1.2.2p1)
* FIX: fix logwatch pattern analyzer message "The host xyz is not
managed by WATO." after direct access via snapin
+ * FIX: Fixed first toggle of flags in global settings when default is set to True
Event Console:
* FIX: apply rewriting of application/hostname also when cancelling events
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 1cfdd54..fcb7b90 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5621,7 +5621,7 @@ def mode_globalvars(phase):
action = html.var("_action")
if varname:
domain, valuespec, need_restart, allow_reset, in_global_settings = g_configvars[varname]
- def_value = default_values.get(varname, valuespec.canonical_value())
+ def_value = default_values.get(varname, valuespec.default_value())
if action == "reset" and not isinstance(valuespec, Checkbox):
c = wato_confirm(
@@ -5631,8 +5631,9 @@ def mode_globalvars(phase):
(varname, valuespec.value_to_text(def_value)))
else:
if not html.check_transaction():
- return
+ return
c = True # no confirmation for direct toggle
+
if c:
# if action == "reset":
# del current_settings[varname]
Module: check_mk
Branch: master
Commit: 368ecaf55b25fbaafde8e1ea80299ddb84c655dc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=368ecaf55b25fb…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Aug 27 16:06:15 2013 +0200
Updated bug entries #1037, #1039
---
.bugs/1037 | 25 +++++++++++++++++-
.bugs/1039 | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/.bugs/1037 b/.bugs/1037
index 1061495..ff1bce5 100644
--- a/.bugs/1037
+++ b/.bugs/1037
@@ -1,9 +1,9 @@
Title: check_mk_agent.exe unable to restart after a crash: logstate.txt 0 bytes
Component: checks
+Class: bug
State: open
Date: 2013-08-27 10:58:29
Targetversion: 1.2.3
-Class: bug
came in via feedback@ // original mail still available in feedback/gitbug folder
@@ -27,3 +27,26 @@ To work around the problem I remove the logstate.txt and then start the check_mk
hint by bs: the attached logstate.txt is 0 bytes
+
+2013-08-27 13:19:06: changed state open -> open
+more info from Peter Rogers:
+
+Hi Bernd,
+
+Thank you for your reply, the currupt file is not empty (123k in size) so I have reattached a copy of the file.
+
+If I edit the file in Notepad++ I see one line of null entries, and converted to HEX I get the following:
+
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+0000000000000000000000
+
+I have had a number of crashes on this server as the Windows machine is running on a VM server which has had problems, but the currupt logstate.txt file is always 123k in size and looks the same when edited.
+
+Regards,
+Peter Rogers
diff --git a/.bugs/1039 b/.bugs/1039
new file mode 100644
index 0000000..da19013
--- /dev/null
+++ b/.bugs/1039
@@ -0,0 +1,82 @@
+Title: livestatus bug in OutputFormat: json
+Component: livestatus
+State: open
+Date: 2013-08-27 16:02:02
+Targetversion: 1.2.3
+Class: bug
+
+came in via feedback@ // mail still available in feedback/gitbug folder
+
+
+From: <Sascha.Pfalz(a)ivz.de>
+To: <feedback(a)check-mk.org>
+Subject: [Bug]: JSON Data falsch
+Thread-Topic: [Bug]: JSON Data falsch
+Thread-Index: Ac6IZny063o7fFKiSS2eLhEqKFzKaA==
+Date: Wed, 24 Jul 2013 12:08:20 +0000
+
+Hi,
+
+Erst mal möchte ich danke sagen für das super Plugin, das hat mir viel Arbeit erspart und macht den Einsatz von unseren Nagios und SMBox Systemen etwas leichter
+
+Allerdings scheint sich ein Bug in die V1.2.2p2 eingeschlichen zu haben, und zwar geht es um das Auslesen von Kommentaren bei folgendem Kommando:
+
+$CMD = "GET services\n";
+$CMD.= "Columns: host_name comments_with_info\n";
+$CMD.= "Filter: host_name = localhost\n";
+$CMD.= "OutputFormat: json\n";
+
+Der Host localhost hat 11 Services definiert, wobei einer einen Kommentar definiert hat. Dabei erhalte ich folgende Ausgabe:
+
+[["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[[705,"nagios","Testing",]]]]
+
+Und das ist leider nicht korrekt, das letzte ",]" ist falsch! Diese Daten lassen sich leider nicht via json_decode() in PHP dekodieren. Wandel ich das Ganze aber wie folgt ab:
+
+[["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[]],
+["localhost",[[705,"nagios","Testing"]]]]
+
+-------------------------------------^^^
+
+
+Dann funktioniert das auch sofort wieder.
+
+Ich habe leider aktuell nicht so viel Zeit, um einen Patch zu liefern, deswegen dieser etwas chaotische Bugreport, ich hoffe aber, das man das soweit nachvollziehen kann.
+
+In der 1.1.10p3 war dieser Bug definitiv nicht drin.
+
+Getestet habe ich mit den Nagios Versionen 3.2.1 und 3.5.0, bei beiden tritt diese falsche JSON Kodierung auf.
+
+Nochmals vielen Dank für das Plugin!
+
+Viele Grüße,
+--
+Sascha Pfalz
+Oracle Developer
+Archiv- und Produktionssysteme
+
+Tel. +49(0)30 97993-86318
+sascha.pfalz"at"ivz.de
+
+Informations-Verarbeitungs-Zentrum
+Gemeinschaftseinrichtung von
+DW - Deutschlandradio - MDR - NDR - RB - RBB - SR - WDR
+Masurenallee 8-14 14057 Berlin