Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: wato rulesets: showing help texts of rulesets in ruleset list dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 62ab5bce2144232cb7415e12292916121efc6853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62ab5bce214423… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 10:21:06 2013 +0200 wato rulesets: showing help texts of rulesets in ruleset list dialog --- web/htdocs/js/checkmk.js | 11 +++++++++++ web/htdocs/wato.css | 10 ++++++++++ web/htdocs/wato.py | 1 + 3 files changed, 22 insertions(+) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index ba73263..2fcd72a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1760,6 +1760,17 @@ function help_switch(how) { for (var i=0; i<helpdivs.length; i++) { helpdivs[i].style.display = how ? "block" : "none"; } + + // small hack for wato ruleset lists, toggle the "nofloat" class + // on those objects to make the layout possible + var rulesetdivs = document.getElementsByClassName('ruleset'); + for (var i = 0; i < rulesetdivs.length; i++) { + if (how) + add_class(rulesetdivs[i], 'nofloat'); + else + remove_class(rulesetdivs[i], 'nofloat'); + } + get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 134a24a..90d82bc 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -781,6 +781,16 @@ div.rulesets table.nform tr.bottom td { /* color: #444; */ } +.wato .rulesets div.ruleset.nofloat { + float: none; + clear: left; +} + +.wato .rulesets div.ruleset div.help { + height: auto; + clear: left; +} + /* Page edit_ruleset */ div.varname { color: white; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14ee24e..f71fe1a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10290,6 +10290,7 @@ def mode_rulesets(phase): html.write('<span class=dots>%s</span></div>' % ("." * 100)) html.write('<div class="rulecount %s" title="%s">%d</div>' % (num_rules and "nonzero" or "zero", title, num_rules)) + html.help(rulespec["help"]) html.write('</div>') if something_shown:

11 years, 1 month

Check_MK Git: check_mk: Cleaned up some help texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ccd7ac3ffc0e09ec278df8d55cdb9d91893f2fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ccd7ac3ffc0e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 10:22:36 2013 +0200 Cleaned up some help texts --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0848d48..ad15755 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -163,7 +163,7 @@ register_rule(group + '/' + subgroup_inventory, title = _("Create check if service is in start mode"), )), ], - help = _('<p>This rule can be used to configure the inventory of the windows services check. ' + help = _('This rule can be used to configure the inventory of the windows services check. ' 'You can configure specific window services to be monitored by the windows check by ' 'selecting them by name, current state during the inventory or start mode.'), ), @@ -279,7 +279,7 @@ register_rule(group + '/' + subgroup_networking, columns = 3)), ], - help = _('<p>This rule can be used to control the inventory for network ports. ' + help = _('This rule can be used to control the inventory for network ports. ' 'You can configure the port types and port states for inventory' 'and the use of alias or description as service name.'), ),

11 years, 1 month

Check_MK Git: check_mk: nsca2mkeventd: added verbose logging mode

by Lars Michelsen

Module: check_mk Branch: master Commit: d05d04553c1f411d4b1e82a312acbdece04cac26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d05d04553c1f41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 12 08:56:08 2013 +0200 nsca2mkeventd: added verbose logging mode --- .../Event_Console/nsca2mkeventd/nsca2mkeventd | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd index db037c3..b1ec8bd 100755 --- a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd +++ b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd @@ -7,6 +7,7 @@ import os, sys, getopt, traceback, time, socket opt_debug = False +opt_verbose = False opt_foreground = False g_application = 'nsca' @@ -40,6 +41,10 @@ def log(text): except: sys.stderr.write("%s\n" % text) +def verbose(txt): + if opt_verbose: + log(txt) + def usage(): sys.stdout.write('''Usage: nsca2mkeventd [OPTIONS] @@ -47,6 +52,7 @@ def usage(): -d, --debug Enable debug mode (let exceptions through) -E, --eventsocket P Path to unix socket to write events to -P, --pipe P Path to pipe for receiving events from NSCA + -v, --verbose Log more details Default paths: @@ -176,9 +182,12 @@ def forward_line(parsed): output = '%s: %s' % (svc_desc, output) t = time.strftime("%b %d %H:%M:%S", time.localtime(timestamp)) + line = "<%d>%s %s %s: %s\n" % (state_to_prio(state), t, hostname, g_application, output) + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(g_eventsocket_path) - s.send("<%d>%s %s %s: %s\n" % (state_to_prio(state), t, hostname, g_application, output)) + verbose('=> %r' % line.rstrip()) + s.send(line) s.close() def main(): @@ -188,6 +197,7 @@ def main(): try: for line in file(g_pipe_path): try: + verbose('<= %r' % line.rstrip()) parsed = parse_line(line.rstrip()) forward_line(parsed) except Exception, e: @@ -217,8 +227,8 @@ else: g_eventsocket_path = None g_logfile_path = "/var/log/nsca2mkeventd.log" -short_options = "hdgP:E:" -long_options = [ "help", "foreground", "debug", "eventsocket=", "pipe=" ] +short_options = "hdvgP:E:" +long_options = [ "help", "foreground", "debug", "verbose", "eventsocket=", "pipe=" ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -227,6 +237,8 @@ try: for o, a in opts: if o in [ '-d', '--debug' ]: opt_debug = True + elif o in [ '-v', '--verbose' ]: + opt_verbose = True elif o in [ '-g', '--foreground' ]: opt_foreground = True elif o in [ '-E', '--eventsocket' ]:

11 years, 1 month

Check_MK Git: check_mk: Many changes to wording in WATO GUI

by Götz Golla

Module: check_mk Branch: master Commit: 0470292ef75048a954a038f0c467607e30c28e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0470292ef75048… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Aug 9 17:00:29 2013 +0200 Many changes to wording in WATO GUI --- web/plugins/wato/check_parameters.py | 453 +++++++++++++++++----------------- 1 file changed, 224 insertions(+), 229 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0470292ef7…

11 years, 1 month

Check_MK Git: check_mk: path of logwatch file corrected

by Götz Golla

Module: check_mk Branch: master Commit: a3223f23eec3940729fd165513fe354b1cafdfe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3223f23eec394… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Aug 9 16:59:10 2013 +0200 path of logwatch file corrected --- checkman/logwatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/logwatch b/checkman/logwatch index d09d4b4..9c20ed9 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -15,7 +15,7 @@ description: at least one warning message exists but no critical, the check results in a warning state. The only way to bring the state back to OK is to delete the text file with the stored log - messages. This is stored below {/var/lib/check_mk/logwatch}. Usually the logwatch webpage is + messages. This is stored below {~/var/check_mk/logwatch}. Usually the logwatch webpage is used to browse and delete the messages. Please refer to the online documentation of check_mk for more details about logwatch.

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0969, #0970, #0971

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: bb994e692d5854b8c835f8487c6ed77bd90b7266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb994e692d5854… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 9 16:09:36 2013 +0200 Updated bug entries #0969, #0970, #0971 --- .bugs/969 | 36 ++++++++++++++++++++++++++++++++++++ .bugs/970 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/971 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/.bugs/969 b/.bugs/969 new file mode 100644 index 0000000..0c586d8 --- /dev/null +++ b/.bugs/969 @@ -0,0 +1,36 @@ +Title: Logwatch in Windows Agent: Problem with EventId 0 +Component: checks +State: open +Date: 2013-08-09 14:16:36 +Targetversion: 1.2.3 +Class: bug + +came in via checkmk-de@ / original mail still available at feedback/gitbug folder + +Date: Wed, 29 May 2013 16:09:14 +0200 +Message-ID: <iupni9gct0hc1if4yki27jk0.1369836554030(a)email.android.com> +Importance: normal +From: "=?ISO-8859-1?Q?Markus_Nie=DF?=" <markus.niess(a)gmail.com> +To: checkmk-de(a)lists.mathias-kettner.de +MIME-Version: 1.0 +Subject: [Check_mk (deutsch)] Logwatch Windows EventId 0 + +Hallo zusammen, + +Auch auf die Gefahr hin zu nerven starte ich eine zweite Anfrage :-). +Ich überwache mit dem aktuellen Agent WinEventlogs und kann auf zwei Maschinen einen Fehler beobachten wenn die EventID 0 ist. +Die Severity bleibt gleich aber der Text wird auf The Operation completed successfully gesetzt. +Das geschieht scheinbar durch den Agent selbst, da cmk -d bereits die veränderten Werte anzeigt. + +Ich würde mich über eine kurze Bestätigung freuen wenn es dich wirklich um einen Bug handelt. + +Danke an alle. Bin begeistert + + +Von Samsung Mobile gesendet + + +_______________________________________________ +checkmk-de mailing list +checkmk-de(a)lists.mathias-kettner.de +http://lists.mathias-kettner.de/mailman/listinfo/checkmk-de diff --git a/.bugs/970 b/.bugs/970 new file mode 100644 index 0000000..d4876eb --- /dev/null +++ b/.bugs/970 @@ -0,0 +1,59 @@ +Title: On-demand macros not expanded +Component: livestatus +State: open +Date: 2013-08-09 14:46:30 +Targetversion: 1.2.3 +Class: bug + +came in via info@ / original mail still available at feedback/gitbug + +Date: Thu, 13 Jun 2013 08:49:16 +0200 +From: Rostislav Opocensky <orbis(a)pictus.org> +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:20.0) Gecko/20100101 Firefox/20.0 SeaMonkey/2.17.1 +MIME-Version: 1.0 +To: info(a)mathias-kettner.de +Subject: On-demand macros not expanded + + +Hello Matthias, + +I am a happy user of MK LiveStatus. Thank you for such an excellent tool! + +I would just like to bring a small problem to your attention. It seems that on-demand macros are not expanded in *_expanded columns. For instance if I have the following definitions: + +define host { + name cfg-archived + register 0 + notes_url http://$_HOSTFQDN:localhost$/cgi-bin/viewvc.cgi/$_HOSTSITE$/$HOSTALIAS$?view=markup +} + +define host { + host_name localhost + _fqdn ngssrv.example.com +} + +define host { + host_name fl-sw-01 + _site florenc + use cfg-archived +} + +and I issue the following query: + +GET services +Filter: host_name = fl-sw-01 +Columns: notes_url_expanded + +I get the following result: + +http://$_HOSTFQDN:localhost$/cgi-bin/viewvc.cgi/florenc/fl-sw-01?view=markup + +However, the result should be: + +http://ngssrv.example.com/cgi-bin/viewvc.cgi/florenc/fl-sw-01?view=markup + +Would you please consider looking into this issue? + +Thank you, + +Rostislav diff --git a/.bugs/971 b/.bugs/971 new file mode 100644 index 0000000..1e4bfec --- /dev/null +++ b/.bugs/971 @@ -0,0 +1,49 @@ +Title: apache_status agent plugin: Problem at split if more than one slash in output +Component: checks +State: open +Date: 2013-08-09 14:57:53 +Targetversion: 1.2.3 +Class: bug + +came in via feedback@ // original email still available in feedback/gitbug folder + +Date: Thu, 13 Jun 2013 12:42:59 +0200 +From: Wouter de Geus <wouter-check_mk.org(a)owl-ict.nl> +To: feedback(a)check-mk.org +Subject: Agent plugin apache_status process detection + +Hej, + +I just installed the agents plugin apache_status (the version from release 1.2.2p2) on several of my machines. +On one of the machines it bugs however: +Traceback (most recent call last): + File "./apache_status", line 83, in <module> + servers = try_detect_servers() + File "./apache_status", line 46, in try_detect_servers + pid, proc = parts[6].split('/') +ValueError: too many values to unpack + +After reading the source the problem is obvious: the output of the netstat command has entries +that have slashes in the command name: +---- +# netstat -tlnp 2>/dev/null +Active Internet connections (only servers) +Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name +tcp 0 0 0.0.0.0:30033 0.0.0.0:* LISTEN 1326/./ts3server_li +tcp 0 0 127.0.0.1:7505 0.0.0.0:* LISTEN 1331/openvpn +tcp 0 0 0.0.0.0:21 0.0.0.0:* LISTEN 1333/tcpserver +tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN 566/sshd +tcp 0 0 0.0.0.0:10011 0.0.0.0:* LISTEN 1326/./ts3server_li +tcp6 0 0 :::80 :::* LISTEN 12193/httpd +tcp6 0 0 :::22 :::* LISTEN 566/sshd +tcp6 0 0 :::443 :::* LISTEN 12193/httpd +---- +Note the ./ts3server_li entries. +Since there is more than 1 slash in the line, the split will return more than the expected 2 results. + +I thought I'd report this bug + +Regards, + +Wouter. +-- Wouter de Geus Owl ICT wouter(a)owl-ict.nl http://www.owl-ict.nl/

11 years, 1 month

Check_MK Git: check_mk: Saving last seen time in own userfile

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f3e9f310233aaa012dc3ccd52da20ec164cfa27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f3e9f310233aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 9 15:15:57 2013 +0200 Saving last seen time in own userfile --- web/htdocs/userdb.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 3cd01c0..d66c75c 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -294,10 +294,11 @@ def load_users(lock = False): if d[0] != '.': id = d - # read failed login counts - failed_file = dir + d + '/num_failed.mk' - if id in result and os.path.exists(failed_file): - result[id]['num_failed'] = int(file(failed_file).read().strip()) + # read special values from own files + for val, conv_func in [ ('num_failed', int), ('last_seen', float) ]: + path = dir + d + '/' + val + '.mk' + if id in result and os.path.exists(path): + result[id][val] = conv_func(file(path).read().strip()) # read automation secrets and add them to existing # users or create new users automatically @@ -342,7 +343,6 @@ def save_users(profiles): "alias", "language", "connector", - "last_seen", ] + custom_values # Remove multisite keys in contacts. @@ -405,6 +405,11 @@ def save_users(profiles): failed_file = user_dir + '/num_failed.mk' create_user_file(failed_file, 'w').write('%d\n' % user.get('num_failed', 0)) + # Write out the last seent time + if 'last_seen' in user: + last_seen_file = user_dir + '/last_seen.mk' + create_user_file(last_seen_file, 'w').write(repr(user['last_seen']) + '\n') + # Remove settings directories of non-existant users. # Beware: we removed this since it leads to violent destructions # if the user database is out of the scope of Check_MK. This is

11 years, 1 month

Check_MK Git: check_mk: Updating user access times on snapin reloads

by Lars Michelsen

Module: check_mk Branch: master Commit: 7533650a965436b45b3d500ee7e3dfddccae9c76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7533650a965436… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 9 15:03:39 2013 +0200 Updating user access times on snapin reloads --- web/htdocs/sidebar.py | 5 ++++- web/htdocs/userdb.py | 8 ++++++++ web/plugins/config/builtin.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 7710031..670c16d 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config, defaults, livestatus, views, pprint, os, copy +import config, defaults, livestatus, views, pprint, os, copy, userdb from lib import * # Constants to be used in snapins @@ -280,6 +280,9 @@ def ajax_openclose(): save_user_config(new_config) def ajax_snapin(): + # Update online state of the user (if enabled) + userdb.update_user_access_time() + snapname = html.var("name") if snapname: snapnames = [ snapname ] diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 965dbc7..3cd01c0 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -121,6 +121,14 @@ def user_locked(username): users = load_users() return users[username].get('locked', False) +def update_user_access_time(): + if not config.save_user_access_times: + return + + users = load_users(lock = True) + users[html.user]['last_seen'] = time.time() + save_users(users) + def on_succeeded_login(username): users = load_users(lock = True) changed = False diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 7c836f6..8e55c24 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -40,7 +40,7 @@ admin_users = [] guest_users = [] default_user_role = "user" save_user_access_times = False -user_online_maxage = 10 # seconds +user_online_maxage = 30 # seconds # New style, used by WATO multisite_users = {}

11 years, 1 month

Check_MK Git: check_mk: fixed error in wato field name

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e3c128f9ea4f63b33c1e6bf14cfd374a59feae53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3c128f9ea4f63… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 9 13:55:21 2013 +0200 fixed error in wato field name --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 02103d7..c0c93d2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2884,7 +2884,7 @@ register_check_parameters( help = _("The critical battery current in Ampere"), ), Integer( - title = _("Max. Voltage"), + title = _("Min. Voltage"), help = _("The output voltage at and below which a critical state is triggered."), ), ]

11 years, 1 month

Check_MK Git: check_mk: Fixed small issue in ldap config dialog layout

by Lars Michelsen

Module: check_mk Branch: master Commit: 6faf868dbde7537d8c0a74353fd8c6af90e18a79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6faf868dbde753… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 5 14:00:34 2013 +0200 Fixed small issue in ldap config dialog layout --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7765b4e..5c5a3b4 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -536,7 +536,7 @@ register_configvar(group, title = _("Bind DN"), help = _("Specify the distinguished name to be used to bind to " "the LDAP directory."), - size = 80, + size = 63, ), Password( title = _("Bind Password"),

11 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits