Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: livestatus: staleness for hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: 2715f1b9d5d6dd31d9e2c1026111bdd15c5903cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2715f1b9d5d6dd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 17:42:41 2013 +0200 livestatus: staleness for hosts --- ChangeLog | 3 +- livestatus/src/HostSpecialDoubleColumn.cc | 44 ++++++++++++++++++++++++++ livestatus/src/HostSpecialDoubleColumn.h | 44 ++++++++++++++++++++++++++ livestatus/src/Makefile.am | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 1 - livestatus/src/TableHosts.cc | 4 +++ 6 files changed, 95 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcd44af..644e5e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,8 @@ * Predictive monitoring: correctly handle spaces in variable names (thanks to Karl Golland) * New man page browser for console (cmk -m) - * livestatus: new service column staleness: indicator outdated service checks + * livestatus: new service column staleness: indicator for outdated service checks + * livestatus: new host column staleness: indicator for outdated host checks Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc new file mode 100644 index 0000000..37b127d --- /dev/null +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -0,0 +1,44 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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 "HostSpecialDoubleColumn.h" +#include "nagios.h" +#include "logger.h" +#include "time.h" + +double HostSpecialDoubleColumn::getValue(void *data) +{ + data = shiftPointer(data); + if (!data) return 0; + + host *hst = (host *)data; + + switch (_type) { + case HSDC_STALENESS: + { + return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); + } + } + return -1; // Never reached +} diff --git a/livestatus/src/HostSpecialDoubleColumn.h b/livestatus/src/HostSpecialDoubleColumn.h new file mode 100644 index 0000000..8e7ba20 --- /dev/null +++ b/livestatus/src/HostSpecialDoubleColumn.h @@ -0,0 +1,44 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#ifndef ServiceSpecialDoubleColumn_h +#define ServiceSpecialDoubleColumn_h + +#include "config.h" +#include "DoubleColumn.h" + +#define HSDC_STALENESS 1 + +class HostSpecialDoubleColumn : public DoubleColumn +{ + int _type; + +public: + HostSpecialDoubleColumn(string name, string description, int hsdc_type, int indirect) + : DoubleColumn(name, description, indirect) , _type(hsdc_type) {} + double getValue(void *data); +}; + +#endif // ServiceSpecialDoubleColumn_h + diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 24d8f0a..1cba24b 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -43,7 +43,7 @@ livestatus_so_SOURCES = \ Query.cc ServiceContactsColumn.cc ServicegroupsColumn.cc ServicelistColumn.cc \ ServicelistColumnFilter.cc ServicelistStateColumn.cc store.cc Store.cc \ StringColumn.cc StringColumnFilter.cc strutil.cc Table.cc TableColumns.cc \ - TableCommands.cc TableContacts.cc TableDownComm.cc TableHostgroups.cc \ + HostSpecialDoubleColumn.cc TableCommands.cc TableContacts.cc TableDownComm.cc TableHostgroups.cc \ ServiceSpecialDoubleColumn.cc TableHosts.cc TableServicegroups.cc TableServices.cc TableStatus.cc \ LogEntry.cc LogCache.cc Logfile.cc TableStateHistory.cc TableLog.cc TableTimeperiods.cc TableContactgroups.cc \ ContactgroupsMemberColumn.cc OffsetStringMacroColumn.cc OffsetStringServiceMacroColumn.cc \ diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 46ae447..3e135c8 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -36,7 +36,6 @@ double ServiceSpecialDoubleColumn::getValue(void *data) switch (_type) { case SSDC_STALENESS: { - time_t last_check = svc->last_check; bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); time_t check_result_age = time(0) - svc->last_check; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 51a6a04..8539abd 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -44,6 +44,7 @@ #include "HostgroupsColumn.h" #include "ContactgroupsColumn.h" #include "HostSpecialIntColumn.h" +#include "HostSpecialDoubleColumn.h" #include "tables.h" #include "auth.h" @@ -301,6 +302,9 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) table->addColumn(new HostSpecialIntColumn(prefix + "pnpgraph_present", "Whether there is a PNP4Nagios graph present for this host (0/1)", HSIC_PNP_GRAPH_PRESENT, indirect_offset)); + table->addColumn(new HostSpecialDoubleColumn(prefix + "staleness", + "Staleness indicator for this host", HSDC_STALENESS, indirect_offset)); + table->addColumn(new HostgroupsColumn(prefix + "groups", "A list of all host groups this host is in", (char *)(&hst.hostgroups_ptr) - ref, indirect_offset)); table->addColumn(new ContactgroupsColumn(prefix + "contact_groups",

