Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

Fetched Livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: f4700da13dc3848e7f525f350c562b8e5e24f9fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4700da13dc384… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 3 14:41:25 2016 +0200 Fetched Livestatus from downstream plus associated fixes. --- .../src/DynamicEventConsoleReplicationColumn.cc | 35 ++++++++++++++++ .../src/DynamicEventConsoleReplicationColumn.h | 42 ++++++++++++++++++++ livestatus/src/Makefile.am | 3 +- livestatus/src/TableEventConsoleReplication.cc | 10 ++++- livestatus/src/TableEventConsoleReplication.h | 3 +- 5 files changed, 88 insertions(+), 5 deletions(-) diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc new file mode 100644 index 0000000..c1af0ea --- /dev/null +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -0,0 +1,35 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#include "DynamicEventConsoleReplicationColumn.h" + +DynamicEventConsoleReplicationColumn::DynamicEventConsoleReplicationColumn( + std::string name, std::string description, int indirect_offset, + int extra_offset) + : DynamicColumn(name, description, indirect_offset, extra_offset) {} + +Column *DynamicEventConsoleReplicationColumn::createColumn( + int indirect_offset, int extra_offset, const char *arguments) { + return nullptr; +} diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.h b/livestatus/src/DynamicEventConsoleReplicationColumn.h new file mode 100644 index 0000000..360d0ac --- /dev/null +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.h @@ -0,0 +1,42 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#ifndef DynamicEventConsoleReplicationColumn_h +#define DynamicEventConsoleReplicationColumn_h + +#include "config.h" // IWYU pragma: keep +#include <string> +#include "DynamicColumn.h" +class Column; + +class DynamicEventConsoleReplicationColumn : public DynamicColumn { +public: + DynamicEventConsoleReplicationColumn(std::string name, + std::string description, + int indirect_offset, int extra_offset); + Column *createColumn(int indirect_offset, int extra_offset, + const char *arguments) override; +}; + +#endif // DynamicEventConsoleReplicationColumn_h diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 90452b9..687cbf4 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -53,6 +53,8 @@ livestatus_so_SOURCES = \ DowntimeOrComment.cc \ DowntimesOrComments.cc \ DynamicColumn.cc \ + DynamicEventConsoleReplicationColumn.cc \ + DynamicLogwatchFileColumn.cc \ EmptyColumn.cc \ EventConsoleConnection.cc \ Filter.cc \ @@ -76,7 +78,6 @@ livestatus_so_SOURCES = \ LogEntry.cc \ Logfile.cc \ LogwatchListColumn.cc \ - DynamicLogwatchFileColumn.cc \ MetricsColumn.cc \ NullColumn.cc \ OffsetDoubleColumn.cc \ diff --git a/livestatus/src/TableEventConsoleReplication.cc b/livestatus/src/TableEventConsoleReplication.cc index 4b025b0..78e5357 100644 --- a/livestatus/src/TableEventConsoleReplication.cc +++ b/livestatus/src/TableEventConsoleReplication.cc @@ -23,13 +23,19 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleReplication.h" +#include "DynamicEventConsoleReplicationColumn.h" + +TableEventConsoleReplication::TableEventConsoleReplication() { + addDynamicColumn(new DynamicEventConsoleReplicationColumn( + "value", "The replication value", -1, -1)); +} const char *TableEventConsoleReplication::name() const { - return "eventconsoleevents"; + return "eventconsolereplication"; } const char *TableEventConsoleReplication::namePrefix() const { - return "eventconsoleevents_"; + return "eventconsolereplication_"; } void TableEventConsoleReplication::answerQuery(Query *query) {} diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h index 3bc6144..76f6d42 100644 --- a/livestatus/src/TableEventConsoleReplication.h +++ b/livestatus/src/TableEventConsoleReplication.h @@ -30,11 +30,10 @@ class TableEventConsoleReplication : public Table { public: + TableEventConsoleReplication(); const char *name() const override; const char *namePrefix() const override; void answerQuery(Query *query) override; - -private: }; #endif // TableEventConsoleReplication_h

8 years, 4 months

Fetched Livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: b9d59f5e3331ac572d5fd57932f74f78fda86a5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9d59f5e3331ac… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 3 13:53:38 2016 +0200 Fetched Livestatus from downstream plus associated fixes. --- livestatus/src/Makefile.am | 1 + livestatus/src/Store.cc | 1 + livestatus/src/Store.h | 2 ++ livestatus/src/TableEventConsoleReplication.cc | 35 +++++++++++++++++++++ livestatus/src/TableEventConsoleReplication.h | 40 ++++++++++++++++++++++++ 5 files changed, 79 insertions(+) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index aa20510..90452b9 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -114,6 +114,7 @@ livestatus_so_SOURCES = \ TableEventConsole.cc \ TableEventConsoleEvents.cc \ TableEventConsoleHistory.cc \ + TableEventConsoleReplication.cc \ TableEventConsoleStatus.cc \ TableHostgroups.cc \ TableHosts.cc \ diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 6100d5d..9487427 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -92,6 +92,7 @@ Store::Store() addTable(&_table_eventconsoleevents); addTable(&_table_eventconsolehistory); addTable(&_table_eventconsolestatus); + addTable(&_table_eventconsolereplication); g_table_hosts = &_table_hosts; g_table_services = &_table_services; diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 26f6a2c..bac7e08 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -40,6 +40,7 @@ #include "TableDownComm.h" #include "TableEventConsoleEvents.h" #include "TableEventConsoleHistory.h" +#include "TableEventConsoleReplication.h" #include "TableEventConsoleStatus.h" #include "TableHostgroups.h" #include "TableHosts.h" @@ -90,6 +91,7 @@ private: TableEventConsoleEvents _table_eventconsoleevents; TableEventConsoleHistory _table_eventconsolehistory; TableEventConsoleStatus _table_eventconsolestatus; + TableEventConsoleReplication _table_eventconsolereplication; std::map<std::string, Table *> _tables; diff --git a/livestatus/src/TableEventConsoleReplication.cc b/livestatus/src/TableEventConsoleReplication.cc new file mode 100644 index 0000000..4b025b0 --- /dev/null +++ b/livestatus/src/TableEventConsoleReplication.cc @@ -0,0 +1,35 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#include "TableEventConsoleReplication.h" + +const char *TableEventConsoleReplication::name() const { + return "eventconsoleevents"; +} + +const char *TableEventConsoleReplication::namePrefix() const { + return "eventconsoleevents_"; +} + +void TableEventConsoleReplication::answerQuery(Query *query) {} diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h new file mode 100644 index 0000000..3bc6144 --- /dev/null +++ b/livestatus/src/TableEventConsoleReplication.h @@ -0,0 +1,40 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | 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. + +#ifndef TableEventConsoleReplication_h +#define TableEventConsoleReplication_h + +#include "config.h" // IWYU pragma: keep +#include "Table.h" + +class TableEventConsoleReplication : public Table { +public: + const char *name() const override; + const char *namePrefix() const override; + void answerQuery(Query *query) override; + +private: +}; + +#endif // TableEventConsoleReplication_h

8 years, 4 months

Ensure parent directory exists during locking of files

by Lars Michelsen

Module: check_mk Branch: master Commit: 406129d26d4689bc35830aea971dceeba54b6ffb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=406129d26d4689… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 3 10:08:09 2016 +0200 Ensure parent directory exists during locking of files --- web/htdocs/lib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 9d1b847..38e1f03 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -390,7 +390,8 @@ def aquire_lock(path): if path in g_locked_paths: return # No recursive locking - # Create file for locking if not existant yet + # Create file (and base dir) for locking if not existant yet + make_nagios_directory(os.path.dirname(path)) fd = os.open(path, os.O_RDONLY | os.O_CREAT) # Handle the case where the file has been renamed in the meantime

8 years, 4 months

Fetched Livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 943ca06ad74c599d8f33b1b900431e1975ef6843 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=943ca06ad74c59… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 3 09:42:15 2016 +0200 Fetched Livestatus from downstream plus associated fixes. --- livestatus/configure.ac | 1 - livestatus/src/EventConsoleConnection.cc | 4 ++-- livestatus/src/module.c | 19 +++---------------- livestatus/src/unixcat.c | 20 +++----------------- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index e7b2151..0d9cbe3 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -43,7 +43,6 @@ fi AC_PROG_CXX([g++-6 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_PROG_RANLIB -AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1]) # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index a160b1b..d028594 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -54,14 +54,14 @@ EventConsoleConnection::EventConsoleConnection(string path) : _path(move(path)), _socket(-1) {} void EventConsoleConnection::run() { - _socket = socket(PF_LOCAL, SOCK_STREAM, 0); + _socket = socket(PF_UNIX, SOCK_STREAM, 0); if (_socket == -1) { Alert() << "Cannot create socket for " << MkEventD(_path, errno); return; } struct sockaddr_un sa; - sa.sun_family = AF_LOCAL; + sa.sun_family = AF_UNIX; strncpy(sa.sun_path, _path.c_str(), sizeof(sa.sun_path)); if (connect(_socket, reinterpret_cast<const struct sockaddr *>(&sa), sizeof(sockaddr_un)) == -1) { diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 47575ab..2d5068d 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -52,19 +52,6 @@ #include "strutil.h" #include "waittriggers.h" -#ifndef AF_LOCAL -#define AF_LOCAL AF_UNIX -#endif -#ifndef PF_LOCAL -#define PF_LOCAL PF_UNIX -#endif - -// usually - but not always - in sys/un.h -#ifndef SUN_LEN -#define SUN_LEN(ptr) \ - ((size_t)(((struct sockaddr_un *)0)->sun_path) + strlen((ptr)->sun_path)) -#endif - NEB_API_VERSION(CURRENT_NEB_API_VERSION) #ifndef NAGIOS4 extern int event_broker_options; @@ -316,7 +303,7 @@ int open_unix_socket() { } } - g_unix_socket = socket(PF_LOCAL, SOCK_STREAM, 0); + g_unix_socket = socket(PF_UNIX, SOCK_STREAM, 0); g_max_fd_ever = g_unix_socket; if (g_unix_socket < 0) { logger(LG_CRIT, "Unable to create UNIX socket: %s", strerror(errno)); @@ -330,9 +317,9 @@ int open_unix_socket() { // Bind it to its address. This creates the file with the name g_socket_path struct sockaddr_un sockaddr; - sockaddr.sun_family = AF_LOCAL; + sockaddr.sun_family = AF_UNIX; strncpy(sockaddr.sun_path, g_socket_path, sizeof(sockaddr.sun_path)); - if (bind(g_unix_socket, (struct sockaddr *)&sockaddr, SUN_LEN(&sockaddr)) < + if (bind(g_unix_socket, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) < 0) { logger(LG_ERR, "Unable to bind adress %s to UNIX socket: %s", g_socket_path, strerror(errno)); diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index fbba94a..6d28663 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -39,20 +39,6 @@ #include <sys/un.h> #include <unistd.h> -#ifndef AF_LOCAL -#define AF_LOCAL AF_UNIX -#endif -#ifndef PF_LOCAL -#define PF_LOCAL PF_UNIX -#endif - -/* Ist normalerweise in sys/un.h, aber dietc hat dieses Makro nicht */ -/* Evaluate to actual length of the `sockaddr_un' structure. */ -#ifndef SUN_LEN -#define SUN_LEN(ptr) \ - ((size_t)(((struct sockaddr_un *)0)->sun_path) + strlen((ptr)->sun_path)) -#endif - int copy_data(int from, int to); void *voidp; @@ -139,7 +125,7 @@ int main(int argc, char **argv) { exit(2); } - int sock = socket(PF_LOCAL, SOCK_STREAM, 0); + int sock = socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { fprintf(stderr, "Cannot create client socket: %s\n", strerror(errno)); exit(3); @@ -147,9 +133,9 @@ int main(int argc, char **argv) { /* Connect */ struct sockaddr_un sockaddr; - sockaddr.sun_family = AF_LOCAL; + sockaddr.sun_family = AF_UNIX; strncpy(sockaddr.sun_path, unixpath, sizeof(sockaddr.sun_path)); - if (connect(sock, (struct sockaddr *)&sockaddr, SUN_LEN(&sockaddr))) { + if (connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) { fprintf(stderr, "Couldn't connect to UNIX-socket at %s: %s.\n", unixpath, strerror(errno)); close(sock);

8 years, 4 months

3619 FIX esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit

by Mathias Kettner

Module: check_mk Branch: master Commit: 21cf7a3160e9658a4313afa2bbf40a74206b0e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21cf7a3160e965… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 3 08:54:00 2016 +0200 3619 FIX esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit --- .werks/3619 | 10 ++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/.werks/3619 b/.werks/3619 new file mode 100644 index 0000000..a26b986 --- /dev/null +++ b/.werks/3619 @@ -0,0 +1,10 @@ +Title: esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464936825 + + diff --git a/ChangeLog b/ChangeLog index ffe75f3..304012e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -255,6 +255,7 @@ * 3630 FIX: docsis_channels_upstream: fixed channel discovery * 3584 FIX: check_mkevents: Fixed "failed to parse perfdata" errors in web.log caused by "Events" checks... * 3587 FIX: SNMP: Fixed possible random IO issues when using classic SNMP... + * 3619 FIX: esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3b472f4..d7c0be8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -807,6 +807,38 @@ metric_info["mem_lnx_hardware_corrupted"] = { "unit" : "bytes", } +# Consumed Host Memory usage is defined as the amount of host memory that is allocated to the virtual machine +metric_info["mem_esx_host"] = { + "title" : _("Consumed host memory"), + "color": "#70f038", + "unit" : "bytes", +} + +# Active Guest Memory is defined as the amount of guest memory that is currently being used by the guest operating system and its applications +metric_info["mem_esx_guest"] = { + "title" : _("Active guest memory"), + "color": "15/a", + "unit" : "bytes", +} + +metric_info["mem_esx_ballooned"] = { + "title" : _("Ballooned memory"), + "color": "21/a", + "unit" : "bytes", +} + +metric_info["mem_esx_shared"] = { + "title" : _("Shared memory"), + "color": "34/a", + "unit" : "bytes", +} + +metric_info["mem_esx_private"] = { + "title" : _("Private memory"), + "color": "25/a", + "unit" : "bytes", +} + metric_info["load1"] = { "title" : _("CPU load average of last minute"), @@ -3527,6 +3559,14 @@ check_metrics["check_mk-mem.used"] = { "committed_as" : { "name" : "mem_lnx_committed_as", "scale" : MB }, } +check_metrics["check_mk-esx_vsphere_vm.mem_usage"] = { + "host" : { "name" : "mem_esx_host" }, + "guest" : { "name" : "mem_esx_guest" }, + "ballooned" : { "name" : "mem_esx_ballooned" }, + "shared" : { "name" : "mem_esx_shared" }, + "private" : { "name" : "mem_esx_private" }, +} + check_metrics["check_mk-ibm_svc_nodestats.disk_latency"] = { "read_latency" : { "scale" : m }, "write_latency" : { "scale" : m }, @@ -6249,6 +6289,15 @@ graph_info.append({ graph_info.append({ + "title" : _("Private and shared memory"), + "metrics" : [ + ("mem_esx_shared", "area"), + ("mem_esx_private", "area"), + ], +}) + + +graph_info.append({ "title" : _("TCP Connection States"), "metrics" : [ ( "tcp_listen", "stack"),

8 years, 4 months

3589 FIX Fixed processing of RFC 5424 syslog messages

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b686ebceefae4b255cbe9d1f4ac4b8785f4eb58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b686ebceefae4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 17:58:07 2016 +0200 3589 FIX Fixed processing of RFC 5424 syslog messages --- .werks/3589 | 10 ++++++++++ ChangeLog | 1 + bin/mkeventd | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/.werks/3589 b/.werks/3589 new file mode 100644 index 0000000..8231cb6 --- /dev/null +++ b/.werks/3589 @@ -0,0 +1,10 @@ +Title: Fixed processing of RFC 5424 syslog messages +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464883071 + + diff --git a/ChangeLog b/ChangeLog index 9b8b66d..ffe75f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -468,6 +468,7 @@ * 3026 FIX: Event console: The "Add comment" option of a rule is now able to add the original text (\0) * 3566 FIX: Fixed exception on SNMP MIB management page when MIB directory is missing * 3568 FIX: Fixed broken link in "Access to event status via TCP" help text + * 3589 FIX: Fixed processing of RFC 5424 syslog messages Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/bin/mkeventd b/bin/mkeventd index 2a45ca2..e8c09fb 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2251,6 +2251,7 @@ class EventServer: if "set_contact" in rule and "contact" not in event: event["contact"] = replace_groups(rule["set_contact"], event.get("contact", ""), groups) + def parse_syslog_info(self, line): event = {} # Replaced ":" by ": " here to make tags with ":" possible. This @@ -2270,6 +2271,44 @@ class EventServer: event["pid"] = pid return event + + def parse_rfc5424_syslog_info(self, line): + event = {} + + version, timestamp, hostname, app_name, procid, \ + msgid, rest = line.split(" ", 6) + + # There is no 3339 parsing built into python. We do ignore subseconds and timezones + # here. This is seems to be ok for the moment - sorry. Please drop a note if you + # got a good solutuion for this. + event['time'] = time.mktime(time.strptime(timestamp[:19], '%Y-%m-%dT%H:%M:%S')) + + if hostname != "-": + event["host"] = hostname + + if app_name != "-": + event["application"] = app_name + + if procid != "-": + event["pid"] = procid + + if rest[0] == "[": + # has stuctured data + structured_data, message = rest[1:].split("] ", 1) + elif rest.startswith("- "): + # has no stuctured data + structured_data, message = rest.split(" ", 1) + else: + raise Exception("Invalid RFC 5424 syslog message") + + if structured_data != "-": + event["text"] = "[%s] %s" % (structured_data, message) + else: + event["text"] = message + + return event + + def parse_monitoring_info(self, line): event = {} # line starts with '@' @@ -2362,7 +2401,7 @@ class EventServer: # Variant 4: remote Nagios alert posted by mkevent -n -> syslog # <154>Jul 9 17:28:32 Klapprechner @1341847712;5;Contact Info; MyHost My Service: CRIT - This che - # Variant 5: syslog message (RFC 5424) + # Variant 5: syslog message # Timestamp is RFC3339 with additional restrictions: # - The "T" and "Z" characters in this syntax MUST be upper case. # - Usage of the "T" character is REQUIRED. @@ -2381,6 +2420,9 @@ class EventServer: # Variant 8: syslog message from sophos firewall # <84>2015:03:25-12:02:06 gw pluto[7122]: listening for IKE messages + # Variant 9: syslog message (RFC 5424) + # <134>1 2016-06-02T12:49:05.181+02:00 chrissw7 ChrisApp - TestID - coming from java code + # FIXME: Would be better to parse the syslog messages in another way: # Split the message by the first ":", then split the syslog header part # and detect which information are present. Take a look at the syslog RFCs @@ -2422,6 +2464,10 @@ class EventServer: event['time'] = time.mktime(time.strptime(rfc3339_part[:19], '%Y-%m-%dT%H:%M:%S')) event.update(self.parse_syslog_info(line)) + # Variant 9 + elif len(line) > 24 and line[12] == "T": + event.update(self.parse_rfc5424_syslog_info(line)) + # Variant 8 elif line[10] == '-' and line[19] == ' ': event['host'] = line.split(' ')[1]

8 years, 4 months

added fixes zfs_arc_cache and solaris agent

by Simon Betz

