Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: Cleanup environment from previous notificattons

by Mathias Kettner

Module: check_mk Branch: master Commit: 6afa726e068e12377c2260e24b461fbd5f1063ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6afa726e068e12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 22:46:41 2013 +0200 Cleanup environment from previous notificattons --- ChangeLog | 1 + modules/notify.py | 56 +++++++++++++++++++++++++++------------------------- notifications/.f12 | 2 ++ web/htdocs/wato.py | 21 ++++++++++---------- 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a08708..e3c0c50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i3: Core: * FIX: fixed typo in core startup message "logging initial states" + * FIX: cleanup environment from notifications (needed for CMC) Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB diff --git a/modules/notify.py b/modules/notify.py index ab788a3..253326a 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -665,7 +665,8 @@ def notify_flexible(context, notification_table, write_into_spoolfile): def call_notification_script(plugin, parameters, context, write_into_spoolfile): - # Prepare environment + + # Enter context into environment os.putenv("NOTIFY_PARAMETERS", " ".join(parameters)) for nr, value in enumerate(parameters): os.putenv("NOTIFY_PARAMETER_%d" % (nr + 1), value) @@ -674,19 +675,8 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): # Export complete context to have all vars in environment. # Existing vars are replaced, some already existing might remain for key in context: - os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) - - # Remove service macros for host notifications - if context['WHAT'] == 'HOST': - for key in context.keys(): - if 'SERVICE' in key: - os.unsetenv('NOTIFY_%s' % key) - - # Remove exceeding arguments from previous plugin calls - for nr in range(len(parameters)+1, 101): - name = "NOTIFY_PARAMETER_%d" % nr - if name in os.environ: - os.putenv(name, "") + if context['WHAT'] == 'SERVICE' or 'SERVICE' not in key: + os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) # Call actual script without any arguments if local_notifications_dir: @@ -701,21 +691,33 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): notify_log(" not in %s" % notifications_dir) if local_notifications_dir: notify_log(" and not in %s" % local_notifications_dir) - return 2 + exitcode = 2 - # Create spoolfile or actually call the plugin - if write_into_spoolfile: - create_spoolfile({"context": context, "plugin": plugin}) else: - notify_log("Executing %s" % path) - out = os.popen(path + " 2>&1 </dev/null") - for line in out: - notify_log("Output: %s" % line.rstrip()) - exitcode = out.close() - if exitcode: - notify_log("Plugin exited with code %d" % (exitcode >> 8)) - return exitcode - return 0 + # Create spoolfile or actually call the plugin + if write_into_spoolfile: + create_spoolfile({"context": context, "plugin": plugin}) + exitcode = 0 + else: + notify_log("Executing %s" % path) + out = os.popen(path + " 2>&1 </dev/null") + for line in out: + notify_log("Output: %s" % line.rstrip()) + exitcode = out.close() + if exitcode: + notify_log("Plugin exited with code %d" % (exitcode >> 8)) + else: + exitcode = 0 + + # Clear environment again + for key in context: + if context['WHAT'] == 'SERVICE' or 'SERVICE' not in key: + os.unsetenv('NOTIFY_' + key) + os.unsetenv("NOTIFY_PARAMETERS") + for nr, value in enumerate(parameters): + os.unsetenv("NOTIFY_PARAMETER_%d" % (nr + 1)) + os.unsetenv("NOTIFY_LOGDIR") + return exitcode def check_notification_type(context, host_events, service_events): diff --git a/notifications/.f12 b/notifications/.f12 index a53fe50..2b4aab5 100644 --- a/notifications/.f12 +++ b/notifications/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo mkdir -p /omd/sites/$SITE/share/check_mk/notifications sudo cp -vp * /omd/sites/$SITE/share/check_mk/notifications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e7fad09..9db9b9e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8033,8 +8033,17 @@ def load_notification_table(): DropdownChoice( title = _("Notification Plugin"), choices = load_notification_scripts, + default_value = "mail", ), ), + ( "parameters", + ListOfStrings( + title = _("Plugin Arguments"), + help = _("You can specify arguments to the notification plugin here. " + "Please refer to the documentation about the plugin for what " + "parameters are allowed or required here."), + ) + ), ( "disabled", Checkbox( title = _("Disabled"), @@ -8093,7 +8102,7 @@ def load_notification_table(): ( 's', _("Start or end of a scheduled downtime ")), ( 'x', _("Acknowledgement of host problem")), ], - default_value = [ 'd', 'u' ], + default_value = [ 'd', 'u', 'r', 'f', 's', 'x' ], ) ), ( "service_events", @@ -8108,7 +8117,7 @@ def load_notification_table(): ( 's', _("Start or end of a scheduled downtime")), ( 'x', _("Acknowledgement of service problem")), ], - default_value = [ 'w', 'c', 'u' ], + default_value = [ 'w', 'c', 'u', 'r', 'f', 's', 'x' ], ) ), ( "only_hosts", @@ -8129,14 +8138,6 @@ def load_notification_table(): validate = validate_only_services, ), ), - ( "parameters", - ListOfStrings( - title = _("Plugin Arguments"), - help = _("You can specify arguments to the notification plugin here. " - "Please refer to the documentation about the plugin for what " - "parameters are allowed or required here."), - ) - ), ] ), title_function = lambda v: _("Notify by: ") + notification_script_title(v["plugin"]),

11 years

Check_MK Git: check_mk: notify by mail: remove debug message

by Mathias Kettner

Module: check_mk Branch: master Commit: 10f2b14002ede7f576208ac21207b906d1e6ebaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10f2b14002ede7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 21:57:05 2013 +0200 notify by mail: remove debug message --- notifications/mail | 2 -- 1 file changed, 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index 2891280..b4e2589 100755 --- a/notifications/mail +++ b/notifications/mail @@ -365,8 +365,6 @@ def main(): in os.environ.items() if var.startswith("NOTIFY_")]) - print repr(context) - # Fetch graphs for this object. It first tries to detect how many sources # are available for this object. Then it loops through all sources and # fetches retrieves the images. If a problem occurs, it is printed to

11 years

Check_MK Git: check_mk: check manpages: unified formating

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 62fd44c18e16822b6f8960e5a2dc583be5c17b7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62fd44c18e1682… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 18:17:36 2013 +0200 check manpages: unified formating --- checkman/emerson_temp | 4 ++-- checkman/liebert_bat_temp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/emerson_temp b/checkman/emerson_temp index 06fdc7f..fbdb27e 100644 --- a/checkman/emerson_temp +++ b/checkman/emerson_temp @@ -23,9 +23,9 @@ inventory: [parameters] parameters (tuple): A pair of numbers for warning and critical level - warning (int): The temperature that triggers an WARNING state + warning (int): The temperature that triggers an {WARN} state - critical (int): The temperature that triggers an CRITICAL state + critical (int): The temperature that triggers an {CRIT} state [configuration] emerson_temp_default (tuple): Default warning and critical level diff --git a/checkman/liebert_bat_temp b/checkman/liebert_bat_temp index 2680c2f..b9868d0 100644 --- a/checkman/liebert_bat_temp +++ b/checkman/liebert_bat_temp @@ -17,9 +17,9 @@ inventory: [parameters] parameters (tuple): A pair of numbers for warning and critical level - warning (int): The temperature that triggers an WARNING state + warning (int): The temperature that triggers an {WARN} state - critical (int): The temperature that triggers an CRITICAL state + critical (int): The temperature that triggers an {CRIT} state [configuration] liebert_bat_temp_default (tuple): Default warning and critical level

11 years

Check_MK Git: check_mk: livestatus: TIMEPERIOD_TRANSITION logentry no longer fills incorrect fields

by Andreas Boesl

