Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

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: 3021dea6cc3107bd2f1ec2ca54d4f279c39e06aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3021dea6cc3107… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 11:21:08 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Fixed copy and paste issue

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ce40d66fcad20929110ecf57a7cabe904d077537 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce40d66fcad209… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 19 10:57:29 2012 +0200 Fixed copy and paste issue --- doc/treasures/mail_mkevent.py | 1 - doc/treasures/snmptd_mkevent.py | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/treasures/mail_mkevent.py b/doc/treasures/mail_mkevent.py index 58269d2..fa97bb6 100755 --- a/doc/treasures/mail_mkevent.py +++ b/doc/treasures/mail_mkevent.py @@ -36,4 +36,3 @@ for i in range(numMessages): M.dele(i+1) M.quit() - diff --git a/doc/treasures/snmptd_mkevent.py b/doc/treasures/snmptd_mkevent.py index 69c0c4d..9f3f36a 100755 --- a/doc/treasures/snmptd_mkevent.py +++ b/doc/treasures/snmptd_mkevent.py @@ -20,4 +20,3 @@ out = open(deamon_path, "w") timestamp = time.strftime("%b %d %H:%M:%S", time.localtime(time.time())) out.write("<5>%s %s trap: %s" % (timestamp, host, msg)) out.close() -~

12 years, 1 month

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: c8834eba2fe9d47355603140af12a7422d70b989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8834eba2fe9d4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 19 07:42:48 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Added SNMP and MAIL script for mkeventd

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6bd851e88861bce26b503813baf08248927c6f23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bd851e88861bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 18 17:02:25 2012 +0200 Added SNMP and MAIL script for mkeventd --- doc/treasures/mail_mkevent.py | 39 +++++++++++++++++++++++++++++++++++++++ doc/treasures/snmptd_mkevent.py | 23 +++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/doc/treasures/mail_mkevent.py b/doc/treasures/mail_mkevent.py new file mode 100755 index 0000000..58269d2 --- /dev/null +++ b/doc/treasures/mail_mkevent.py @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +#This script sends all mails from given mailbox +#to the mkeventd pipe of given OMD Installation +# +# Bastian Kuhn, bk(a)mathias-kettner.de +import poplib +import time + +pop3_server = "localhost" +mail_user = "USER" +mail_pass = "mail" +site_name = "SITE" +deamon_path = "/omd/sites/%s/tmp/run/mkeventd/events" % site_name + + +M = poplib.POP3(pop3_server) +M.user(mail_user) +M.pass_(mail_pass) +numMessages = len(M.list()[1]) +for i in range(numMessages): + host = "not_found" + msg = "" + found_host = False + for line in M.retr(i+1)[1]: + if found_host == False and line.split()[0] == "From:": + host = line.split()[1].split('@')[1] + host = host.replace('>','') + found_host = True + msg += line + out = open(deamon_path, "w") + timestamp = time.strftime("%b %d %H:%M:%S", time.localtime(time.time())) + out.write("<5>%s %s mail: %s" % (timestamp, host, msg)) + out.close() + M.dele(i+1) +M.quit() + + diff --git a/doc/treasures/snmptd_mkevent.py b/doc/treasures/snmptd_mkevent.py new file mode 100755 index 0000000..69c0c4d --- /dev/null +++ b/doc/treasures/snmptd_mkevent.py @@ -0,0 +1,23 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +#This script is called by snmptrapd and sends +#all traps to the mkeventd +# +# Bastian Kuhn, bk(a)mathias-kettner.de +import time +import sys + +site_name = "SITE" +deamon_path = "/omd/sites/%s/tmp/run/mkeventd/events" % site_name + +data = [] +for line in sys.stdin: + data.append(line.strip()) +msg = " ".join(data[2:]) +host, ip = data[:2] +out = open(deamon_path, "w") +timestamp = time.strftime("%b %d %H:%M:%S", time.localtime(time.time())) +out.write("<5>%s %s trap: %s" % (timestamp, host, msg)) +out.close() +~

12 years, 1 month

Check_MK Git: check_mk: Added rules for Notes Url to wato

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d2a0aec455a6c79291d9fb968e6cf165c818623 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d2a0aec455a6c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 18 16:48:35 2012 +0200 Added rules for Notes Url to wato --- web/plugins/wato/check_mk_configuration.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 951d479..7f08b67 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -799,6 +799,7 @@ register_rule(group, none_label = _("disabled"), none_value = 0, ), + itemtype = "service") register_rule(group, @@ -822,6 +823,27 @@ register_rule(group, ), itemtype = "service") + +register_rule(group, + "extra_service_conf:notes_url", + TextAscii( + label = _("Url:"), + title = _("Notes url for Services"), + help = _("With this setting you can set links to documentations " + "for each service"), + ), + itemtype = "service") + +register_rule(group, + "extra_host_conf:notes_url", + TextAscii( + label = _("Url:"), + title = _("Notes url for Hosts"), + help = _("With this setting you can set links to documentations " + "for Hosts"), + ), + ) + group = "monconf/Inventory and Check_MK settings" register_rule(group,

12 years, 1 month

Check_MK Git: check_mk: ValueSpec Foldable: allow dynamic title function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14dea711a14fd97c6be58517953f5e2cef5c54c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14dea711a14fd9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 18 17:00:50 2012 +0200 ValueSpec Foldable: allow dynamic title function --- web/htdocs/valuespec.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 650f3ee..78ef4b4 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1953,10 +1953,15 @@ class Foldable(ValueSpec): ValueSpec.__init__(self, **kwargs) self._valuespec = valuespec self._open = kwargs.get("open", False) + self._title_function = kwargs.get("title_function", None) def render_input(self, varprefix, value): + if self._title_function: + title = self._title_function(value) + else: + title = self._valuespec.title() html.begin_foldable_container("valuespec_foldable", varprefix, self._open, - self._valuespec.title(), False) + title, False) html.help(self._valuespec.help()) self._valuespec.render_input(varprefix, value) html.end_foldable_container()

