Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: Added missing file headers

by Lars Michelsen

Module: check_mk Branch: master Commit: f49137e7a7264796fd1da6635da801b89333dbdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f49137e7a72647… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 4 15:09:57 2014 +0100 Added missing file headers --- doc/treasures/active_checks/check_bi_aggr | 24 +++++++++++++++++++++++ doc/treasures/active_checks/check_notify_count | 23 ++++++++++++++++++++++ doc/treasures/active_checks/check_uniserv | 25 ++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index 291a77e..668b961 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -1,4 +1,28 @@ #!/usr/bin/python +# encoding: utf-8 +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. import sys, getopt, urllib2, traceback diff --git a/doc/treasures/active_checks/check_notify_count b/doc/treasures/active_checks/check_notify_count index 40ed48e..423b2a0 100755 --- a/doc/treasures/active_checks/check_notify_count +++ b/doc/treasures/active_checks/check_notify_count @@ -1,5 +1,28 @@ #!/usr/bin/python # encoding: utf-8 +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. import sys, getopt, time, os, socket diff --git a/doc/treasures/active_checks/check_uniserv b/doc/treasures/active_checks/check_uniserv index fd3e867..56507fa 100755 --- a/doc/treasures/active_checks/check_uniserv +++ b/doc/treasures/active_checks/check_uniserv @@ -1,4 +1,29 @@ #!/usr/bin/python +# encoding: utf-8 +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + import socket, sys BUFFER_SIZE = 1024 try:

9 years, 7 months

Check_MK Git: check_mk: docsis_cm_status: Added perfometer

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3ce695e4ff218b58a092f66b7755e52092222d81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ce695e4ff218b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 4 13:29:16 2014 +0100 docsis_cm_status: Added perfometer --- web/plugins/perfometer/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 689f9c2..19920aa 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1169,6 +1169,7 @@ def perfometer_dbmv(row, check_command, perf_data): return "%.1f dBmV" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#da6") perfometers["check_mk-docsis_channels_downstream"] = perfometer_dbmv +perfometers["check_mk-docsis_cm_status"] = perfometer_dbmv def perfometer_docsis_snr(row, check_command, perf_data): dbmv = float(perf_data[0][1])

9 years, 7 months

Check_MK Git: check_mk: #1202 FIX cisco_power, cisco_temp_perf: Both checks now using a new service description

by Bastian Kuhn

