Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: mknotifyd: intermediate state

by Mathias Kettner

Module: check_mk Branch: master Commit: d96bfd184bc82952eb110c49ca0200c4fd24d3b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d96bfd184bc829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 15:39:51 2013 +0100 mknotifyd: intermediate state --- mknotifyd/omd/MKNOTIFYD.hook | 4 ++-- mknotifyd/omd/logrotate.conf | 5 ----- mknotifyd/web/plugins/wato/mknotifyd.py | 1 + modules/check_mk.py | 8 +------- modules/notify.py | 20 ++++++++++---------- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/mknotifyd/omd/MKNOTIFYD.hook b/mknotifyd/omd/MKNOTIFYD.hook index c769805..7d0409c 100755 --- a/mknotifyd/omd/MKNOTIFYD.hook +++ b/mknotifyd/omd/MKNOTIFYD.hook @@ -1,9 +1,9 @@ #!/bin/bash -# Alias: Start Daemon for Check_MK Notify +# Alias: Start Check_MK Notification Spooler # Menu: Addons # Description: -# This option enables mknotifyd +# This option enables the Check_MK notification spooler case "$1" in default) diff --git a/mknotifyd/omd/logrotate.conf b/mknotifyd/omd/logrotate.conf index 68caaaf..bca3d9c 100644 --- a/mknotifyd/omd/logrotate.conf +++ b/mknotifyd/omd/logrotate.conf @@ -4,9 +4,4 @@ compress delaycompress notifempty - sharedscripts - olddir mkeventd - postrotate - echo "COMMAND REOPENLOG" | unixcat ###ROOT###/tmp/run/mkeventd/status - endscript } diff --git a/mknotifyd/web/plugins/wato/mknotifyd.py b/mknotifyd/web/plugins/wato/mknotifyd.py index 80162cf..04b88bc 100644 --- a/mknotifyd/web/plugins/wato/mknotifyd.py +++ b/mknotifyd/web/plugins/wato/mknotifyd.py @@ -29,6 +29,7 @@ import config try: mknotifyd_enabled = config.mknotifyd_enabled except: + # Non OMD-users: always show Spooling options mknotifyd_enabled = True config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" diff --git a/modules/check_mk.py b/modules/check_mk.py index 9112a5b..6c1ea0b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -319,11 +319,6 @@ host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command check_periods = [] -# Notification Spooling -notification_spooling = False -notification_spool_to = None - - # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -346,7 +341,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of that is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp' ] + modules = [ 'check_mk_base', 'snmp', 'notify' ] for module in modules: filename = modules_dir + "/" + module + ".py" execfile(filename) @@ -4862,7 +4857,6 @@ if __name__ == "__main__": do_automation(a, args) done = True elif o == '--notify': - execfile(modules_dir + "/notify.py") sys.exit(do_notify(args)) except MKGeneralException, e: diff --git a/modules/notify.py b/modules/notify.py index 697b3f3..3f093fb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -42,6 +42,11 @@ notification_spooldir = var_dir + "/notify/spool" notification_log = notification_logdir + "/notify.log" notification_logging = 0 +# Notification Spooling +notification_spooling = False +notification_spool_to = None + + notification_log_template = \ u"$CONTACTNAME$ - $NOTIFICATIONTYPE$ - " \ u"$HOSTNAME$ $HOSTSTATE$ - " \ @@ -175,7 +180,7 @@ def notify_usage(): sys.stderr.write("""Usage: check_mk --notify check_mk --notify fake-service <plugin> check_mk --notify fake-host <plugin> - check_mk --notify filename <spool_filename> + check_mk --notify spoolfile <filename> Normally the notify module is called without arguments to send real notification. But there are situations where this module is called with @@ -186,8 +191,8 @@ Available commands: notification data of a service notification. fake-host <plugin> ... Calls the given notification plugin with fake notification data of a host notification. - spoolfile <spool_filename> ... Reads the given spoolfile and creates a - notification event out of its data + spoolfile <filename> ... Reads the given spoolfile and creates a + notification out of its data """) @@ -198,7 +203,6 @@ def create_spoolfile(data): os.makedirs(target_dir) file_path = "%s/%0.2f_%s" % (target_dir, time.time(), uuid.uuid1()) notify_log("Creating spoolfile: %s" % file_path) - # TODO: pprint entfernen file(file_path,"w").write(pprint.pformat(data)) def get_readable_rel_date(timestamp): @@ -360,18 +364,14 @@ def do_notify(args): sys.exit(1) notify_log("forward mode %s" % notification_forward_mode) - # TODO: + # TODO: Umbauen auf neue Parameter if notification_forward_mode in ["forward", "forward_exclusive"]: # Create spoolfile create_spoolfile({"context": context, "forward": notification_forward_to}) if notification_forward_mode == "forward_only": return 0 - try: - write_into_spoolfile = config.mknotifyd_enabled - except: - write_into_spoolfile = False - process_context(context, write_into_spoolfile) + process_context(context, notification_spooling) except Exception, e: if g_interactive: raise

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: Broke some things in settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e4924ad44d1dbfaf133c7f3ace08ed3590b2c4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4924ad44d1db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 12:30:05 2013 +0100 mknotifyd: Broke some things in settings --- mknotifyd/web/plugins/wato/mknotifyd.py | 80 +++++++++++++----------------- modules/check_mk.py | 9 +++- modules/notify.py | 9 ++-- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/mknotifyd/web/plugins/wato/mknotifyd.py b/mknotifyd/web/plugins/wato/mknotifyd.py index e255464..80162cf 100644 --- a/mknotifyd/web/plugins/wato/mknotifyd.py +++ b/mknotifyd/web/plugins/wato/mknotifyd.py @@ -29,20 +29,16 @@ import config try: mknotifyd_enabled = config.mknotifyd_enabled except: - mknotifyd_enabled = False + mknotifyd_enabled = True config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" -def log_mkeventd(what, message): - log_entry(None, what, message, "audit.log") # central WATO audit log - log_entry(None, what, message, "mknotify.log") # pending changes for mknotifyd - if mknotifyd_enabled: group = _("Notification") # Check_MK var register_configvar(group, - "notification_spooling_enabled", + "notification_spooling", Checkbox( title = _("Spool notifications"), help = _("Here you can set if notifications are processed through a spooling mechanism." @@ -53,6 +49,36 @@ if mknotifyd_enabled: domain = "check_mk" ) + # Check_MK var + register_configvar(group, + "notification_spool_to", + Optional( + Tuple( + elements = [ + TextAscii( + title = _("Remote host"), + ), + Integer( + title = _("TCP port"), + minvalue = 1, + maxvalue = 65535, + default_value = 6555, + ), + Checkbox( + title = _("Local processing"), + label = _("Also process notification locally"), + ), + ]), + title = _("Remote notification spooling"), + help = _("This option allows you to forward notifications to another Check_MK site. " + "That site must have the notification spooler running and TCP listening enabled. " + "This allows you to create a centralized notification handling."), + label = _("Spool notifications to remote site"), + none_label = _("(Do not spool to remote site)"), + ), + domain = "check_mk" + ) + # Daemon var register_configvar_domain("mknotifyd", config_dir) register_configvar(group, @@ -70,50 +96,14 @@ if mknotifyd_enabled: ) - # Check_MK var - register_configvar(group, - "notification_forward_mode", - DropdownChoice( - title = _("Forwarding mode"), - help = _("How notifications should be forwarded<br>" - "No Forwarding: Notifications are processed locally according to the contact settings<br>" - "Forward an process local: Notifications are forwarded to the configured remote site, " - "but also processed locally according to the contacts settings<br>" - "Exclusive forwarding: Notifications are forwarded to the configured remote site and " - "never processed on the local site. This means that the configured notification plugins " - "for the local contacts do not apply" - ), - choices = [ - ('off', _("No Forwarding")), - ('forward' , _("Forward and process local")), - ('forward_exclusive', _("Exclusive forwarding")) - ]), - domain = "check_mk" - ) - - # Check_MK var - register_configvar(group, - "notification_forward_to", - Optional( - TextAscii( - title = _("{Host}:{Port}") - ), - title = _("Forward notifications to remote host"), - help = _("This will forward notifications to a remote site"), - label = _("Forward to remote host"), - none_label = _("Do not send to remote host"), - ), - domain = "check_mk" - ) - # Daemon var register_configvar(group, "notification_daemon_listen_port", Integer( title = _("Port for receiving notifications"), - help = _("Here you can set port at which the mknotifyd listens for forwarded" - "notification messages. The port number needs to be between 1025 and 65535"), - minvalue = 1025, + help = _("Here you can set port at which the notification spooler listens for forwarded" + "notification messages from spoolers on remote sites."), + minvalue = 1, maxvalue = 65535, default_value = 6555, ), diff --git a/modules/check_mk.py b/modules/check_mk.py index 5d7a3a0..9112a5b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -319,6 +319,12 @@ host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command check_periods = [] +# Notification Spooling +notification_spooling = False +notification_spool_to = None + + + # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -340,7 +346,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of that is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify' ] + modules = [ 'check_mk_base', 'snmp' ] for module in modules: filename = modules_dir + "/" + module + ".py" execfile(filename) @@ -4856,6 +4862,7 @@ if __name__ == "__main__": do_automation(a, args) done = True elif o == '--notify': + execfile(modules_dir + "/notify.py") sys.exit(do_notify(args)) except MKGeneralException, e: diff --git a/modules/notify.py b/modules/notify.py index d5f6556..697b3f3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -33,17 +33,15 @@ # encoded one) and can use any of the variables contact, email, # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s + import pprint, uuid + # Default settings notification_logdir = var_dir + "/notify" notification_spooldir = var_dir + "/notify/spool" notification_log = notification_logdir + "/notify.log" notification_logging = 0 -notification_spooling_enabled = False -notification_forward_to = "" -notification_forward_mode = "off" - notification_log_template = \ u"$CONTACTNAME$ - $NOTIFICATIONTYPE$ - " \ u"$HOSTNAME$ $HOSTSTATE$ - " \ @@ -362,10 +360,11 @@ def do_notify(args): sys.exit(1) notify_log("forward mode %s" % notification_forward_mode) + # TODO: if notification_forward_mode in ["forward", "forward_exclusive"]: # Create spoolfile create_spoolfile({"context": context, "forward": notification_forward_to}) - if notification_forward_mode == "forward_exclusive": + if notification_forward_mode == "forward_only": return 0 try:

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: removed obsolete test script

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a576aa3693b067ebbd5d3a82b2dd43a0d9c95de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a576aa3693b06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 11:56:48 2013 +0100 mknotifyd: removed obsolete test script --- mknotifyd/bin/clienttest | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/mknotifyd/bin/clienttest b/mknotifyd/bin/clienttest deleted file mode 100755 index 1816aad..0000000 --- a/mknotifyd/bin/clienttest +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python -# encoding: utf-8 - -import socket, os, time, sys, getopt, signal, thread, pprint, re, select, subprocess, stat, pickle -from pwd import getpwnam -from grp import getgrnam - -if len(sys.argv) == 2: - filename = sys.argv[1] -else: - filename = None - -sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -sock.settimeout(10) -sock.connect(("localhost", 7010)) - -if not filename: - sock.send(pickle.dumps([1,2,3,5,6])) -else: - sock.send(pickle.dumps(eval(file(filename).read()))) - -response_text = "" -while True: - chunk = sock.recv(8192) - response_text += chunk - if not chunk: - break - -print response_text - - -