Module: check_mk Branch: master Commit: e02bbd76d04798740c476bfc6e000fd6af147b36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e02bbd76d04798… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 1 17:31:38 2013 +0200 livestatus: TIMEPERIOD_TRANSITION logentry no longer fills incorrect fields --- livestatus/src/LogEntry.cc | 7 ------- livestatus/src/TableStateHistory.cc | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 67437fc..1744bab 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -246,13 +246,6 @@ inline bool LogEntry::handleStatusEntry() { _logclass = LOGCLASS_STATE; _type = TIMEPERIOD_TRANSITION; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _command_name = next_token(&scan, ';'); - _check_output = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); return true; } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 56bae27..74228c9 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -562,12 +562,18 @@ void TableStateHistory::answerQuery(Query *query) } case TIMEPERIOD_TRANSITION: { - _notification_periods[entry->_command_name] = atoi(entry->_state_type); + char *buffer = strdup(entry->_options); + char *tp_name = strtok(buffer, ";"); + strtok(NULL, ";"); + char *tp_state = strtok(NULL, ";"); + + _notification_periods[tp_name] = atoi(tp_state); state_info_t::iterator it_hst = state_info.begin(); while (it_hst != state_info.end()) { updateHostServiceState(query, entry, it_hst->second, only_update); it_hst++; } + free(buffer); break; } case LOG_INITIAL_STATES: @@ -590,9 +596,9 @@ void TableStateHistory::answerQuery(Query *query) } } - logger(LOG_DEBUG, "Processed statehist logentries: %d", logentry_counter); - logger(LOG_DEBUG, "Total calls %d saved: %d", total_update_calls, total_calls_saved); - logger(LOG_DEBUG, "Objects: %d, Blacklisted: %d", state_info.size(), object_blacklist.size()); + //logger(LOG_DEBUG, "Processed statehist logentries: %d", logentry_counter); + //logger(LOG_DEBUG, "Total calls %d saved: %d", total_update_calls, total_calls_saved); + //logger(LOG_DEBUG, "Objects: %d, Blacklisted: %d", state_info.size(), object_blacklist.size()); // Create final reports state_info_t::iterator it_hst = state_info.begin(); @@ -751,9 +757,14 @@ inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntr } case TIMEPERIOD_TRANSITION: { + char *buffer = strdup(entry->_options); + char *tp_name = strtok(buffer, ";"); + strtok(NULL, ";"); + char *tp_state = strtok(NULL, ";"); + // if no _host pointer is available the initial status of _in_notification_period (1) never changes - if (hs_state->_host && !strcmp(entry->_command_name, hs_state->_notification_period)) { - int new_status = atoi(entry->_state_type); + if (hs_state->_host && !strcmp(tp_name, hs_state->_notification_period)) { + int new_status = atoi(tp_state); if (new_status != hs_state->_in_notification_period) { if (!only_update) process(query, hs_state); @@ -761,6 +772,7 @@ inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntr hs_state->_in_notification_period = new_status; } } + free(buffer); break; } }

11 years

Check_MK Git: check_mk: new check manpages for UPS devices

by Götz Golla

Module: check_mk Branch: master Commit: 68c731c9f7cfa2b9d62332669514d9caeff95204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68c731c9f7cfa2… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 1 17:23:07 2013 +0200 new check manpages for UPS devices --- checkman/emerson_stat | 39 +++++++++++++++++++++++++++++++++++++++ checkman/emerson_temp | 31 +++++++++++++++++++++++++++++++ checkman/liebert_bat_temp | 25 +++++++++++++++++++++++++ checkman/ups_test | 9 +++++---- checks/emerson_stat | 4 ++-- 5 files changed, 102 insertions(+), 6 deletions(-) diff --git a/checkman/emerson_stat b/checkman/emerson_stat new file mode 100644 index 0000000..da7c3fb --- /dev/null +++ b/checkman/emerson_stat @@ -0,0 +1,39 @@ +title: Emerson UPS: status +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + This check monitors the status OID of Emerson UPS devices which have the emerson energy + systems power MIB. They must have a system desciption OID + starting with "Emerson Network Power". + In case the device does not have a system description OID, it needs to be listed in + the configuration variable {snmp_without_sys_descr} to be inventorized. + + The following states of the device are known and lead to a nagios + state of {crit}: + (5) "minor - MA" + (6) "major" + (10) "disabled" + The following device states are known and lead to the nagios state {warn}: + (1) "unknown" + (3) "observation" + (4) "warning - A3" + (7) "unmanaged" + (8) "restricted"" + (9) "testing" + + +examples: + # host does not have a system description OID + snmp_without_sys_descr = [ + ( [], ['liebert-cabinet'] ), + ] + snmp_without_sys_descr + + +inventory: + The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) + and if the name of this OID begins with "Emerson Network Power". In case the device does + not have a system description OID it needs to be listed in the configuration variable + {snmp_without_sys_descr} to be inventorized + diff --git a/checkman/emerson_temp b/checkman/emerson_temp new file mode 100644 index 0000000..06fdc7f --- /dev/null +++ b/checkman/emerson_temp @@ -0,0 +1,31 @@ +title: Emerson UPS Device: Temperature sensor +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + This check monitors the state of temperature sensors on Emerson UPS devices which + have the Emerson Energy Systems Power MIB. They must have a system desciption OID + starting with "Emerson Network Power". + In case the device does not have a system description OID, it needs to be listed in + the configuration variable {snmp_without_sys_descr} to be inventorized. + + +item: + The index of the sensors found during inventory numbered starting from 0. + +perfdata: + The actual temperature in degrees celcius + +inventory: + One check for each sensor is created by the inventory + +[parameters] +parameters (tuple): A pair of numbers for warning and critical level + + warning (int): The temperature that triggers an WARNING state + + critical (int): The temperature that triggers an CRITICAL state + +[configuration] +emerson_temp_default (tuple): Default warning and critical level diff --git a/checkman/liebert_bat_temp b/checkman/liebert_bat_temp new file mode 100644 index 0000000..2680c2f --- /dev/null +++ b/checkman/liebert_bat_temp @@ -0,0 +1,25 @@ +title: Liebert UPS Device: Temperature sensor +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + This check monitors the state of the temperature sensor on Liebert UPS devices. + {warn} and {crit} levels can be defined for the temperature. + +perfdata: + The actual temperature in degrees celcius + +inventory: + The inventory works for all devices which have a '.1.3.6.1.4.1.476.1.42' in their + system description OID. No items are expected. + +[parameters] +parameters (tuple): A pair of numbers for warning and critical level + + warning (int): The temperature that triggers an WARNING state + + critical (int): The temperature that triggers an CRITICAL state + +[configuration] +liebert_bat_temp_default (tuple): Default warning and critical level diff --git a/checkman/ups_test b/checkman/ups_test index 9d1ef53..78f0de3 100644 --- a/checkman/ups_test +++ b/checkman/ups_test @@ -1,10 +1,10 @@ -title: UPS self test +title: Generic UPS Device: self test agents: snmp catalog: hw/power license: GPL distribution: check_mk description: - This check monitors parameters related to the self test of UPS devices: The result of the + This check monitors parameters related to the self test of UPS devices: the result of the last self test and the last date of the self test run. The check becomes {CRIT} if the test result is {"doneError"} or {"aborted"}, and {WARN} if the result is {"doneWarning"} or {"noTestsInitiated"}. It also has a {WARN} or {CRIT} state if the date of the last self @@ -15,8 +15,9 @@ examples: ups_test_default = ( 5, 10 ) inventory: - The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) - and if the name of this OID is known to the test. If this is true the system is inventorized. + The inventory process checks if the device has a system description OIDs + (.1.3.6.1.2.1.1.2.0) and if the name of this OID is known to the test. If + this is true the system is inventorized. [parameters] parameters(tuple): parameters is a tuple of two values diff --git a/checks/emerson_stat b/checks/emerson_stat index de33694..f6161f3 100644 --- a/checks/emerson_stat +++ b/checks/emerson_stat @@ -50,7 +50,7 @@ # TESTING(9), # DISABLED(10) } -# the mib is the NetSure_ESNA.mib, which we have received from directly +# the mib is the NetSure_ESNA.mib, which we have received directly # from a customer, it is named "Emerson Energy Systems (EES) Power MIB" @@ -64,7 +64,7 @@ def check_emerson_stat(item, params, info): if info: warn, crit = params # unused status_text = { 1:"unknown", 2:"normal", 3:"observation", 4: "warning - A3", - 5: "minar - MA", 6: "major - CA", 7: "unmanaged", 8: "restricted", + 5: "minor - MA", 6: "major - CA", 7: "unmanaged", 8: "restricted", 9: "testing", 10: "disabled" } status = saveint(info[0][0]) infotext = "Status: " + status_text.get(status)

11 years

Check_MK Git: check_mk: check_icmp: adding check manpage;

by Bernd Stroessenreuther

handing over thresholds for packet loss to the plugin as integer ( as expected by the nagios plugin) Message-ID: <524ae7f8.QvofFEDkC7mVlGYC%bs(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f624839de87ebfc059964a14e110f5d0650c70fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f624839de87ebf… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 17:19:17 2013 +0200 check_icmp: adding check manpage; handing over thresholds for packet loss to the plugin as integer (as expected by the nagios plugin) --- checkman/check_icmp | 20 ++++++++++++++++++++ checks/check_icmp | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/checkman/check_icmp b/checkman/check_icmp new file mode 100644 index 0000000..c35db34 --- /dev/null +++ b/checkman/check_icmp @@ -0,0 +1,20 @@ +title: ICMP Echo Request (Ping) +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This performs an active check with a ICMP Echo Request (Ping) + + It can check round trip times against given thresholds. It can also check packet + loss against given thresholds. + + Returns {WARN} or {CRIT} if round trip times or packet loss is above given levels. + Returns {CRIT} if receiving ICMP Host unreachable messages. + + This check can be configured by Wato. + +perfdata: + Four values: The round trip time (average) in milliseconds, the packet loss in + percent, the maximum round trip time in milliseconds and the minimum round trip time + in milliseconds. diff --git a/checks/check_icmp b/checks/check_icmp index cd8eeee..aab3006 100644 --- a/checks/check_icmp +++ b/checks/check_icmp @@ -37,8 +37,8 @@ def check_icmp_arguments(params): rta = value elif key == "loss": loss = value - args.append("-w %.2f,%.2f%%" % (rta[0], loss[0])) - args.append("-c %.2f,%.2f%%" % (rta[1], loss[1])) + args.append("-w %.2f,%d%%" % (rta[0], loss[0])) + args.append("-c %.2f,%d%%" % (rta[1], loss[1])) args.append("'$HOSTADDRESS$'") return " ".join(args)

11 years

Check_MK Git: check_mk: WATO: configuring non-Smart-PING for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b439e62c3445bee5c13a3ab46f303cd6665ecfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b439e62c3445b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 16:35:57 2013 +0200 WATO: configuring non-Smart-PING for CMC --- modules/check_mk.py | 10 +++++++++- web/plugins/wato/check_mk_configuration.py | 13 +++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9611dd2..2f7bdc0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1462,10 +1462,18 @@ def host_check_command(hostname, ip, is_clust): values = host_extra_conf(hostname, host_check_commands) if values: value = values[0] + elif monitoring_core == "cmc": + value = "smart" else: value = "ping" - if value == "ping": + if monitoring_core != "cmc" and value == "smart": + value = "ping" # avoid problems when switching back to nagios core + + if value == "smart" and not is_clust: + return "check-mk-host-smart" + + elif value in [ "ping", "smart" ]: ping_args = check_icmp_arguments(hostname) if is_clust and ip: # Do check cluster IP address if one is there return "check-mk-host-ping!%s" % ping_args diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 52df834..76a2050 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1447,12 +1447,13 @@ register_rule( "whether a host is up. In some cases this is not possible, however. With this rule " "you can specify an alternative way of determining the host's state."), choices = [ - ( "ping", _("PING (ICMP echo request)") ), - ( "tcp" , _("TCP Connect"), Integer(label = _("to port:"), minvalue=1, maxvalue=65535, default_value=80 )), - ( "ok", _("Always assume host to be up") ), - ( "agent", _("Use the status of the Check_MK Agent") ), - ( "service", _("Use the status of the service..."), TextUnicode(label = ":", size=45, allow_empty=False )), - ( "custom", _("Use a custom check plugin..."), PluginCommandLine() ), + ( "ping", _("PING (active check with ICMP echo request)") ), + ( "smart", _("Smart PING (only with Check_MK Micro Core)") ), + ( "tcp" , _("TCP Connect"), Integer(label = _("to port:"), minvalue=1, maxvalue=65535, default_value=80 )), + ( "ok", _("Always assume host to be up") ), + ( "agent", _("Use the status of the Check_MK Agent") ), + ( "service", _("Use the status of the service..."), TextUnicode(label = ":", size=45, allow_empty=False )), + ( "custom", _("Use a custom check plugin..."), PluginCommandLine() ), ], default_value = "ping", html_separator = " ",

11 years

Check_MK Git: check_mk: check_tcp: correctly quote host name

by Mathias Kettner

Module: check_mk Branch: master Commit: 2918223ba440a579ebb2b2620a1e34afd6a13629 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2918223ba440a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 16:26:05 2013 +0200 check_tcp: correctly quote host name --- checks/check_tcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_tcp b/checks/check_tcp index d50c9eb..c491171 100644 --- a/checks/check_tcp +++ b/checks/check_tcp @@ -76,7 +76,7 @@ def check_tcp_arguments(params): if "hostname" in settings: args += ' -H %s' % quote_shell_string(settings["hostname"]) else: - args += ' -H $HOSTADDRESS$' + args += " -H '$HOSTADDRESS$'" return args

11 years

Check_MK Git: check_mk: state and count of processes: no longer in inventorized checks. new: resident and virtual memory levels

by Andreas Boesl

Module: check_mk Branch: master Commit: f684c2ef6cd676b4c1f2a0268a007ba556e355c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f684c2ef6cd676… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 1 16:25:56 2013 +0200 state and count of processes: no longer in inventorized checks. new: resident and virtual memory levels --- ChangeLog | 7 +++++++ checks/ps | 21 ++++++++++++++++----- web/plugins/wato/check_parameters.py | 20 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94b32a3..2a08708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,13 @@ * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables + WATO: + * Rule "State and count of processes": New configuration options: + virtual and resident memory levels + * FIX: The rule "State and count of processes" is no longer available + in "Parameters for inventorized check". This rule was solely + intented for "Manual checks" configuration + 1.2.3i2: Core: * New option -B for just generating the configuration diff --git a/checks/ps b/checks/ps index 150e935..6d7d705 100644 --- a/checks/ps +++ b/checks/ps @@ -101,11 +101,11 @@ def ps_parse_info(info): pid = int(psinfo["ProcessId"]) if pid not in seen_pids: seen_pids.add(pid) - mem = int(psinfo["WorkingSetSize"]) / 1024 # Bytes -> KB - page = int(psinfo["PageFileUsage"]) / 1024 # Bytes -> KB + virt = int(psinfo["VirtualSize"]) / 1024 # Bytes -> KB + resi = int(psinfo["WorkingSetSize"]) / 1024 # Bytes -> KB userc = int(psinfo["UserModeTime"]) # do not resolve counter here! kernelc = int(psinfo["KernelModeTime"]) # do not resolve counter here! - line[1:1] = [ "(unknown,%d,%d,@%d/%d/%d)" % (mem, page, pid, userc, kernelc) ] + line[1:1] = [ "(unknown,%d,%d,@%d/%d/%d)" % (virt, resi, pid, userc, kernelc) ] info.append(line) return cpu_cores, info else: @@ -361,8 +361,19 @@ def check_procs(item, params, info, with_perfdata): infotext += " (ok from %d to %d)(!)" % (params["okmin"], params["okmax"]) if virtual_size: - infotext += " %.1f MB virtual, %.1f MB resident, %.1f%% CPU" % ( - virtual_size / 1024.0, resident_size / 1024.0, percent_cpu) + for size, name in [ (virtual_size, "virtual"), (resident_size, "resident") ]: + infotext += " %.1f MB %s" % ((size / 1024.0), name) + if "%s_levels" % name in params: + warn_level, crit_level = params["%s_levels" % name] + if size * 1024 >= crit_level: + state = 2 + infotext += "(!!)" + elif size * 1024 >= warn_level: + state = max(state, 1) + infotext += "(!)" + infotext += "," + + infotext += " %.1f%% CPU" % percent_cpu if "cpu_average" in params: timedif, avg_cpu = get_average("ps.%s.cpu" % item, now, percent_cpu, params["cpu_average"], False) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 438e24a..54f87be 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3866,9 +3866,25 @@ register_check_parameters( default_value = 15, ) ), + ( "virtual_levels", + Tuple( + title = _("Virtual memory usage"), + elements = [ + Filesize(title = _("Warning at")), + Filesize(title = _("Critical at")), + ], + )), + ( "resident_levels", + Tuple( + title = _("Physical memory usage"), + elements = [ + Filesize(title = _("Warning at")), + Filesize(title = _("Critical at")), + ], + )), ], - optional_keys = [ "user", "cpulevels", "cpu_average" ]), + optional_keys = [ "user", "cpulevels", "cpu_average", "virtual_levels", "resident_levels" ]), forth = ps_convert_from_tuple, ), TextAscii( @@ -3879,5 +3895,5 @@ register_check_parameters( regex_error = _("Please use only a-z, A-Z, 0-9, space, underscore, " "dot and hyphon for your service description"), ), - "first", True + "first", False )

11 years

Check_MK Git: check_mk: FIX: fixed typo in core startup message logging initial states

by Andreas Boesl

Module: check_mk Branch: master Commit: 8903ce04667ac5c3a0cfe490183631eb372ee6c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8903ce04667ac5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 1 15:36:45 2013 +0200 FIX: fixed typo in core startup message logging initial states --- ChangeLog | 3 +++ livestatus/src/module.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac14720..1188a2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i3: + Core: + * FIX: fixed typo in core startup message "logging initial states" + Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB * FIX: windows_agent: fixed bug in cleanup of open thread handles diff --git a/livestatus/src/module.c b/livestatus/src/module.c index a3f9cd8..05fec33 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -509,8 +509,8 @@ int broker_event(int event_type __attribute__ ((__unused__)), void *data) { if (g_thread_running == 1 ) livestatus_log_initial_states(); - else if (log_initial_states == 1) // initi - write_to_all_logs("logging intitial states", LG_INFO); // initial info during startup + else if (log_initial_states == 1) + write_to_all_logs("logging initial states", LG_INFO); // initial info during startup } update_timeperiods_cache(ts->timestamp.tv_sec); return 0;

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits