Module: check_mk
Branch: master
Commit: 9bd941fc9957b761332203f8830cb957f7d97cf5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd941fc9957b7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jul 20 15:51:48 2012 +0200
vms_cpu: new check for CPU utilization on OpenVMS
---
ChangeLog | 1 +
checkman/vms_cpu | 28 +++++++++++++++
checks/vms_cpu | 66 ++++++++++++++++++++++++++++++++++++
pnp-templates/check_mk-vms_cpu.php | 1 +
web/plugins/perfometer/check_mk.py | 1 +
5 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 413d8c9..896a24e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
* vms_diskstat.df: new check file usage of OpenVMS disks (agent will
come shortly after)
* vms_users: new check for number of interactive sessions on OpenVMS
+ * vms_cpu: new check for CPU utilization on OpenVMS
WATO:
* Added permission to control the "clone host" feature in WATO
diff --git a/checkman/vms_cpu b/checkman/vms_cpu
new file mode 100644
index 0000000..0880cf1
--- /dev/null
+++ b/checkman/vms_cpu
@@ -0,0 +1,28 @@
+title: Check CPU utilization (usage) and IO-Wait
+agents: openvms
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ Check CPU utilization (user, system, idle) and IO-Wait on an
+ OpenVMS system. The number of CPUs is taken into account so that
+ maximum percentage is 100% is refers to the total CPUs available.
+
+ A level can be set only on {wait} (disk wait).
+
+perfdata:
+ Three variables: The percentage of time spent in {user}, {system} and {wait}
+ (disk wait). The idle time can be computed by substracting those three values
+ from 100%. The user value contains also {nice}.
+
+inventory:
+ One check per host is created for OpenVMS systems.
+
+[parameters]
+warning (int): The percentage of {wait} that triggers a warning level.
+critical (int): The percentage of {wait} that triggers a critical level
+ The parameters may also be set to {None}, which makes the check alwas {OK}.
+
+[configuration]
+vms_cpu_default_levels (int, int): Default levels used by inventorized
+ checks. This is present to {None}, which disables the levels.
diff --git a/checks/vms_cpu b/checks/vms_cpu
new file mode 100644
index 0000000..9e2b862
--- /dev/null
+++ b/checks/vms_cpu
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+vms_cpu_default_levels = None
+
+# Example output from agent:
+# <<<vms_cpu>>>
+# 1 99.17 0.54 0.18 0.00
+
+
+def inventory_vms_cpu(info):
+ if len(info) > 0:
+ return [(None, "vms_cpu_default_levels")]
+
+def check_vms_cpu(item, params, info):
+ num_cpus = int(info[0][0])
+ idle, user, wait_interrupt, wait_npsync = map(lambda x: float(x) / num_cpus, info[0][1:])
+ wait = wait_interrupt + wait_npsync
+ system = 100.0 - idle - user - wait
+ infotext = " - user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system, wait)
+ state = 0
+ if params:
+ warn, crit = params
+ if wait >= crit:
+ state = 2
+ infotext += '(!!)'
+ elif wait >= warn:
+ state = 1
+ infotext += '(!)'
+
+ perfdata = [
+ ( "user", user ),
+ ( "system", system ),
+ ( "wait", wait, warn, crit ) ]
+ return (state, nagios_state_names[state] + infotext, perfdata)
+
+check_info['vms_cpu'] = {
+ "check_function" : check_vms_cpu,
+ "inventory_function" : inventory_vms_cpu,
+ "service_description" : "CPU utilization",
+ "has_perfdata" : True,
+ "group" : "cpu_iowait",
+}
diff --git a/pnp-templates/check_mk-vms_cpu.php b/pnp-templates/check_mk-vms_cpu.php
new file mode 120000
index 0000000..16648b1
--- /dev/null
+++ b/pnp-templates/check_mk-vms_cpu.php
@@ -0,0 +1 @@
+check_mk-kernel.util.php
\ No newline at end of file
diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py
index 05dad5b..1faf690 100644
--- a/web/plugins/perfometer/check_mk.py
+++ b/web/plugins/perfometer/check_mk.py
@@ -84,6 +84,7 @@ def perfometer_check_mk_kernel_util(row, check_command, perf_data):
perfometers["check_mk-kernel.util"] = perfometer_check_mk_kernel_util
perfometers["check_mk-vms_sys.util"] = perfometer_check_mk_kernel_util
+perfometers["check_mk-vms_cpu"] = perfometer_check_mk_kernel_util
perfometers["check_mk-ucd_cpu_util"] = perfometer_check_mk_kernel_util
perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util
Module: check_mk
Branch: master
Commit: 271445ad3ba23fe14e570c57e9912fe7a5d79a84
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=271445ad3ba23f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jul 20 15:27:24 2012 +0200
vms_users: new check for number of interactive sessions on OpenVMS
---
ChangeLog | 1 +
checkman/vms_users | 11 +++++++++
checks/vms_users | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ef2d041..413d8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
jmx4perl). You need the new plugin mk_jokokia for using them
* vms_diskstat.df: new check file usage of OpenVMS disks (agent will
come shortly after)
+ * vms_users: new check for number of interactive sessions on OpenVMS
WATO:
* Added permission to control the "clone host" feature in WATO
diff --git a/checkman/vms_users b/checkman/vms_users
new file mode 100644
index 0000000..7af0d4f
--- /dev/null
+++ b/checkman/vms_users
@@ -0,0 +1,11 @@
+title: Monitor interactively logged in users in OpenVMS
+agents: openvms
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is always OK and lists all interactively logged in users
+ with their current number of sessions.
+
+perfdata:
+ One integer value: the total number of interactive sessions.
diff --git a/checks/vms_users b/checks/vms_users
new file mode 100644
index 0000000..ce2ff92
--- /dev/null
+++ b/checks/vms_users
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# Example output from agent:
+# <<<vms_users>>>
+# AEP 2 - - 1
+# SYSTEM 1
+# TCPIP$FTP - - - 1
+
+
+def inventory_vms_users(info):
+ if len(info) > 0:
+ return [(None, {})]
+
+def check_vms_users(item, params, info):
+
+ infos = []
+ num_sessions = 0
+ for line in info:
+ # complete missing columns
+ line += ['-'] * (5-len(line))
+ interactive, subproc, batch, network = map(saveint, line[1:])
+ if interactive:
+ num_sessions += interactive
+ infos.append(("%s: %d" % (line[0], interactive)))
+
+ perfdata = [("sessions", num_sessions)]
+
+ if num_sessions:
+ return (0, "OK - Interactive users: " + ", ".join(infos), perfdata)
+ else:
+ return (0, "OK - No interactive users", perfdata)
+
+
+check_info['vms_users'] = {
+ "check_function" : check_vms_users,
+ "inventory_function" : inventory_vms_users,
+ "service_description" : "VMS Users",
+ "has_perfdata" : True,
+}
Module: check_mk
Branch: master
Commit: 96c0ecb0e2e92e368b0b00f04b25ceb8b5c5b1ad
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96c0ecb0e2e92e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 20 11:46:52 2012 +0200
Added new hook "sites-saved"
---
ChangeLog | 1 +
web/htdocs/wato.py | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3fd76f1..738e1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
(that garbled the logical layout)
* Rules now have an optional comment and can be disabled without
deleting them.
+ * Added new hook "sites-saved"
BI:
* Great speed up of rule compilation in large environments
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3fe4de2..a911887 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6705,6 +6705,9 @@ def save_sites(sites):
rewrite_config_files_below(g_root_folder) # fix site attributes
need_sidebar_reload()
+ # Call the sites saved hook
+ call_hook_sites_saved(sites)
+
# Makes sure, that in distributed mode we monitor only
# the hosts that are directly assigned to our (the local)
# site.
@@ -11180,6 +11183,11 @@ def call_hook_roles_saved(roles):
if hook_registered('roles-saved'):
call_hooks("roles-saved", roles)
+# This hook is executed when the save_sites() function is called
+def call_hook_sites_saved(sites):
+ if hook_registered('sites-saved'):
+ call_hooks("sites-saved", sites)
+
# This hook is called in order to determine if a host has a 'valid'
# configuration. It used for displaying warning symbols in the
# host list and in the host detail view.
Module: check_mk
Branch: master
Commit: 7e0366c2a1a181aacbc99e38344eaff93c043fb4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e0366c2a1a181…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 20 13:14:39 2012 +0200
Implemented new option in WATO attributes: editable
When set to False the attribute can only be changed during creation
of a new object. When editing an object this attribute is only displayed.
---
ChangeLog | 3 +
web/htdocs/wato.py | 120 +++++++++++++++++++++++++++++++--------------------
2 files changed, 76 insertions(+), 47 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 738e1ca..82fbff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@
* Rules now have an optional comment and can be disabled without
deleting them.
* Added new hook "sites-saved"
+ * Implemented new option in WATO attributes: editable
+ When set to False the attribute can only be changed during creation
+ of a new object. When editing an object this attribute is only displayed.
BI:
* Great speed up of rule compilation in large environments
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a911887..f95fc59 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1728,7 +1728,7 @@ def mode_editfolder(phase, new):
parent = g_folder.get(".parent")
myself = g_folder
- configure_attributes({"folder": attributes}, "folder", parent, myself)
+ configure_attributes(new, {"folder": attributes}, "folder", parent, myself)
forms.end()
html.button("save", _("Save & Finish"), "submit")
@@ -1956,7 +1956,7 @@ def mode_edithost(phase, new, cluster):
html.help(_('Enter the host names of the cluster nodes. These '
'hosts must be present in WATO. '))
- configure_attributes({hostname: host}, "host", parent = g_folder)
+ configure_attributes(new, {hostname: host}, "host", parent = g_folder)
forms.end()
html.image_button("services", _("Save & go to Services"), "submit")
@@ -2212,7 +2212,7 @@ def mode_search(phase):
html.set_focus("host")
# Attributes
- configure_attributes({}, "search", parent = None)
+ configure_attributes(False, {}, "search", parent = None)
# Button
forms.end()
@@ -2613,7 +2613,7 @@ def mode_bulk_edit(phase):
"will keep their individual settings.") + "</p>")
html.begin_form("edithost", None, "POST")
- configure_attributes(hosts, "bulk", parent = g_folder)
+ configure_attributes(False, hosts, "bulk", parent = g_folder)
forms.end()
html.button("_save", _("Save & Finish"))
html.hidden_fields()
@@ -4100,6 +4100,11 @@ class Attribute:
def show_in_folder(self):
return self._show_in_folder
+ # Wether or not this attribute can be edited after creation
+ # of the object
+ def editable(self):
+ return self._editable
+
# Wether it is allowed that a host has no explicit
# value here (inherited or direct value). An mandatory
# has *no* default value.
@@ -4138,7 +4143,7 @@ class Attribute:
# Check whether this attribute needs to be validated at all
# Attributes might be permanently hidden (show_in_form = False)
- # or dynamically hidden by the depends_on_tags feature
+ # or dynamically hidden by the depends_on_tags, editable features
def needs_validation(self):
if not self._show_in_form:
return False
@@ -4551,14 +4556,15 @@ host_attribute = {}
# Declare attributes with this method
def declare_host_attribute(a, show_in_table = True, show_in_folder = True,
- topic = None, show_in_form = True, depends_on_tags = [],depends_on_roles = []):
+ topic = None, show_in_form = True, depends_on_tags = [], depends_on_roles = [], editable = True):
host_attributes.append((a, topic))
host_attribute[a.name()] = a
- a._show_in_table = show_in_table
- a._show_in_folder = show_in_folder
- a._show_in_form = show_in_form
- a._depends_on_tags = depends_on_tags
+ a._show_in_table = show_in_table
+ a._show_in_folder = show_in_folder
+ a._show_in_form = show_in_form
+ a._depends_on_tags = depends_on_tags
a._depends_on_roles = depends_on_roles
+ a._editable = editable
def undeclare_host_attribute(attrname):
@@ -4589,15 +4595,18 @@ def have_folder_attributes():
return True
return False
-# Show HTML form for editing attributes. for_what can be:
-# "host" -> normal host edit dialog
-# "folder" -> properies of folder or file
-# "search" -> search dialog
-# "bulk" -> bulk change
+# Show HTML form for editing attributes.
+#
+# new: Boolean flag if this is a creation step or editing
+# for_what can be:
+# "host" -> normal host edit dialog
+# "folder" -> properies of folder or file
+# "search" -> search dialog
+# "bulk" -> bulk change
# parent: The parent folder of the objects to configure
# myself: For mode "folder" the folder itself or None, if we edit a new folder
# This is needed for handling mandatory attributes.
-def configure_attributes(hosts, for_what, parent, myself=None, without_attributes = []):
+def configure_attributes(new, hosts, for_what, parent, myself=None, without_attributes = []):
# show attributes grouped by topics, in order of their
# appearance. If only one topic exists, do not show topics
# Make sure, that the topics "Basic settings" and host tags
@@ -4741,6 +4750,8 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute
and not has_inherited:
force_entry = True
active = True
+ elif not new and not attr.editable():
+ force_entry = True
elif for_what == "host" and attr.is_mandatory() and not has_inherited:
force_entry = True
active = True
@@ -4765,48 +4776,63 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute
forms.section(attr.title(), checkbox=checkbox_code, id="attr_" + attrname)
html.help(attr.help())
- # Now comes the input fields and the inherited / default values
- # as two DIV elements, one of which is visible at one time.
- # html.write('<td class=content>')
-
- # DIV with the input elements
- html.write('<div id="attr_entry_%s" style="%s">'
- % (attrname, (not active) and "display: none" or ""))
if len(values) == 1:
defvalue = values[0]
else:
defvalue = attr.default_value()
- attr.render_input(defvalue)
- html.write("</div>")
+ if not new and not attr.editable():
+ # In edit mode only display non editable values, don't show the
+ # input fields
+ html.write('<div id="attr_hidden_%s" style="display:none">')
+ attr.render_input(defvalue)
+ html.write('</div>')
+
+ tdclass, content = attr.paint(defvalue, "")
+ if not content:
+ content = _("empty")
+ html.write(content)
+
+ else:
+ # Regular rendering
- # DIV with actual / inherited / default value
- html.write('<div class="inherited" id="attr_default_%s" style="%s">'
- % (attrname, active and "display: none" or ""))
+ # Now comes the input fields and the inherited / default values
+ # as two DIV elements, one of which is visible at one time.
- # in bulk mode we show inheritance only if *all* hosts inherit
- explanation = ""
- if for_what == "bulk":
- if num_haveit == 0:
+ # DIV with the input elements
+ html.write('<div id="attr_entry_%s" style="%s">'
+ % (attrname, (not active) and "display: none" or ""))
+
+ attr.render_input(defvalue)
+ html.write("</div>")
+
+ # DIV with actual / inherited / default value
+ html.write('<div class="inherited" id="attr_default_%s" style="%s">'
+ % (attrname, active and "display: none" or ""))
+
+ # in bulk mode we show inheritance only if *all* hosts inherit
+ explanation = ""
+ if for_what == "bulk":
+ if num_haveit == 0:
+ explanation = " (" + inherited_from + ")"
+ value = inherited_value
+ elif not unique:
+ explanation = _("This value differs between the selected hosts.")
+ else:
+ value = values[0]
+
+ elif for_what in [ "host", "folder" ]:
explanation = " (" + inherited_from + ")"
value = inherited_value
- elif not unique:
- explanation = _("This value differs between the selected hosts.")
- else:
- value = values[0]
- elif for_what in [ "host", "folder" ]:
- explanation = " (" + inherited_from + ")"
- value = inherited_value
+ if for_what != "search" and not (for_what == "bulk" and not unique):
+ tdclass, content = attr.paint(value, "")
+ if not content:
+ content = _("empty")
+ html.write("<b>" + content + "</b>")
- if for_what != "search" and not (for_what == "bulk" and not unique):
- tdclass, content = attr.paint(value, "")
- if not content:
- content = _("empty")
- html.write("<b>" + content + "</b>")
-
- html.write(explanation)
- html.write("</div>")
+ html.write(explanation)
+ html.write("</div>")
if len(topics) > 1:
Module: check_mk
Branch: master
Commit: 75eb2597e9960138610a5937830eae973957328f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75eb2597e99601…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jul 20 10:38:55 2012 +0200
jolokia_info, jolokia_metrics: new rewritten checks for jolokia
---
ChangeLog | 2 ++
.../j4p_new => agents}/plugins/mk_jolokia | 0
.../j4p_new/checks => checks}/jolokia_info | 0
.../j4p_new/checks => checks}/jolokia_metrics | 0
4 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b5db83b..0b8928d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
* New Checks for Siemens Blades (BX600)
* FIX: megaraid_pdisks: handle case where no enclosure device exists
* mysql_capacity: cleaned up check, levels are in MB now
+ * jolokia_info, jolokia_metrics: new rewritten checks for jolokia (formerly
+ jmx4perl). You need the new plugin mk_jokokia for using them
WATO:
* Added permission to control the "clone host" feature in WATO
diff --git a/doc/treasures/j4p_new/plugins/mk_jolokia b/agents/plugins/mk_jolokia
similarity index 100%
rename from doc/treasures/j4p_new/plugins/mk_jolokia
rename to agents/plugins/mk_jolokia
diff --git a/doc/treasures/j4p_new/checks/jolokia_info b/checks/jolokia_info
similarity index 100%
rename from doc/treasures/j4p_new/checks/jolokia_info
rename to checks/jolokia_info
diff --git a/doc/treasures/j4p_new/checks/jolokia_metrics b/checks/jolokia_metrics
similarity index 100%
rename from doc/treasures/j4p_new/checks/jolokia_metrics
rename to checks/jolokia_metrics