Module: check_mk Branch: master Commit: 8db541bdeb278c57ba3c064a19e31a6bd5495dae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db541bdeb278c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 3 08:16:47 2016 +0200 added fixes zfs_arc_cache and solaris agent --- agents/check_mk_agent.solaris | 15 +++++- checks/zfs_arc_cache | 105 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 105 insertions(+), 15 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 420d0e7..d370448 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -191,10 +191,21 @@ then fi # ZFS arc cache +# newer Solaris (>=11.3) do not provide hits and misses via mdb -k +function get_zfs_arc_cache_data () { + if [ ! -z `echo "::arc" | mdb -k | grep -q "hits"` ] + then + echo "::arc" | mdb -k + else + kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | \ + /usr/gnu/bin/sed -e 's/[ \t][ \t]*/ = /g' + fi +} + if type mdb >/dev/null 2>&1 -then + then echo '<<<zfs_arc_cache>>>' - echo "::arc" | mdb -k + get_zfs_arc_cache_data fi # Processes diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index 1eacf82..bec57d0 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -24,6 +24,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# .--output--------------------------------------------------------------. +# | _ _ | +# | ___ _ _| |_ _ __ _ _| |_ | +# | / _ \| | | | __| '_ \| | | | __| | +# | | (_) | |_| | |_| |_) | |_| | |_ | +# | \___/ \__,_|\__| .__/ \__,_|\__| | +# | |_| | +# '----------------------------------------------------------------------' + # Example output from agent: # <<<zfs_arc_cache>>> # hits = 106259988004 @@ -85,7 +94,7 @@ # arc_meta_limit = 80 MB # arc_meta_max = 2077 MB -# newer output under solaris 11.3 +# newer output under solaris 11.3 with old agent # <<<zfs_arc_cache>>> # size = 46751 MB # target size (c) = 1027788 MB @@ -105,6 +114,73 @@ # mfu_size = 30605 MB # mru_size = 11601 MB +# newer output under solaris 11.3 with updated agent +# <<<zfs_arc_cache>>> +# buf_size = 742832600 +# c = 48841615704 +# c_max = 1077714329600 +# c_min = 4214015904 +# class = misc +# crtime = 6389056,11403263 +# data_freed = 2633453157248 +# data_size = 45014421888 +# deleted = 9360622 +# demand_data_hits = 645028929 +# demand_data_misses = 9656913 +# demand_metadata_hits = 3819285336 +# demand_metadata_misses = 1934895 +# evict_l2_cached = 0 +# evict_l2_eligible = 0 +# evict_l2_ineligible = 607708484608 +# evict_prefetch = 977715200 +# evicted_mfu = 44603686912 +# evicted_mru = 563104797696 +# hash_chain_max = 5 +# hash_chains = 70415 +# hash_collisions = 2812966 +# hash_elements = 1585475 +# hash_elements_max = 1810662 +# hits = 4467022475 +# l2_abort_lowmem = 0 +# l2_cksum_bad = 0 +# l2_feeds = 0 +# l2_hdr_size = 0 +# l2_hits = 0 +# l2_imports = 0 +# l2_io_error = 0 +# l2_misses = 7259729 +# l2_persistence_hits = 0 +# l2_read_bytes = 0 +# l2_rw_clash = 0 +# l2_size = 0 +# l2_write_bytes = 0 +# l2_writes_done = 0 +# l2_writes_error = 0 +# l2_writes_sent = 0 +# memory_throttle_count = 0 +# meta_limit = 0 +# meta_max = 4519225600 +# meta_used = 3836680704 +# mfu_ghost_hits = 27965 +# mfu_hits = 4444241817 +# misses = 11591808 +# mru_ghost_hits = 499269 +# mru_hits = 47780363 +# mutex_miss = 46709 +# other_size = 3058023880 +# p = 15479322529 +# prefetch_behind_prefetch = 429897 +# prefetch_data_hits = 1849310 +# prefetch_joins = 1305700 +# prefetch_meta_size = 35824224 +# prefetch_metadata_hits = 858900 +# prefetch_reads = 3616694 +# prefetch_size = 9486336 +# rawdata_size = 0 +# size = 48851102592 +# snaptime = 6646791,81811455 + +#. # parses agent output in a structure like # {'arc_meta_limit': 80, @@ -118,7 +194,8 @@ def parse_zfs_arc_cache(info): parsed = {} for line in info: if len(line) > 2 and line[1] == "=": - parsed[line[0]] = int(line[2]) + if line[2].isdigit(): + parsed[line[0]] = int(line[2]) return parsed @@ -140,25 +217,27 @@ def inventory_zfs_arc_cache(parsed): def check_zfs_arc_cache(_no_item, _no_params, parsed): - if parsed.get("hits") and parsed.get("misses"): - for key in [ "", "prefetch_data_", "prefetch_metadata_" ]: - human_key = key.replace("_", " ") + # Solaris >= 11.3 do not provide these data pretech_*data + for key in [ "", "prefetch_data_", "prefetch_metadata_" ]: + if "%shits" % key in parsed and "%smisses" % key in parsed: total_hits_misses = parsed["%shits" % key] + parsed["%smisses" % key] - if not total_hits_misses: - yield 0, "No %sHits or Misses" % human_key, \ - [("%shit_ratio" % key, 0, '', '', 0, 100)] + human_key = key.replace("_", " ") - else: + if total_hits_misses: hit_ratio = float(parsed["%shits" % key]) / total_hits_misses * 100 yield 0, "%sHit Ratio: %0.2f%%" % (human_key.title(), hit_ratio), \ [("%shit_ratio" % key, "%0.2f" % hit_ratio, '', '', 0, 100)] - else: - yield 3, "No info about hit ratio available" + + else: + yield 0, "No %sHits or Misses" % human_key, \ + [("%shit_ratio" % key, 0, '', '', 0, 100)] # size if "size" in parsed.keys(): - yield 0, "Cache size: %d MB" % parsed["size"], \ - [("size", parsed["size"] * 1024 * 1024, '', '', 0)] + size_bytes = parsed["size"] * 1024.0 * 1024.0 + size_readable = get_bytes_human_readable(size_bytes) + yield 0, "Cache size: %s" % size_readable, \ + [("size", size_bytes, '', '', 0)] # arc_meta # these values may be missing, this is ok too

8 years, 4 months

Fixed event console related commands through livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 91a72b4759b010e4a36c3f761ab92558fb56c620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a72b4759b010… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 17:00:22 2016 +0200 Fixed event console related commands through livestatus --- web/htdocs/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index a6178cc..9622dca 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -187,7 +187,7 @@ def execute_command(name, args=None, site=None): else: formated_args = "" - query = "[%d] COMMAND %s%s" % (int(time.time()), name, formated_args) + query = "[%d] EC_%s%s" % (int(time.time()), name, formated_args) sites.live().command(query, site)

8 years, 4 months

3139 FIX fixed a couple of minor issues in call to notification scripts

by Sebastian Herbord

Module: check_mk Branch: master Commit: 47579c9de582199dd6731445b43b1d4c0e7f30c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47579c9de58219… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 2 16:54:53 2016 +0200 3139 FIX fixed a couple of minor issues in call to notification scripts The fixed issues are as follows: - in case of a timeout of the notification script, the script is supposed to be terminated. This worked only on python 2.6 and newer - due to timing there was a good chance the exit code of the notification script was ignored - the output of the notification script was buffered in memory until the process exited before being written. Theoretically this could cause high memory usage in the notification processes --- .werks/3139 | 17 +++++++++++++++++ ChangeLog | 1 + modules/notify.py | 22 ++++++++++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.werks/3139 b/.werks/3139 new file mode 100644 index 0000000..b13bdc7 --- /dev/null +++ b/.werks/3139 @@ -0,0 +1,17 @@ +Title: fixed a couple of minor issues in call to notification scripts +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464879023 + +The fixed issues are as follows: + - in case of a timeout of the notification script, the script is supposed to be + terminated. This worked only on python 2.6 and newer + - due to timing there was a good chance the exit code of the notification script + was ignored + - the output of the notification script was buffered in memory until the process + exited before being written. Theoretically this could cause high memory usage + in the notification processes diff --git a/ChangeLog b/ChangeLog index 2dfe84c..9b8b66d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -426,6 +426,7 @@ * 3418 FIX: Do not send host notifications if a service group is required... NOTE: Please refer to the migration notes! * 3426 FIX: sms: fixed wrong message handling after message was quoted and therefore too long + * 3139 FIX: fixed a couple of minor issues in call to notification scripts... BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/modules/notify.py b/modules/notify.py index 6aff383..7ef1915 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1164,21 +1164,27 @@ def call_notification_script(plugin, plugin_context): p = subprocess.Popen([path], shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=notification_script_env(plugin_context)) - for line in p.stdout: - plugin_log("Output: %s" % line.rstrip().decode('utf-8')) - - exitcode = p.returncode + while True: + # read and output stdout linewise to ensure we don't force python to produce + # one - potentially huge - memory buffer + line = p.stdout.readline() + if line != '': + plugin_log("Output: %s" % line.rstrip().decode('utf-8')) + else: + break + # the stdout is closed but the return code may not be available just yet - wait for the + # process to actually finish + exitcode = p.wait() clear_notification_timeout() except NotificationTimeout: plugin_log("Notification plugin did not finish within %d seconds. Terminating." % notification_plugin_timeout) - p.kill() + # p.kill() requires python 2.6! + os.kill(p.pid, signal.SIGTERM) exitcode = 1 - if exitcode: + if exitcode != 0: plugin_log("Plugin exited with code %d" % exitcode) - else: - exitcode = 0 return exitcode

8 years, 4 months

Logging queries to event console in verbose mode to mkeventd.log now

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b778ae6eaacd3565a1f4165381189fd5f8360ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b778ae6eaacd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:48:30 2016 +0200 Logging queries to event console in verbose mode to mkeventd.log now --- bin/mkeventd | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/mkeventd b/bin/mkeventd index c5722b6..2a45ca2 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2674,6 +2674,7 @@ class StatusServer: def handle_client(self, socket, allow_commands, client_ip): for query in Queries(socket): + verbose("Query: %s" % "\\n".join(query)) parts = query[0].split(None, 1) if len(parts) != 2: raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)")

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016