Module: check_mk Branch: master Commit: 870ab6aa45864c4b106e666f791c70aff8af7c89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870ab6aa45864c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 4 12:05:18 2014 +0100 #1202 FIX cisco_power, cisco_temp_perf: Both checks now using a new service description Both checks are supported by a wide range of cisco devices. Unfortunately the behavior of the devices is not always the same. That means this devices not always return the same information via snamp. Cause of this problems, it was necessary to change the information what was used as item for the service description. After updating the Service description changes and a reinventory is needed. --- .werks/1202 | 15 +++++++++++++++ ChangeLog | 2 ++ checks/cisco_power | 30 ++++++++++++------------------ checks/cisco_temp_perf | 16 +++------------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.werks/1202 b/.werks/1202 new file mode 100644 index 0000000..4264dc2 --- /dev/null +++ b/.werks/1202 @@ -0,0 +1,15 @@ +Title: cisco_power, cisco_temp_perf: Both checks now using a new service description +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i7 +Date: 1415098852 +Class: fix + +Both checks are supported by a wide range of cisco devices. Unfortunately the behavior of the devices is +not always the same. That means this devices not always return the same information via snamp. + +Cause of this problems, it was necessary to change the information what was used as item for the service description. + +After updating the Service description changes and a reinventory is needed. + diff --git a/ChangeLog b/ChangeLog index c8b2b6f..5b2aa18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... + * 1202 FIX: cisco_power, cisco_temp_perf: Both checks now using a new service description... + NOTE: Please refer to the migration notes! Multisite: * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups diff --git a/checks/cisco_power b/checks/cisco_power index a2cccf8..de8280b 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -38,25 +38,19 @@ cisco_power_source = ( '', 'unknown', 'ac', 'dc', 'externalPowerSupply', 'intern def inventory_cisco_power(info): for line in info: # 5 in line[1] means cisco_power_states = notPresent - if 'RPS NotExist' not in line[0] and line[1] != '5': - # The field used here (ciscoEnvMonSupplyStatusDescr) can also - # contain a textual description of the current status. - # This tryes to remove that information - try: - item = line[0].split(',')[0] - except: - item = line[0] - yield item, None + if 'RPS NotExist' not in line[1] and line[2] != '5': + # There are many types of cisco devices supported by this check + # but they all have difrent behaviors. So we have to use OID_END as + # item to find a way to match them all. + yield line[0], None def check_cisco_power(item, no_params, info): - for line in info: - try: - convert_item = line[0].split(',')[0] - except: - convert_item = line[0] - if convert_item == item: - state, source = map(saveint, line[1:3]) - output = 'State: %s, Source: %s' % (cisco_power_states[state], cisco_power_source[source]) + for sid, textinfo, state, source in info: + state = int(state) + source = int(source) + if sid == item: + output = '%s, State: %s, Source: %s' % \ + (textinfo, cisco_power_states[state], cisco_power_source[source]) if state == 1: return 0, "%s" % output elif state == 2: @@ -70,7 +64,7 @@ check_info["cisco_power"] = { 'check_function': check_cisco_power, 'inventory_function': inventory_cisco_power, 'service_description': 'Power %s', - 'snmp_info': ('.1.3.6.1.4.1.9.9.13.1.5.1', [2, 3, 4]), + 'snmp_info': ('.1.3.6.1.4.1.9.9.13.1.5.1', [OID_END, 2, 3, 4]), 'snmp_scan_function': \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), } diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 5a0ede5..fa619bb 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -58,26 +58,16 @@ cisco_temp_perf_envmon_states = { def inventory_cisco_temp_perf(info): inventory = [] for line in info: - try: - name = line[0].split(',')[0] - except: - name = line[0] - if name == "": - name = line[4] - inventory.append((name, None)) + inventory.append((line[4], None)) return inventory def check_cisco_temp_perf(item, _no_params, info): for line in info: - try: - name = line[0].split(',')[0] - except: - name = line[0] - if name == item or line[4] == item: + if line[4] == item: temp = saveint(line[1]) if temp != 0: perfdata = [("temp", temp, None, saveint(line[2]) )] - temptext = ", %d degrees (critical at %d)" % (temp, saveint(line[2])) + temptext = ", %d degrees (%s) (critical at %d)" % (temp, line[0], saveint(line[2])) else: perfdata = [] temptext = ""

9 years, 7 months

Check_MK Git: check_mk: #1201 allnet_ip_sensoric: Detect Temperature Sensors now in more cases

by Bastian Kuhn

Module: check_mk Branch: master Commit: a17cc18d28164557d042421671db35b11501a7c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17cc18d281645… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 4 11:33:06 2014 +0100 #1201 allnet_ip_sensoric: Detect Temperature Sensors now in more cases It's possible that the field function is missing in the Output of the allnet device, so check_mk uses in this case now the field unit to find temperature sensors. --- .werks/1201 | 10 ++++++++++ ChangeLog | 1 + checks/allnet_ip_sensoric | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/1201 b/.werks/1201 new file mode 100644 index 0000000..231381f --- /dev/null +++ b/.werks/1201 @@ -0,0 +1,10 @@ +Title: allnet_ip_sensoric: Detect Temperature Sensors now in more cases +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1415097074 +Class: feature + +It's possible that the field function is missing in the Output of the allnet device, so check_mk uses in this case now the field unit to find temperature sensors. + diff --git a/ChangeLog b/ChangeLog index 2cc0605..c8b2b6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ NOTE: Please refer to the migration notes! * 1200 Docsis Checks: Now HW Rev2 of Arris Cable Modems are detected. * 1486 mk_oracle: completely overhauled ORACLE monitoring... + * 1201 allnet_ip_sensoric: Detect Temperature Sensors now in more cases... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/allnet_ip_sensoric b/checks/allnet_ip_sensoric index c931794..06a6d1a 100644 --- a/checks/allnet_ip_sensoric +++ b/checks/allnet_ip_sensoric @@ -96,9 +96,10 @@ def allnet_ip_sensoric_parse(info): for key, value in info: match = re.search('(\w+)\.(\w+)', key) if match: - if match.group(1) not in parsed.keys(): - parsed[match.group(1)] = {} - parsed[match.group(1)][match.group(2)] = value + sensor = match.group(1) + field = match.group(2) + parsed.setdefault(sensor, {}) + parsed[sensor][field] = value return parsed @@ -169,7 +170,8 @@ def inventory_allnet_ip_sensoric_temp(info): parsed = allnet_ip_sensoric_parse(info) inventory = [] for sensor in parsed.keys(): - if "function" in parsed[sensor].keys() and parsed[sensor]["function"] == "1": + if (parsed[sensor].get('function') and parsed[sensor]["function"] == "1") \ + or (parsed[sensor].get('unit') and parsed[sensor]['unit'] == '°C'): item = allnet_ip_sensoric_compose_item(sensor, parsed[sensor]) inventory.append( (item, "allnet_ip_sensoric_temp_default_levels") ) return inventory