12 years, 1 month

Check_MK Git: check_mk: FIX: complex list widgets (ListOf) lost remaining entries after deleting one

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d50b37f432d7d92bbca55176911096daa81cbe6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d50b37f432d7d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 18 16:46:38 2012 +0200 FIX: complex list widgets (ListOf) lost remaining entries after deleting one --- ChangeLog | 1 + web/htdocs/valuespec.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c07d28c..d853353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * FIX: Remove also user settings and event console rule on factory reset * FIX: complex list widgets (ListOf) failed back to old value when complaining + * FIX: complex list widgets (ListOf) lost remaining entries after deleting one BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3457868..650f3ee 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -665,13 +665,13 @@ class ListOf(ValueSpec): return s + '</table>' def from_html_vars(self, varprefix): + count = int(html.var(varprefix + "_count")) n = 1 indexes = {} - while True: + while n <= count: indexof = html.var(varprefix + "_indexof_%d" % n) - if indexof == None: - break - indexes[int(indexof)] = n + if indexof != None: # deleted entry + indexes[int(indexof)] = n n += 1 value = []

12 years, 1 month

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: c01599be92c556aa9ff54cec3e0e7f00b94c1af1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c01599be92c556… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 18 16:01:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: I18n'ed some strings in column painters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8bd827d3968014daa407cb784599751da96960f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bd827d3968014… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 18 10:25:51 2012 +0200 I18n'ed some strings in column painters --- web/plugins/views/painters.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9bce496..25ab292 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1502,21 +1502,21 @@ multisite_painters["downtime_fixed"] = { "title" : _("Downtime is fixed"), "short" : _("Fixed"), "columns" : ["downtime_fixed"], - "paint" : lambda row: (None, row["downtime_fixed"] == 0 and "flexible" or "fixed"), + "paint" : lambda row: (None, row["downtime_fixed"] == 0 and _("flexible") or _("fixed")), } multisite_painters["downtime_what"] = { "title" : _("Downtime type (host/service)"), "short" : _("Type"), "columns" : ["is_service"], - "paint" : lambda row: (None, row["is_service"] and "Service" or "Host"), + "paint" : lambda row: (None, row["is_service"] and _("Service") or _("Host")), } multisite_painters["downtime_type"] = { "title" : _("Downtime active or pending"), "short" : _("act/pend"), "columns" : ["downtime_type"], - "paint" : lambda row: (None, row["downtime_type"] == 0 and "active" or "pending"), + "paint" : lambda row: (None, row["downtime_type"] == 0 and _("active") or _("pending")), } multisite_painters["downtime_entry_time"] = {

12 years, 1 month

Check_MK Git: check_mk: New small time computing helper for Windows (nowin. exe)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff406deff55c53e7ef2014113529b9ef4f562ebb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff406deff55c53… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 17 12:17:37 2012 +0200 New small time computing helper for Windows (nowin.exe) --- agents/windows/Makefile | 5 ++++- agents/windows/nowin.cc | 24 ++++++++++++++++++++++++ agents/windows/nowin.exe | Bin 0 -> 22511 bytes 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 31a2105..fb90e88 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,7 +28,7 @@ else CXX = mingw32-g++ endif -install_agent.exe: check_mk_agent.exe crash.exe +install_agent.exe: check_mk_agent.exe crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ @@ -42,6 +42,9 @@ check_mk_agent.exe: check_mk_agent.cc Makefile crash.exe: crash.cc Makefile $(CXX) -o $@ $< +nowin.exe: nowin.cc Makefile + $(CXX) -o $@ $< + clean: rm -f *.o *~ svn-*.tmp diff --git a/agents/windows/nowin.cc b/agents/windows/nowin.cc new file mode 100644 index 0000000..1426286 --- /dev/null +++ b/agents/windows/nowin.cc @@ -0,0 +1,24 @@ +#include <stdio.h> +#include <stdlib.h> +#include <time.h> + +int main(int argc, char **argv) +{ + if (argc != 2) { + fprintf(stderr, "Usage: %s MINUTES\n", argv[0]); + exit(1); + } + int minutes = atoi(argv[1]); + time_t now = time(0); + time_t then = now + minutes * 60; + + struct tm *t; + char out[64]; + t = localtime(&now); + strftime(out, sizeof(out), "%Y-%m-%d %H:%M", t); + printf("%s ", out); + t = localtime(&then); + strftime(out, sizeof(out), "%Y-%m-%d %H:%M", t); + printf("%s\n", out); +} + diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe new file mode 100755 index 0000000..1aed146 Binary files /dev/null and b/agents/windows/nowin.exe differ

12 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012