Module: check_mk
Branch: master
Commit: 54c4e43f3d2682be57fa78406cd32dee2836d108
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54c4e43f3d2682…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 15 17:55:49 2011 +0100
Added missing files for omd_status
---
checkman/omd_status | 18 ++++++++++++++++++
checks/omd_status | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/checkman/omd_status b/checkman/omd_status
new file mode 100644
index 0000000..38da2e7
--- /dev/null
+++ b/checkman/omd_status
@@ -0,0 +1,18 @@
+title: Check status of OMD sites
+agents: linux
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check checks the status of OMD sites found on the system.
+ It uses the output of {omd status --bare --auto}. The site is considered
+ to be {OK} if all services of the site are running and {CRIT}
+ otherwise. If the site is only partially running then the check output
+ shows the names of the stopped services.
+
+item:
+ The name of the site (string).
+
+inventory:
+ One check per site will be created for each site where {AUTOSTART} is
+ set to {on}, regardless of the current state of the site.
diff --git a/checks/omd_status b/checks/omd_status
new file mode 100644
index 0000000..2c798cd
--- /dev/null
+++ b/checks/omd_status
@@ -0,0 +1,40 @@
+# <<<omd_status>>>
+# [kaputt]
+# apache 1
+# rrdcached 1
+# npcd 1
+# nagios 1
+# crontab 1
+# OVERALL 1
+# [test]
+# apache 1
+# rrdcached 1
+# npcd 0
+# nagios 1
+# crontab 1
+# OVERALL 2
+
+def inventory_omd_status(checkname, info):
+ return [ ( line[0][1:-1], None ) for line in info if line[0][0] == '[' ]
+
+def check_omd_status(item, _no_params, info):
+ active = False
+ for line in info:
+ if line[0] == '[' + item + ']':
+ active = True
+ stopped = []
+ elif active:
+ if line[0] == 'OVERALL':
+ if line[1] == '0':
+ return (0, 'OK - all services are running')
+ elif line[1] == '1':
+ return (2, 'CRIT - site is stopped')
+ else:
+ return (2, 'CRIT - partially running! stopped services: %s' % ", ".join(stopped))
+ elif line[1] != '0':
+ stopped.append(line[0])
+ return (3, "UNKNOWN - site not existing or AUTOSTART off")
+
+check_info['omd_status'] = \
+ (check_omd_status, "OMD %s status", 0, inventory_omd_status)
+
Module: check_mk
Branch: master
Commit: 5fe7a003200590baea42a78841eecccac669245f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fe7a003200590…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 15 17:41:54 2011 +0100
omd_status: new check for checking status of OMD sites
---
ChangeLog | 11 ++++++-----
agents/check_mk_agent.linux | 6 ++++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0500cb2..9c09c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
* Allow moving hosts from one to another config file
Checks & Agents:
+ * FIX: df: fix layout problems in PNP template
+ * FIX: df: fix trend computation (thanks to Sebastian Talmon)
+ * FIX: df: fix status in case of critical trend and warning used
+ * FIX: df: fix display of trend warn/crit in PNP-graph
+ * FIX: cmctc: fix inventory in case of incomplete entries
* printer_supply: Changed order of tests. When a printer reports -3 this
is used before the check if maxlevel is -2.
* cisco_locif: The check has been removed. Please switch to if/if64
@@ -24,12 +29,8 @@
has not the index 1
* cisco_temp/cisco_temp_perf: scan function handles sensors not beginning
with index 1
- * FIX: df: fix layout problems in PNP template
- * FIX: df: fix trend computation (thanks to Sebastian Talmon)
- * FIX: df: fix status in case of critical trend and warning used
- * FIX: df: fix display of trend warn/crit in PNP-graph
* df: split PNP graphs for growth/trend into two graphs
- * FIX: cmctc: fix inventory in case of incomplete entries
+ * omd_status: new check for checking status of OMD sites
1.1.10:
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 1e4ee6e..83c78ed 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -326,6 +326,12 @@ if which mailq >/dev/null 2>&1 && getent passwd postfix >/dev/null 2>&1; then
mailq | tail -n 6
fi
+# Check status of OMD sites
+if type omd >/dev/null
+then
+ echo '<<<omd_status>>>'
+ omd status --bare --auto
+fi
# Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben
if cd $PLUGINSDIR
Module: check_mk
Branch: master
Commit: bfc9387a2260648e22fe45877fbf611be3d1dcd8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfc9387a226064…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 14 17:43:05 2011 +0100
FIX: cmctc: fix inventory in case of incomplete entries
---
ChangeLog | 1 +
checks/cmctc | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 94a177f..0500cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
* FIX: df: fix status in case of critical trend and warning used
* FIX: df: fix display of trend warn/crit in PNP-graph
* df: split PNP graphs for growth/trend into two graphs
+ * FIX: cmctc: fix inventory in case of incomplete entries
1.1.10:
diff --git a/checks/cmctc b/checks/cmctc
index ed5bb33..d74bc66 100644
--- a/checks/cmctc
+++ b/checks/cmctc
@@ -35,9 +35,7 @@
# 7: description
def inventory_cmctc_temp(checkname, info):
- # return all temperature sensors
- return [ (line[0], line[7], None) \
- for line in info if int(line[1]) == 10 ]
+ return [ (line[0], None) for line in info if saveint(line[1]) == 10 ]
def check_cmctc_temp(item, no_params, info):
for line in info: # , value1, value2 in info:
Module: check_mk
Branch: master
Commit: eb349be4d1ff5bed3a1775f41f499b57137ba357
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb349be4d1ff5b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 14 09:48:39 2011 +0100
FIX: fix syntax error in df-manpages (in examples)
---
.bugs/208 | 10 ++++++++++
.bugs/209 | 9 +++++++++
.bugs/222 | 4 ++++
checkman/df | 2 +-
checkman/df_netapp | 2 +-
checkman/df_netapp32 | 2 +-
6 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/.bugs/208 b/.bugs/208
new file mode 100644
index 0000000..6b31dae
--- /dev/null
+++ b/.bugs/208
@@ -0,0 +1,10 @@
+Title: Describe trends in "Monitoring filesystems"
+Component: doku
+Benefit: 1
+State: open
+Cost: 1
+Date: 2011-03-14 09:33:22
+Class: cleanup
+
+The article about filesystems should contain all information about
+trends. Also hints to the various filesystem checks.
diff --git a/.bugs/209 b/.bugs/209
new file mode 100644
index 0000000..c97b61b
--- /dev/null
+++ b/.bugs/209
@@ -0,0 +1,9 @@
+Title: Man-Pages in HTML format have formatting errors
+Component: doku
+Benefit: 2
+State: open
+Cost: 2
+Date: 2011-03-14 09:38:59
+Class: bug
+
+See the documentation of the df-Check.
diff --git a/.bugs/222 b/.bugs/222
index ed6e751..9b86204 100644
--- a/.bugs/222
+++ b/.bugs/222
@@ -10,3 +10,7 @@ Quicksearch should also do a refresh every 10 Seconds but only retrieve
the start time of the nagios sites. These are always available
in the html.live object. If at least one site as restarted since
the last time, all items (hosts, services) should be loaded new.
+
+The See Also: should link to all check manpages concerning df.include
+checks. Also there should be a table of these checks.
+
diff --git a/checkman/df b/checkman/df
index 93b270b..97b7c0a 100644
--- a/checkman/df
+++ b/checkman/df
@@ -47,7 +47,7 @@ examples:
"trend_range" : 48, # hours
"trend_mb" : (10, 20), # MB of change during trend_range
"trend_perc" : (1, 2), # Percent change during trend_range
- "trend_timeleft" : (72, 48) # run time left in hours until full
+ "trend_timeleft" : (72, 48), # run time left in hours until full
"trend_perfdata" : False # no performance data for trends
}
diff --git a/checkman/df_netapp b/checkman/df_netapp
index ca6cde7..0adff30 100644
--- a/checkman/df_netapp
+++ b/checkman/df_netapp
@@ -44,7 +44,7 @@ examples:
"trend_range" : 48, # hours
"trend_mb" : (10, 20), # MB of change during trend_range
"trend_perc" : (1, 2), # Percent change during trend_range
- "trend_timeleft" : (72, 48) # run time left in hours until full
+ "trend_timeleft" : (72, 48), # run time left in hours until full
"trend_perfdata" : False # no performance data for trends
}
diff --git a/checkman/df_netapp32 b/checkman/df_netapp32
index 374efae..0327e87 100644
--- a/checkman/df_netapp32
+++ b/checkman/df_netapp32
@@ -49,7 +49,7 @@ examples:
"trend_range" : 48, # hours
"trend_mb" : (10, 20), # MB of change during trend_range
"trend_perc" : (1, 2), # Percent change during trend_range
- "trend_timeleft" : (72, 48) # run time left in hours until full
+ "trend_timeleft" : (72, 48), # run time left in hours until full
"trend_perfdata" : False # no performance data for trends
}