9 years, 7 months

Check_MK Git: check_mk: #1486 mk_oracle: completely overhauled ORACLE monitoring

by Mathias Kettner

Module: check_mk Branch: master Commit: e3cacef345e0053f4c0bf35cad82f6566d29df4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3cacef345e005… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 4 10:31:49 2014 +0100 #1486 mk_oracle: completely overhauled ORACLE monitoring Check_MK now comes with a completely overhauled ORACLE monitoring. The new agent plugins <tt>mk_oracle</tt> and <tt>mk_oracle.aix</tt> are ready for use. The previous version of the Linux agent plugin has moved to <tt>doc/treasures/mk_oracle.old</tt>. Note: You do not need to update your already deployed plugins to the new version immediately. The check plugins are compatible with the output of both the old and the new agent. The new agent has several advantages: <ul> <li>It comes with many additional checks.</li> <li>It now correctly supports all ORACLE versions starting from 9.2.</li> <li>It supports authentication via the ORACLE password wallet.</li> <li>It is much faster: it only needs two logins into each database - one of which is being done only every 10 minutes.</li> </ul> We are preparing an update of the documentation as well. --- .werks/1486 | 28 + ChangeLog | 1 + agents/plugins/mk_oracle | 1020 +++++++++++++++++--- .../plugins/{mk_oracle.new.aix => mk_oracle.aix} | 0 agents/plugins/mk_oracle.new | 971 ------------------- doc/treasures/mk_oracle.old | 223 +++++ 6 files changed, 1136 insertions(+), 1107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3cacef345…

9 years, 7 months

Check_MK Git: check_mk: New option forbidden_characters for TextAscii

by Mathias Kettner

Module: check_mk Branch: master Commit: e2739210157b94e8ac93311d976050f42fa1c030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2739210157b94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 4 10:25:28 2014 +0100 New option forbidden_characters for TextAscii --- web/htdocs/valuespec.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4c71444..dc72c4d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -349,12 +349,12 @@ class TextAscii(ValueSpec): self._empty_text = kwargs.get("empty_text", "") self._read_only = kwargs.get("read_only") self._none_is_empty = kwargs.get("none_is_empty", False) + self._forbidden_chars = kwargs.get("forbidden_chars", "") self._regex = kwargs.get("regex") self._regex_error = kwargs.get("regex_error", _("Your input does not match the required format.")) if type(self._regex) == str: self._regex = re.compile(self._regex) - self._prefix_buttons = kwargs.get("prefix_buttons", []) def canonical_value(self): @@ -419,6 +419,10 @@ class TextAscii(ValueSpec): unicode(value) except: raise MKUserError(varprefix, _("Non-ASCII characters are not allowed here.")) + if self._forbidden_chars: + for c in self._forbidden_chars: + if c in value: + raise MKUserError(varprefix, _("The character <tt>%s</tt> is not allowed here.") % c) if self._none_is_empty and value == "": raise MKUserError(varprefix, _("An empty value must be represented with None here.")) if not self._allow_empty and value.strip() == "":

9 years, 7 months

Check_MK Git: check_mk: renamed zOS to z_os, in order to keep to convention

by Mathias Kettner

Module: check_mk Branch: master Commit: 4264523a923a0e63d8cec5edadfb491b1f4d6b46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4264523a923a0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 4 10:33:25 2014 +0100 renamed zOS to z_os, in order to keep to convention --- agents/{zOS => z_os}/waitmax | Bin 90112 -> 90112 bytes agents/{zOS => z_os}/waitmax.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/zOS/waitmax b/agents/z_os/waitmax similarity index 100% rename from agents/zOS/waitmax rename to agents/z_os/waitmax diff --git a/agents/zOS/waitmax.c b/agents/z_os/waitmax.c similarity index 100% rename from agents/zOS/waitmax.c rename to agents/z_os/waitmax.c

9 years, 7 months

Check_MK Git: check_mk: #1200 Docsis Checks: Now HW Rev2 of Arris Cable Modems are detected.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6334f0f75e1a06ee030d89694a96f80881cc9ae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6334f0f75e1a06… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 4 10:16:29 2014 +0100 #1200 Docsis Checks: Now HW Rev2 of Arris Cable Modems are detected. --- .werks/1200 | 9 +++++++++ ChangeLog | 1 + checks/docsis.include | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/1200 b/.werks/1200 new file mode 100644 index 0000000..7ed9284 --- /dev/null +++ b/.werks/1200 @@ -0,0 +1,9 @@ +Title: Docsis Checks: Now HW Rev2 of Arris Cable Modems are detected. +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1415092544 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6ca13d8..285ce90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 1199 climaveneta_alarm: New check to display the alarm states on Climaveneta devcies * 1484 dell_om_sensors: Use sensor name as item... NOTE: Please refer to the migration notes! + * 1200 Docsis Checks: Now HW Rev2 of Arris Cable Modems are detected. * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/docsis.include b/checks/docsis.include index ab6e3a4..95f92bb 100644 --- a/checks/docsis.include +++ b/checks/docsis.include @@ -28,6 +28,7 @@ # Scan Function for DOCSIS Devices who supports the general information def docsis_scan_function(oid): if oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", # ARRIS Touchstone WideBand Cable Modem + ".1.3.6.1.4.1.4115.900.2.0.0.0.0.0", # ARRIS Touchstone Cable Modem HW REV:2 ".1.3.6.1.4.1.9.1.827", # Cisco CMTS UBR 7200 ".1.3.6.1.4.1.4998.2.1", # ARRIS CMTS C4 ]: @@ -37,5 +38,6 @@ def docsis_scan_function(oid): # docsIfCmStatusTable 1.3.6.1.2.1.10.127.1.2.2 def docsis_scan_function_cable_modem(oid): if oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", # ARRIS Touchstone WideBand Cable Modem + ".1.3.6.1.4.1.4115.900.2.0.0.0.0.0", # ARRIS Touchstone Cable Modem HW REV:2 ]: return True

9 years, 7 months

Check_MK Git: check_mk: Added waitmax for z/ OS. Thanks to Dirk Schwartzkopff

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3196fa0de29d06c5cdf7d32fe2ca888618b42180 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3196fa0de29d06… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 4 10:08:27 2014 +0100 Added waitmax for z/OS. Thanks to Dirk Schwartzkopff --- agents/zOS/waitmax | Bin 0 -> 90112 bytes agents/zOS/waitmax.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/agents/zOS/waitmax b/agents/zOS/waitmax new file mode 100644 index 0000000..3c8c92c Binary files /dev/null and b/agents/zOS/waitmax differ diff --git a/agents/zOS/waitmax.c b/agents/zOS/waitmax.c new file mode 100644 index 0000000..a583903 --- /dev/null +++ b/agents/zOS/waitmax.c @@ -0,0 +1,182 @@ +/* +------------------------------------------------------------------+ */ +/* | ____ _ _ __ __ _ __ | */ +/* | / ___| |__ ___ ___| | __ | \/ | |/ / | */ +/* | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | */ +/* | | |___| | | | __/ (__| < | | | | . \ | */ +/* | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | */ +/* | | */ +/* | Copyright Mathias Kettner 2013 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. */ + +#include <stdio.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/errno.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <signal.h> +/*#include <getopt.h>*/ +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* macros for using write(2) instead of fprintf(stderr, ) */ +#define out(text) write(2, text, strlen(text)); + +int g_pid; +int g_timeout = 0; +int g_signum = 15; + +struct option long_options[] = { + { "version" , no_argument, 0, 'V' }, + { "help" , no_argument, 0, 'h' }, + { "signal" , required_argument, 0, 's' }, + { 0, 0, 0, 0 } }; + +void version() +{ + out("waitmax version 1.1z\n" + "Copyright Mathias Kettner 2008\n" + "This is free software; see the source for copying conditions. There is NO\n" + "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + exit(0); +} + + +void usage() +{ + out("Usage: waitmax [-s SIGNUM] MAXTIME PROGRAM [ARGS...]\n" + "\n" + "Execute PROGRAM as a subprocess. If PROGRAM does not exit before MAXTIME\n" + "seconds, it will be killed with SIGTERM or an alternative signal.\n" + "\n" +/* + " -s, --signal SIGNUM kill with SIGNUM on timeout\n" + " -h, --help this help\n" + " -V, --version show version an exit\n\n"); +*/ + " -s kill with SIGNUM on timeout\n" + " -h this help\n" + " -V show version an exit\n\n"); + exit(1); +} + + +void signalhandler(int signum) +{ + if (0 == kill(g_pid, g_signum)) + g_timeout = 1; +} + + +int main(int argc, char **argv) +{ + int indexptr=0; + int ret; + int maxtime; + int status; + int pid; + int exitcode; + int signum; + setenv("POSIXLY_CORRECT", "true", 0); +/* + while (0 <= (ret = getopt_long(argc, argv, "Vhs:", long_options, &indexptr))) { +*/ + while (0 <= (ret = getopt(argc, argv, "Vhs:", long_options, &indexptr))) { + switch (ret) + { + case 'V': + version(); + + case 'h': + usage(); + + case 's': + g_signum = strtoul(optarg, 0, 10); + if (g_signum < 1 || g_signum > 32) { + out("Signalnumber must be between 1 and 32.\n"); + exit(1); + } + break; + + default: + usage(argv[0]); + exit(1); + break; + } + } + + if (optind + 1 >= argc) usage(); + + maxtime = atoi(argv[optind]); + if (maxtime <= 0) usage(); + + g_pid = fork(); + if (g_pid == 0) { + signal(SIGALRM, signalhandler); + execvp(argv[optind + 1], argv + optind + 1); + out("Cannot execute "); + out(argv[optind + 1]); + out(": "); + out(strerror(errno)); + out("\n"); + exit(253); + } + + signal(SIGALRM, signalhandler); + alarm(maxtime); + while (1) { + pid = waitpid(g_pid, &status, 0); + if (pid <= 0) { + if (errno == EINTR) continue; /* interupted by alarm */ + else + out("Strange: waitpid() fails: "); + out(strerror(errno)); + out("\n"); + exit(1); + } + else break; + } + + if (WIFEXITED(status)) { + exitcode = WEXITSTATUS(status); + return exitcode; + } + else if (WIFSIGNALED(status)) { + signum = WTERMSIG(status); + if (g_timeout) + return 255; + else + return 128 + signum; + } + else { + out("Strange: program did neither exit nor was signalled.\n"); + return 254; + } +}

9 years, 7 months

Check_MK Git: check_mk: #1170 Added buttons to move rules to top/ bottom of the list to ruleset edit dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: bf5a5144d0ddf0cba86e53bb8f2d0c6d9d4b1f24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf5a5144d0ddf0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 4 09:08:43 2014 +0100 #1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog --- .werks/1170 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 +++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/1170 b/.werks/1170 new file mode 100644 index 0000000..eaca018 --- /dev/null +++ b/.werks/1170 @@ -0,0 +1,9 @@ +Title: Added buttons to move rules to top/bottom of the list to ruleset edit dialog +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1415088495 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b11f4cf..6ca13d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 1482 FIX: Fix exception when editing a visual of type single host group... WATO: + * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... Notifications: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 38f809e..ede84b6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13688,8 +13688,12 @@ def mode_edit_ruleset(phase): del rules[rulenr] if action == "up": rules[rulenr-1:rulenr-1] = [ rule ] - else: + elif action == "down": rules[rulenr+1:rulenr+1] = [ rule ] + elif action == "top": + rules.insert(0, rule) + else: + rules.append(rule) save_rulesets(rule_folder, rulesets) mark_affected_sites_dirty(rule_folder) log_pending(AFFECTED, None, "edit-ruleset", @@ -13810,13 +13814,17 @@ def mode_edit_ruleset(phase): # Actions table.cell(_("Order"), css="buttons rulebuttons") if not first_in_group: - rule_button("up", _("Move this rule one position up"), folder, rel_rulenr) + rule_button("top", _("Move this rule to the top of the list"), folder, rel_rulenr) + rule_button("up", _("Move this rule one position up"), folder, rel_rulenr) else: rule_button(None) + rule_button(None) if not last_in_group: - rule_button("down", _("Move this rule one position down"), folder, rel_rulenr) + rule_button("down", _("Move this rule one position down"), folder, rel_rulenr) + rule_button("bottom", _("Move this rule to the bottom of the list"), folder, rel_rulenr) else: rule_button(None) + rule_button(None) table.cell(_("Actions"), css="buttons rulebuttons") edit_url = make_link([

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014