11 years

Check_MK Git: check_mk: livestatus: new service column staleness: indicator outdated service checks

by Andreas Boesl

Module: check_mk Branch: master Commit: a9bf7fc1469cfd85146673988fa9dc6210126538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9bf7fc1469cfd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 17:17:02 2013 +0200 livestatus: new service column staleness: indicator outdated service checks --- ChangeLog | 1 + livestatus/src/Makefile.am | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 67 ++++++++++++++++++++++++++ livestatus/src/ServiceSpecialDoubleColumn.h | 44 +++++++++++++++++ livestatus/src/TableServices.cc | 3 ++ 5 files changed, 116 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46fca92..bcd44af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * Predictive monitoring: correctly handle spaces in variable names (thanks to Karl Golland) * New man page browser for console (cmk -m) + * livestatus: new service column staleness: indicator outdated service checks Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index e83ee51..24d8f0a 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -44,7 +44,7 @@ livestatus_so_SOURCES = \ ServicelistColumnFilter.cc ServicelistStateColumn.cc store.cc Store.cc \ StringColumn.cc StringColumnFilter.cc strutil.cc Table.cc TableColumns.cc \ TableCommands.cc TableContacts.cc TableDownComm.cc TableHostgroups.cc \ - TableHosts.cc TableServicegroups.cc TableServices.cc TableStatus.cc \ + ServiceSpecialDoubleColumn.cc TableHosts.cc TableServicegroups.cc TableServices.cc TableStatus.cc \ LogEntry.cc LogCache.cc Logfile.cc TableStateHistory.cc TableLog.cc TableTimeperiods.cc TableContactgroups.cc \ ContactgroupsMemberColumn.cc OffsetStringMacroColumn.cc OffsetStringServiceMacroColumn.cc \ OffsetStringHostMacroColumn.cc StatsColumn.cc IntAggregator.cc CountAggregator.cc \ diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc new file mode 100644 index 0000000..46ae447 --- /dev/null +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -0,0 +1,67 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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 "ServiceSpecialDoubleColumn.h" +#include "nagios.h" +#include "logger.h" +#include "time.h" + +double ServiceSpecialDoubleColumn::getValue(void *data) +{ + data = shiftPointer(data); + if (!data) return 0; + + service *svc = (service *)data; + switch (_type) { + case SSDC_STALENESS: + { + time_t last_check = svc->last_check; + bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); + + time_t check_result_age = time(0) - svc->last_check; + service *tmp_svc; + + // check_mk PASSIVE CHECK: Find check-mk service and get its check interval + if (is_cmk_passive) { + host *host = svc->host_ptr; + servicesmember *svc_member = host->services; + double check_interval = 1; + while (svc_member != 0) { + tmp_svc = svc_member->service_ptr; + if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { + check_interval = tmp_svc->check_interval * 60; + return check_result_age / check_interval; + } + svc_member = svc_member->next; + } + return 1; // Shouldnt happen! We always except check-mk service + } + else // Other non-cmk passive and active checks + { + return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); + } + } + } + return -1; // Never reached +} diff --git a/livestatus/src/ServiceSpecialDoubleColumn.h b/livestatus/src/ServiceSpecialDoubleColumn.h new file mode 100644 index 0000000..668ca6e --- /dev/null +++ b/livestatus/src/ServiceSpecialDoubleColumn.h @@ -0,0 +1,44 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#ifndef ServiceSpecialDoubleColumn_h +#define ServiceSpecialDoubleColumn_h + +#include "config.h" +#include "DoubleColumn.h" + +#define SSDC_STALENESS 1 + +class ServiceSpecialDoubleColumn : public DoubleColumn +{ + int _type; + +public: + ServiceSpecialDoubleColumn(string name, string description, int ssdc_type, int indirect) + : DoubleColumn(name, description, indirect) , _type(ssdc_type) {} + double getValue(void *data); +}; + +#endif // ServiceSpecialDoubleColumn_h + diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index b962816..111ad8f 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -33,6 +33,7 @@ #include "OffsetTimeperiodColumn.h" #include "OffsetStringServiceMacroColumn.h" #include "ServiceSpecialIntColumn.h" +#include "ServiceSpecialDoubleColumn.h" #include "AttributelistColumn.h" #include "TableHosts.h" #include "TableServicegroups.h" @@ -308,6 +309,8 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, "A list of all modified attributes", (char *)(&svc.modified_attributes) - ref, indirect_offset, true)); table->addColumn(new ServiceSpecialIntColumn(prefix + "pnpgraph_present", "Whether there is a PNP4Nagios graph present for this service (0/1)", SSIC_PNP_GRAPH_PRESENT, indirect_offset)); + table->addColumn(new ServiceSpecialDoubleColumn(prefix + "staleness", + "The staleness indicator for this service", SSDC_STALENESS, indirect_offset)); // columns of type double table->addColumn(new OffsetDoubleColumn(prefix + "check_interval",

11 years

Check_MK Git: check_mk: Added livedump mail transport mechanism ; cleaned up a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 50c6335a6fd6ed06896c41c8987a3b247d4fa4f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c6335a6fd6ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 16:15:53 2013 +0200 Added livedump mail transport mechanism ; cleaned up a bit --- doc/treasures/{README.livedump => livedump/README} | 0 doc/treasures/{ => livedump}/livedump | 0 doc/treasures/livedump/livedump-mail-fetch | 90 ++++++++++++++++++++ doc/treasures/{ => livedump}/livestatus-to-nsca.sh | 0 4 files changed, 90 insertions(+) diff --git a/doc/treasures/README.livedump b/doc/treasures/livedump/README similarity index 100% rename from doc/treasures/README.livedump rename to doc/treasures/livedump/README diff --git a/doc/treasures/livedump b/doc/treasures/livedump/livedump similarity index 100% rename from doc/treasures/livedump rename to doc/treasures/livedump/livedump diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch new file mode 100755 index 0000000..7078161 --- /dev/null +++ b/doc/treasures/livedump/livedump-mail-fetch @@ -0,0 +1,90 @@ +#!/usr/bin/python +# Fetches mails from inbox of a pop mailbox to gather configuration +# and state information generated by the livedump command. We use +# the mail subject to identify the mails. Mails with a subject +# "state" do contain the nagios checkresults in the mail body and +# mails with subjects starting with the string "config" do contain +# nagios configuration definitions. All chars after the config string +# in the subject are used to identfy the sending system. This is +# an ident of the system to support multiple sending systems. +# +# Configuration is written to etc/nagios/conf.d/remote-<ident>.cfg. +# The status info is sent in nagios state result file format and +# written to tmp/nagios/checkresults directory in a temporary file +# which is then processed by nagios. + +import os +import sys +import poplib +import re +import quopri +import tempfile + +omd_root = os.environ.get('OMD_ROOT') +pop_server = "pop.1und1.de" +pop_user = "monitor(a)grillwerkstatt.at" +pop_pass = "LTWmonitor2013" + +M = poplib.POP3_SSL(pop_server) +M.user(pop_user) +M.pass_(pop_pass) + +config_ids = [] +status_ids = [] +numMessages = len(M.list()[1]) + +status_mails = [] +config_mails = [] + +pattern = re.compile(r"^Subject: (.*)") +for i in range(numMessages): + for header_lines in M.top(i + 1, 0)[1]: + matches = pattern.match(header_lines) + if matches: + subject = matches.group(1).strip() + if subject == "status": + status_mails.append(i + 1) + elif subject.startswith("config"): + ident = subject[6:].strip().replace("/", "_").replace(".", "_") + if not ident: + ident = "no-ident" + config_mails.append((i + 1, ident)) + +# handle config mails. Only last available is interesting. +# Extract mail body and use this as retrieved config. +if config_mails: + mail_index, ident = config_mails[-1] + code, mail, num = M.retr(mail_index) + body_start_index = mail.index('') + body = quopri.decodestring('\n'.join(mail[body_start_index:])) + + file("%s/etc/nagios/conf.d/remote-%s.cfg" % + (omd_root, ident), "w").write(body) + +if status_mails: + for index in status_mails: + code, mail, code = M.retr(index) + body_start_index = mail.index('') + body = quopri.decodestring('\n'.join(mail[body_start_index:])) + + fd, path = tempfile.mkstemp('', 'c', "%s/tmp/nagios/checkresults" % omd_root) + os.write(fd, body) + os.close(fd) + file(path + ".ok", "w") + +# alle mails loeschen +try: + popstate, msglist, code = M.list() + for entry in msglist: + msgid, size = entry.split() + response = M.dele(msgid) + if response != "+OK": + raise Exception("Error from POP server: [%s]" % response) + break + +except Exception, e: + sys.stderr.write(msg + "Error deleting message: %s" % e) + sys.exit(1) + +# Close mailbox, commit changes +M.quit() diff --git a/doc/treasures/livestatus-to-nsca.sh b/doc/treasures/livedump/livestatus-to-nsca.sh similarity index 100% rename from doc/treasures/livestatus-to-nsca.sh rename to doc/treasures/livedump/livestatus-to-nsca.sh

