Module: check_mk
Branch: master
Commit: 3eaa52636bf6868fff702354682f6b0a3f4ebf0d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3eaa52636bf686…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 2 10:11:17 2011 +0100
output agent version also for mixed hosts
---
ChangeLog | 1 +
modules/check_mk_base.py | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb8ed69..3fc1bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
* FIX: setup.sh: do not prepend current directory to url_prefix
* setup.sh: Allow to install Check_MK into existing OMD site (>= 0.46).
This is still experimental!
+ * FIX: output agent version also for mixed (tcp|snmp) hosts
Checks & Agents:
* FIX: drbd now handles output of older version without an ep field
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 85ed85f..e012d92 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -743,6 +743,7 @@ def do_all_checks_on_host(hostname, ipaddress):
num_errors = 0
check_table = get_sorted_check_table(hostname)
problems = []
+
for checkname, item, params, description, info in check_table:
# In case of a precompiled check table info is the aggrated
# service name. In the non-precompiled version there are the dependencies
@@ -819,11 +820,8 @@ def do_all_checks_on_host(hostname, ipaddress):
submit_aggregated_results(hostname)
try:
- if not is_snmp_host(hostname):
+ if is_tcp_host(hostname):
version_info = get_host_info(hostname, ipaddress, 'check_mk')
- # TODO: remove this later, when all agents have been converted
- if not version_info:
- version_info = get_host_info(hostname, ipaddress, 'mknagios')
agent_version = version_info[0][1]
else:
agent_version = "(unknown)"
Module: check_mk
Branch: master
Commit: 48ee9be6e32fadc3653918e4203f58b311e8ab69
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48ee9be6e32fad…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 2 10:02:40 2011 +0100
Updated bug entries
---
.bugs/169 | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/.bugs/169 b/.bugs/169
new file mode 100644
index 0000000..14a2eed
--- /dev/null
+++ b/.bugs/169
@@ -0,0 +1,28 @@
+Title: WATO misses services
+Component: wato
+Benefit: 4
+State: open
+Cost: 2
+Date: 2011-03-02 09:45:16
+Class: bug
+
+In some strange cases WATO seems to loose services:
+
+> I’m having a problem where services added via WATO will just disappear if
+> you run check_mk –O.
+>
+> Today I added a new group of some 5 devices, via WATO. I selected some
+> (snmp) services – various ports and interfaces. Several were auto added
+> – temperature, fans, etc.
+>
+> I then activated the configuration, again via WATO. Then checked the hosts,
+> and all services were there and polling. Everything was good.
+>
+> Later I edited some (completely unrelated) hosts via the files in
+> etc/check_mk/conf.d and ran check_mk to activate my changes. I noticed that I
+> lost about 100 services from my totals when the new configuration activated.
+> A check showed that my new hosts (and several older ones, too) has lost all
+> of their services – including the automatic ones! The only remaining
+> services were legacy services that I had much earlier added (globally)
+> via editing files.
+
Module: check_mk
Branch: master
Commit: b1e6586522e8f371fd1e24849d24bf2af560f1ca
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e6586522e8f3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 1 18:30:21 2011 +0100
Updated bugs
---
.bugs/166 | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/.bugs/166 b/.bugs/166
new file mode 100644
index 0000000..5f9226c
--- /dev/null
+++ b/.bugs/166
@@ -0,0 +1,29 @@
+Title: legacy_checks could allow passive services
+Component: core
+Benefit: 1
+State: open
+Cost: 2
+Date: 2011-03-01 18:24:00
+Class: feature
+
+Chris Bowlby:
+> I'm not sure if anyone has mentioned this before, based on a cursory
+> search of the mailing list, but would be nice to have an optional
+> element that can be used as part of the legacy_check param that would
+> denote that particular service as being passive. For example:
+>
+> legacy_checks += [
+> ( ( "passive_check_command", "PASSIVE SERVCE", False, True), ALL_HOSTS),
+> ( ( "active_check_command", "ACTIVE SERVCE", False), ALL_HOSTS),
+> ( ( "active_check_command", "ACTIVE SERVCE2", False, False), ALL_HOSTS),
+> ....
+> ]
+>
+> The example would set the first legacy check as passive, and the other
+> two as active. I know that one can simply use the extra_nagios_conf
+> parameter, but it's a wee bit clunky if you've got a large number of
+> passive checks and other elements that need to be converted. This idea
+> may provide a cleaner method where one can simply define the passive
+> check here, and allow them to take advantage of the other elements, such
+> as service groups, contact group links, etc. It also reduces the changes
+> of miss-creating an entry that causes a conflict later on.
Module: check_mk
Branch: master
Commit: 67dc7f70b7ed9779814d0e3ab5d6df53676ef127
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67dc7f70b7ed97…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 1 11:13:50 2011 +0100
cisco_qos: remove print, that broke WATO
---
ChangeLog | 1 +
README.writing_checks | 6 ++++++
checks/cisco_qos | 2 --
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 06a904e..7ccea6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
* hp_proliant_*: improve scan function (now just looks for "proliant")
* FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK)
* FIX: repair PNP template for df when using trends
+ * FIX: cisco_qos: fix WATO exception (was due to print command in check)
Multisite:
* FIX: fix json/python Webservice
diff --git a/README.writing_checks b/README.writing_checks
index b473704..6aeb27b 100644
--- a/README.writing_checks
+++ b/README.writing_checks
@@ -143,6 +143,12 @@ SNMP based checks:
* Only use numeric OIDs in your checks. Name based OIDs rely on MIB files
and the check won't work when the MIB files are not in place.
+Forbidden things:
+* Neither the check- nor the inventory function may use the print command
+ or otherwise output any data to stdout or stderr nor otherwise communicate
+ with the outside. An rare exception to this are checks that need a dedicated
+ data storage (such as logwatch: it keeps unread log messages in files).
+
Manpages
* Each check *must* have a man page. This should be:
diff --git a/checks/cisco_qos b/checks/cisco_qos
index 1a6e6cc..20a46ac 100644
--- a/checks/cisco_qos
+++ b/checks/cisco_qos
@@ -193,8 +193,6 @@ def check_cisco_qos(item, params, info):
perfdata.append( (name, rate, warn, crit, min, max) )
except MKCounterWrapped, e:
wrapped = True
- # continue, other counters might wrap as well
- print e
# if at least one counter wrapped, we do not handle the counters at all
if wrapped:
Module: check_mk
Branch: master
Commit: ecb649887120ca89c41050ceb9d1bdacd622927c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb649887120ca…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 1 18:03:06 2011 +0100
Added item section to wmic_process man page
---
.bugs/154 | 11 ++++++++---
checkman/wmic_process | 5 +++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.bugs/154 b/.bugs/154
index 3f2d123..03c2161 100644
--- a/.bugs/154
+++ b/.bugs/154
@@ -1,8 +1,13 @@
Title: wmic_process manpage misses ITEM section
Component: checks
+State: closed
+Class: bug
+Date: 2011-02-18 11:13:15
Benefit: 1
-State: open
Cost: 1
-Date: 2011-02-18 11:13:15
-Class: bug
+Fun: 0
+
+
+2011-03-01 18:02:40: changed state open -> done
+2011-03-01 18:02:46: changed state done -> closed
diff --git a/checkman/wmic_process b/checkman/wmic_process
index b7e2610..1e60562 100644
--- a/checkman/wmic_process
+++ b/checkman/wmic_process
@@ -18,6 +18,11 @@ description:
If no matching process is found running, then the check is always OK (since
no ressources are consumed).
+item:
+ A user definable string that is used as part of the service description.
+ If you choose {"APACHE"} as item, for example, then the check will be
+ named {proc_APACHE}.
+
perfdata:
Four value are sent: (1) The memory usage in MB, (2) The page file usage in MB,
(3) The CPU usage in user mode in %, (4) The CPU usage in kernel mode in %.