11 years, 7 months

Check_MK Git: check_mk: Move opcmsg to doc/treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c772af2d32e8475be5ea86ca0a2a5a4c3d59783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c772af2d32e84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 11:13:41 2013 +0100 Move opcmsg to doc/treasures --- {notifications => doc/treasures}/opcmsg | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/notifications/opcmsg b/doc/treasures/opcmsg similarity index 94% rename from notifications/opcmsg rename to doc/treasures/opcmsg index f01e811..cc2bd39 100755 --- a/notifications/opcmsg +++ b/doc/treasures/opcmsg @@ -1,7 +1,9 @@ #!/usr/bin/python # Create message for HPOpenView -# This plugin forwards the notification to the +# This notification plugin forwards the notification to the # local HPOpenView instance +# +# Note: Some paths are still hardcoded here. import os, sys, re

11 years, 7 months

Check_MK Git: check_mk: FIX: fix exception in BI-Boxes views of host groups

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cc02ec6bc286cde27a0e858e8f1b00bb25069d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cc02ec6bc286c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 22:10:37 2013 +0100 FIX: fix exception in BI-Boxes views of host groups Conflicts: ChangeLog --- ChangeLog | 4 ++++ web/plugins/views/bi.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ade006..084289d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 1.2.3i1: +1.2.2b2: + BI: + * FIX: fix exception in BI-Boxes views of host groups + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 843a4a1..36bbb5d 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -283,7 +283,8 @@ multisite_painters["aggr_treestate_boxed"] = { "title" : _("Aggregation: simplistic boxed layout"), "short" : _("Tree"), "columns" : [ "aggr_treestate", "aggr_hosts" ], - "paint" : lambda row: paint_aggr_tree_foldable(row, boxes = True, omit_root = True), + "paint" : lambda row: bi.render_tree_foldable(row, boxes=True, omit_root=True, + expansion_level=bi.load_ex_level(), only_problems=False, lazy=True), } # _____ _ _ _

11 years, 7 months

Check_MK Git: check_mk: Switched to version 1.2.3i1

by Mathias Kettner

Module: check_mk Branch: master Commit: 501843b8ad6a3937f4bfa0f21041071972b0215e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=501843b8ad6a39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 21:14:58 2013 +0100 Switched to version 1.2.3i1 --- ChangeLog | 2 ++ 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 110592 -> 111104 bytes agents/windows/crash.exe | Bin 20536 -> 20024 bytes agents/windows/install_agent.exe | Bin 125403 -> 129333 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 23023 -> 22511 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77cc286..0ade006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i1: + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/Makefile b/Makefile index d963d9a..7473356 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.2b1 +VERSION = 1.2.3i1 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 4b67cce..26615e0 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.2b1 +echo Version: 1.2.3i1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 8153175..0eaa990 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.2b1 +echo Version: 1.2.3i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 4766c5d..0fceaa7 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.2b1 +echo Version: 1.2.3i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 10c9ba7..73b80a1 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.2b1 +echo Version: 1.2.3i1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 83622c8..8056905 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.2b1 +echo Version: 1.2.3i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 1a71e03..16b9a04 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.2b1 +echo Version: 1.2.3i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 8c8c04b..2203fee 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.2b1 +echo Version: 1.2.3i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 237ed71..c1a53f4 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.2b1" +$say "Version: 1.2.3i1" $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 709c437..dc04280 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.2b1 +echo Version: 1.2.3i1 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d6bf6dd..1697919 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.2b1" +#define CHECK_MK_VERSION "1.2.3i1" #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 996e979..5ac572e 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 ad38e15..767e1f9 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 f14b384..575166b 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 57a56f5..2f5bac7 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.2b1" +!define CHECK_MK_VERSION "1.2.3i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index adbf057..c350ecc 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 84e9310..ac3e471 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.2b1-1_all.deb net optional +check-mk_1.2.3i1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 771851c..bb86ade 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.2b1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i1], [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 fa58bff..5ba25a1 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.2b1" +VERSION="1.2.3i1" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 9c49bed..3f40561 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.2b1 +VERSION=1.2.3i1 NAME=check_mk LANG= LC_ALL=

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 456963a6c962ccef76e260d44bcb0cf8ffff9817 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=456963a6c962cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 21:13:34 2013 +0100 Merge branch 'reporting' of ssh://mathias-kettner.de/check_mk into reporting ---