11 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b4aa225dd79ba62626fe92e1bcfab1175f01ce7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b4aa225dd79ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 16:15:59 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: Default downtime: removed way too fancy commenting feature

by Andreas Boesl

Module: check_mk Branch: master Commit: faf0158aba65b57d1721a44851b313954fcee22d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faf0158aba65b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 14:55:24 2013 +0200 Default downtime: removed way too fancy commenting feature --- web/plugins/views/commands.py | 4 ---- web/plugins/wato/check_mk_configuration.py | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 23e9393..e8ae959 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -377,10 +377,6 @@ def command_downtime(cmdtag, spec, row): if down_to: comment = html.var_utf8("_down_comment") - try: # Catch formatting errors - comment = comment % { "user": config.user_id, "duration": int(down_to - down_from) } - except: - pass if not comment: raise MKUserError("_down_comment", _("You need to supply a comment for your downtime.")) if html.var("_down_flexible"): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8623261..01adfc2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -289,16 +289,14 @@ register_configvar(group, elements = [ ("duration", Integer( title = _("Duration"), - help = _("The duration in minutes of the default downtime"), + help = _("The duration in minutes of the default downtime."), minvalue = 1, unit = _("minutes"), default_value = 60, )), ("comment", TextUnicode( title = _("Downtime comment"), - help = _("The default comment for a downtime. "\ - "You can use the placeholders %(user)s and %(duration)s "\ - "which will replaced when the downtime command is sent"), + help = _("The default comment for a downtime."), size = 80 )), ],

11 years

Check_MK Git: check_mk: fixed invalid rem output

by Andreas Boesl

Module: check_mk Branch: master Commit: fc8180f192b34989589cda6a3fc419b6f8ddd7f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc8180f192b349… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 14:15:13 2013 +0200 fixed invalid rem output --- agents/windows/plugins/psperf.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/psperf.bat b/agents/windows/plugins/psperf.bat index d901b1a..a9fdbc9 100644 --- a/agents/windows/plugins/psperf.bat +++ b/agents/windows/plugins/psperf.bat @@ -1,7 +1,7 @@ +@echo off rem This plugin obsoletes wmicchecks.bat. It is better because it is rem directly supported by the normal ps check. -@echo off echo ^<^<^<ps:sep^(44^)^>^>^> echo [wmic process] wmic process get ProcessId,name,pagefileusage,virtualsize,workingsetsize,usermodetime,kernelmodetime,ThreadCount /format:csv

