Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64366 discussions

Check_MK Git: check_mk: mkeventd: performance optimization for check_mkevents

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4496ac8931e30ed1729e0b34c0b86fd3fe2e497 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4496ac8931e30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 11:04:06 2012 +0100 mkeventd: performance optimization for check_mkevents --- mkeventd/bin/mkeventd | 20 +++++++++++++++----- mkeventd/web/plugins/sidebar/mkeventd.py | 9 ++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6fdff42..0ad51e8 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -523,7 +523,7 @@ class Perfcounters: if counter not in self._times: self._times[counter] = ptime else: - weight = self._weights(counter) + weight = self._weights[counter] self._times[counter] *= weight self._times[counter] += (1.00 - weight) * ptime @@ -1609,17 +1609,23 @@ class StatusServer: raise MKClientError("Invalid table %s, we only have 'events', 'history' and 'status'" % table) filters = [] + only_host = None for line in headerlines: try: header, argument = line.rstrip().split(":", 1) argument = argument.strip() if header == "Filter": - filters.append(self.parse_filter(argument, columns)) + name, opfunc, argument = self.parse_filter(argument, columns) + # Needed for later optimization + if name == "event_host" and filter_operators['=']: + only_host = argument + filters.append((name, opfunc, argument)) + except Exception, e: raise MKClientError("Invalid header line '%s': %s" % (line.rstrip(), e)) if table == "events": - headers, list_rows = g_event_status.get_events() + headers, list_rows = g_event_status.get_events(only_host) elif table == "history": headers, list_rows = get_event_history(filters) else: @@ -2007,9 +2013,12 @@ class EventStatus(): return raise MKClientError("No event with id %s" % event_id) - def get_events(self): + def get_events(self, only_host = None): result = [] for event in self._events: + # A small optimization for check_mkevents + if only_host and event["host"] != only_host: + continue event_line = [] for col_name, col_default in event_columns: without_prefix = col_name[6:] # drop event_ @@ -2225,7 +2234,8 @@ def load_master_config(): log("Replication: restored %d rules and %d actions from %s" % (len(config["rules"]), len(config["actions"]), path)) except: - log("Replication: no previously saved master state available") + if is_replication_slave(): + log("Replication: no previously saved master state available") def get_state_from_master(): diff --git a/mkeventd/web/plugins/sidebar/mkeventd.py b/mkeventd/web/plugins/sidebar/mkeventd.py index 97b92f2..279e722 100644 --- a/mkeventd/web/plugins/sidebar/mkeventd.py +++ b/mkeventd/web/plugins/sidebar/mkeventd.py @@ -52,22 +52,25 @@ def render_mkeventd_performance(): # Hit rate try: - write_line(_("Rule hit ratio"), "%.2f%%" % ( + write_line(_("Rule hit ratio"), "%.2f %%" % ( data["status_average_rule_hit_rate"] / data["status_average_rule_trie_rate"] * 100)) except: # division by zero + write_line(_("Rule hit ratio"), _("-.-- %")) pass # Time columns time_columns = [ (_("Processing time per message"), "processing"), - (_("Processing time per client request"), "request"), - (_("Replication synchronization (avg)"), "sync"), + (_("Tiime per client request"), "request"), + (_("Replication synchronization"), "sync"), ] for title, name in time_columns: value = data.get("status_average_%s_time" % name) if value: write_line(title, "%.2f ms" % (value * 1000)) + else: + write_line(title, _("-.-- ms")) html.write("</table>\n") if mkeventd_enabled:

11 years, 10 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d814e882016085f56a8038288b79d23821980a08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d814e882016085… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:43 2012 +0100 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49b9041..54df6e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.1i3: + Event Console: + * New performance counter for client request processing time 1.2.1i2:

11 years, 10 months

Check_MK Git: check_mk: Small fix in doc/helpers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c0f22391e809823ca3ec86b7a104ac11439eef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0f22391e8098… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 09:56:20 2012 +0100 Small fix in doc/helpers --- doc/helpers/figheader | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/helpers/figheader b/doc/helpers/figheader index 41abf0f..d94fc14 100755 --- a/doc/helpers/figheader +++ b/doc/helpers/figheader @@ -27,8 +27,10 @@ if sys.argv[1].startswith("-"): width = 76 sepmid = sep + '-' * (width - len(sep) - 1) + '+' -print first + '-' * (width - len(first) - 1) + '.' -for line in os.popen("figlet -c -w %d '%s'" % (width - 7, " ".join(sys.argv[1:])), "r"): +title = " ".join(sys.argv[1:]) +first_line = first + "-" + title +print first_line + '-' * (width - len(first_line) - 1) + '.' +for line in os.popen("figlet -c -w %d '%s'" % (width - 7, title), "r"): line = line[:-1] print (cont + "|%-" + str(width - len(cont) - 2) + "s|") % line print sepmid