11 years, 7 months

Check_MK Git: check_mk: WATO BI: switch from GET to POST

by Mathias Kettner

Module: check_mk Branch: master Commit: 944d7488b373852615a01ddd5c02b9562a34c965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944d7488b37385… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 11:36:33 2013 +0100 WATO BI: switch from GET to POST --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 633d589..b1332a7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12081,7 +12081,7 @@ def mode_bi_edit_rule(phase): else: value = aggregation_rules[ruleid] - html.begin_form("birule") + html.begin_form("birule", method="POST") vs_rule.render_input("rule", value) forms.end() html.hidden_fields()

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' into reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: cd163af81a1f28b39357fb01540a81915be5bfce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd163af81a1f28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 21:13:26 2013 +0100 Merge branch 'master' into reporting ---

11 years, 7 months

Check_MK Git: check_mk: First version of WATO-configurable datasource programs

by Mathias Kettner

Module: check_mk Branch: master Commit: c9c465558651b776babc8ca3fa64616db70dec25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c465558651b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 16:09:47 2013 +0100 First version of WATO-configurable datasource programs --- agents/special/agent_vsphere | 77 +++++++++++++++++++++++++++++++ checks/agent_vsphere | 45 ++++++++++++++++++ modules/check_mk.py | 12 +++++ web/plugins/wato/datasource_programs.py | 75 ++++++++++++++++++++++++++++++ 4 files changed, 209 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9c4655586…

11 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013