11 years

Check_MK Git: check_mk: vSphere secret is not shown to the user via WATO anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 60db7eb5c3dd3f5984658263778e4b93aa5722da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60db7eb5c3dd3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 13:30:45 2013 +0200 vSphere secret is not shown to the user via WATO anymore --- ChangeLog | 1 + web/plugins/wato/datasource_programs.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c97fe8f..c3bbdf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ WATO: * Allow to configure check-/retry_interval in second precision + * vSphere secret is not shown to the user via WATO anymore * FIX: do validation of check items in rule editor Notifications: diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index ffcaace..7137321 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -56,7 +56,7 @@ register_rule(group, ) ), ( "secret", - TextAscii( + Password( title = _("vSphere secret"), allow_empty = False, )

11 years

Check_MK Git: check_mk: FIX: blade_powerfan: fix mixup of default levels 50 /40 -> 40/50

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ec04fc97c913e467cce4d9742c8b0acff32ab42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec04fc97c913e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 14:12:11 2013 +0200 FIX: blade_powerfan: fix mixup of default levels 50/40 -> 40/50 --- ChangeLog | 1 + checkman/blade_powerfan | 2 +- checks/blade_powerfan | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3bbdf8..46fca92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -221,6 +221,7 @@ 1.2.2p3: Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% + * FIX: blade_powerfan: fix mixup of default levels 50/40 -> 40/50 Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration diff --git a/checkman/blade_powerfan b/checkman/blade_powerfan index 82a2a82..faa29ff 100644 --- a/checkman/blade_powerfan +++ b/checkman/blade_powerfan @@ -16,7 +16,7 @@ item: inventory: All present fans are detected automatically and parameterized with - levels at 50/40% of maximum speed. + levels at 50 (WARN) and 40 (CRIT) percent of maximum speed. perfdata: Two values: The current percentage of the maximum design speed and the diff --git a/checks/blade_powerfan b/checks/blade_powerfan index 71a18ca..59b2c25 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -26,7 +26,7 @@ def inventory_blade_powerfan(info): - return [ (line[0], '(40, 50)') for line in info if line[0] != '' and line[1] == '1' ] + return [ (line[0], '(50, 40)') for line in info if line[0] != '' and line[1] == '1' ] def check_blade_powerfan(item, params, info): warn_perc, crit_perc = params

11 years

Check_MK Git: check_mk: Updated bug entries #0925

by Lars Michelsen

Module: check_mk Branch: master Commit: 0735e5085f1ee303734bd1982f73f82145e81edf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0735e5085f1ee3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 14:09:09 2013 +0200 Updated bug entries #0925 --- .bugs/925 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/925 b/.bugs/925 new file mode 100644 index 0000000..3551407 --- /dev/null +++ b/.bugs/925 @@ -0,0 +1,12 @@ +Title: HTML mails not rendered correctly in outlook +Component: core +State: open +Date: 2013-06-27 13:58:29 +Targetversion: future +Class: bug + +It seems that current outlook versions, like e.g. 2010, use some sort of stripped html. +The html code sent by the html/graph mails does not seem to be compatible to this. + +We should try to reproduce this on a system and then fix it there. This requires a lot +trial/error - so we should do this together with a customer on an affected system.

11 years

Check_MK Git: check_mk: Better formating of snmp_info output when some infos are missing

by Lars Michelsen

Module: check_mk Branch: master Commit: 28477a5ef228b5a529901d331afa072e0112e9ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28477a5ef228b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 27 13:16:54 2013 +0200 Better formating of snmp_info output when some infos are missing --- checks/snmp_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/snmp_info b/checks/snmp_info index d653856..8272904 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -30,7 +30,7 @@ def inventory_snmp_info(info): def check_snmp_info(checktype, params, info): if len(info[0]) >= 4: - return (0, "%s, %s, %s, %s" % (info[0][0], info[0][2], info[0][3], info[0][1])) + return (0, ', '.join([ info[0][i] for i in [0, 2, 3, 1] if info[0][i] ])) else: return (3, "No data retrieved")

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013