11 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad2b54bb665798042f4c982a59bbb3bc6084061f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad2b54bb665798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:17 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: mkeventd: cleaned up perf-statistics code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dc3e940bfb44ff03877d6609dc1aedadc0eecc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dc3e940bfb44f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:02 2012 +0100 mkeventd: cleaned up perf-statistics code Also new counter for client request processing time --- mkeventd/bin/mkeventd | 167 ++++++++++++++++++------------ mkeventd/web/plugins/sidebar/mkeventd.py | 29 ++++-- 2 files changed, 124 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8dc3e940bf…

11 years, 10 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f9e11182b65b0519aecd477c91cb99854fbc0a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9e11182b65b0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Nov 17 19:37:55 2012 +0100 Add new bug entry --- .bugs/811 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/811 b/.bugs/811 new file mode 100644 index 0000000..64c419c --- /dev/null +++ b/.bugs/811 @@ -0,0 +1,11 @@ +Title: Multisite does not display local check man pages +Component: multisite +State: open +Date: 2012-11-16 10:39:32 +Targetversion: 1.2.0 +Class: bug + +If you install an MKP and it brings a check man page this man page is not +displayed from Multisite, instead it gives an error about not finding the +check man page in the default path. It would be good if multisite could +also check the local/ structure for existing man pages

11 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c1877ce83b9949ee0bb3d4fc3034686fc393ad9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c1877ce83b994… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Nov 17 19:37:59 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: FreeBSD Agent: tcp_conn_stats no longer looking at wrong value

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7897c335b3087225fa6b4248e494ab653f684f23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7897c335b30872… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Nov 17 19:36:44 2012 +0100 FreeBSD Agent: tcp_conn_stats no longer looking at wrong value --- agents/check_mk_agent.freebsd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index f6b863f..7a16ddc 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -266,7 +266,7 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -netstat -na | awk ' /^tcp/ { c[$7]++; } END { for (x in c) { print x, c[x]; } }' +netstat -na | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' # Postfix mailqueue monitoring

11 years, 10 months

Check_MK Git: check_mk: Switched version to 1.2.1i3

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d57d6feec3045d3c15c9eaa8e888a7ce75d7c67a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d57d6feec3045d… Author: mkde <support(a)mathias-kettner.de> Date: Fri Nov 16 16:29:08 2012 +0100 Switched version to 1.2.1i3 --- ChangeLog | 3 +++ Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 109568 -> 109056 bytes agents/windows/crash.exe | Bin 20024 -> 20536 bytes agents/windows/install_agent.exe | Bin 129945 -> 124669 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 23023 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7d4a27..49b9041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +1.2.1i3: + + 1.2.1i2: Core: * Improved validation of inventory data reported by checks diff --git a/Makefile b/Makefile index 1bca5a2..ddc8abe 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.1i2 +VERSION = 1.2.1i3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 61f12a8..da7951f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -40,7 +40,7 @@ LOCALDIR=$MK_LIBDIR/local export LC_NUMERIC="en_US" echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index f6b863f..17abe08 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index fd1dd26..20633cc 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f296765..70b3a54 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 8f6c538..a3f7793 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 48e1f2a..5fe670c 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index fd6b0b9..81518d1 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index c3094df..40c8506 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.1i2" +$say "Version: 1.2.1i3" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0e0f9d5..cb81488 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -41,7 +41,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.1i2 +echo Version: 1.2.1i3 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ff0b467..87d225f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -74,7 +74,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.1i2" +#define CHECK_MK_VERSION "1.2.1i3" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c137d77..0a1d0a7 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index d301ec9..d44f87b 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5f5f52d..de616c5 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 4b02b35..e12fd69 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.1i2" +!define CHECK_MK_VERSION "1.2.1i3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 22f202b..b647bce 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 348cc14..63a2211 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.1i2-1_all.deb net optional +check-mk_1.2.1i3-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 86f5208..ebbef35 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.1i2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.1i3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index b8b4d94..62f03ed 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.1i2" +VERSION="1.2.1i3" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index fa6a2e8..247a457 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.1i2 +VERSION=1.2.1i3 NAME=check_mk LANG= LC_ALL=

11 years, 10 months

Check_MK Git: check_mk: Fix building of RPMS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ddf85fa9ded2cbd22153c060485897860a3fa81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddf85fa9ded2c… Author: mkde <support(a)mathias-kettner.de> Date: Fri Nov 16 15:59:00 2012 +0100 Fix building of RPMS --- check_mk.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 37bb5fc..0a2eb78 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -144,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/check_mk /usr/share/check_mk/agents /usr/share/check_mk/checks +/usr/share/check_mk/notifications /usr/share/check_mk/modules /usr/share/check_mk/pnp-templates/* /usr/share/check_mk/check_mk_templates.cfg

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits