Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: Added more host tag related painters;

by Lars Michelsen

Added host tag filter Message-ID: <51f91b0c.8o8G71U/yFbJb8qR%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1e2d3c1458b2e7c9bca2c31d64510d6988f46d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e2d3c1458b2e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 16:10:37 2013 +0200 Added more host tag related painters; Added host tag filter --- ChangeLog | 3 +- web/htdocs/js/checkmk.js | 21 ++++++++++ web/htdocs/views.py | 23 +++++++---- web/htdocs/wato.py | 13 +----- web/plugins/config/wato.py | 17 ++++++++ web/plugins/views/filters.py | 71 ++++++++++++++++++++++++++++++++ web/plugins/views/painters.py | 91 ++++++++++++++++++++++++++++++----------- web/plugins/views/sorters.py | 33 ++++++++++++++- 8 files changed, 228 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1e2d3c1458…

10 years, 10 months

Check_MK Git: check_mk: fixed wording

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 63eec1b698d15062c4011d3f27d4467e77bfe2e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63eec1b698d150… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 31 08:52:43 2013 +0200 fixed wording --- checkman/plesk_backups | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/plesk_backups b/checkman/plesk_backups index b7f4b8d..7025a42 100644 --- a/checkman/plesk_backups +++ b/checkman/plesk_backups @@ -19,8 +19,8 @@ item: examples: # set up a check for a plesk backup - # warn if backup is elder than 1 day (86400 sec) - # and crit if elder than 2 days + # warn if backup is older than 1 day (86400 sec) + # and crit if older than 2 days # warn if Maximum size of all files on backup space is > 70 MB # (73400320 Bytes) and crit if > 80 MB # warn also if no backup is configured or no backup can be found @@ -47,7 +47,7 @@ inventory: is installed and working (it outputs the {<<<plesk_backups>>>} section). [parameters] -backup_age(int, int): if the age of the backup (in seconds) is elder than the first value, return {WARN} state, if elder than the second one, return {CRIT} state +backup_age(int, int): if the age of the backup (in seconds) is older than the first value, return {WARN} state, if older than the second one, return {CRIT} state total_size(int, int): if the total size of all backups on the backup space (in bytes) is larger than than the first value, return {WARN} state, if larger than the second one, return {CRIT} state no_backup_configured_state(int): the numeric state that should be returned if no backup is configured ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} ) no_backup_found_state(int): the numeric state that should be returned if no backup can be found ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} )

10 years, 10 months

Check_MK Git: check_mk: Added button to rule comment for inserting date and user

by Mathias Kettner

Module: check_mk Branch: master Commit: b085ae98a2df6b71475577c08622697bd3ffd525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b085ae98a2df6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 31 14:40:36 2013 +0200 Added button to rule comment for inserting date and user --- web/htdocs/images/button_insertdate_hi.png | Bin 0 -> 3626 bytes web/htdocs/images/button_insertdate_lo.png | Bin 0 -> 5063 bytes web/htdocs/js/checkmk.js | 11 +++++++++++ web/htdocs/valuespec.py | 15 +++++++++++++++ web/htdocs/wato.py | 4 ++++ 5 files changed, 30 insertions(+) diff --git a/web/htdocs/images/button_insertdate_hi.png b/web/htdocs/images/button_insertdate_hi.png new file mode 100644 index 0000000..349e1ff Binary files /dev/null and b/web/htdocs/images/button_insertdate_hi.png differ diff --git a/web/htdocs/images/button_insertdate_lo.png b/web/htdocs/images/button_insertdate_lo.png new file mode 100644 index 0000000..17e760a Binary files /dev/null and b/web/htdocs/images/button_insertdate_lo.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 98e010c..abc32f9 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1707,6 +1707,17 @@ function valuespec_listof_fixarrows(oTbody) { } } +function vs_textascii_button(img, text, how) { + var oInput = img.previousElementSibling; + while (oInput.tagName == "A") + oInput = oInput.previousElementSibling; + if (oInput.tagName != "INPUT") + oInput = oInput.firstChild; // complain mode + oInput.value = text + oInput.value; // TODO: how + oInput.focus(); +} + + function vs_passwordspec_randomize(img) { password = ""; while (password.length < 8) { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e28f597..082419f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -319,6 +319,8 @@ class TextAscii(ValueSpec): if type(self._regex) == str: self._regex = re.compile(self._regex) + self._prefix_buttons = kwargs.get("prefix_buttons", []) + def canonical_value(self): return "" @@ -331,6 +333,18 @@ class TextAscii(ValueSpec): html.write(" ") html.text_input(varprefix, str(value), size = self._size, read_only = self._read_only) + self.render_buttons() + + def render_buttons(self): + if self._prefix_buttons: + html.write(" ") + for icon, textfunc, help in self._prefix_buttons: + try: + text = textfunc() + except: + text = textfunc + html.icon_button("#", help, icon, onclick="vs_textascii_button(this, '%s', 'prefix');" % text) + def value_to_text(self, value): if value == None: @@ -374,6 +388,7 @@ class TextUnicode(TextAscii): def render_input(self, varprefix, value): html.text_input(varprefix, value, size = self._size) + self.render_buttons() def from_html_vars(self, varprefix): return html.var_utf8(varprefix, "").strip() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b598315..855b82d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10759,6 +10759,9 @@ def get_rule_conditions(ruleset): +def date_and_user(): + return time.strftime("%F", time.localtime()) + " " + config.user_id + ": " + def mode_edit_rule(phase, new = False): # Due to localization this cannot be defined in the global context! vs_rule_options = Dictionary( @@ -10773,6 +10776,7 @@ def mode_edit_rule(phase, new = False): "this rule"), size = 80, attrencode = True, + prefix_buttons = [ ("insertdate", date_and_user, _("Prefix date and your name to the comment")) ] ) ), ( "docu_url",

10 years, 10 months

Check_MK Git: check_mk: fixed unique alias name bug with timeperiods

by Andreas Boesl

Module: check_mk Branch: master Commit: 1eeb0b443c4fcc26220fee0f82d5bdded54d6954 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eeb0b443c4fcc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 31 13:32:44 2013 +0200 fixed unique alias name bug with timeperiods --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b598315..d25072d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13622,7 +13622,7 @@ def is_alias_used(my_group, my_name, aliasname): # Timeperiods timeperiods = load_timeperiods() for key, value in timeperiods.items(): - if value.get("alias") == aliasname and (my_group != "timeperiod" or my_name != key): + if value.get("alias") == aliasname and (my_group != "timeperiods" or my_name != key): return False, _("This alias is already used in timeperiod %s.") % key # Roles

10 years, 10 months

Check_MK Git: check_mk: Fix layout of auxiliary tag table

by Mathias Kettner

Module: check_mk Branch: master Commit: a6775bc71f9319ba48b3cb63cc31859d220a31fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6775bc71f9319… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 31 13:26:16 2013 +0200 Fix layout of auxiliary tag table --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c5cf0e6..7f328e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9045,8 +9045,8 @@ def mode_hosttags(phase): searchable = False) if auxtags: - table.row() for nr, (tag_id, title) in enumerate(auxtags): + table.row() topic, title = parse_hosttag_title(title) edit_url = make_link([("mode", "edit_auxtag"), ("edit", nr)]) delete_url = html.makeactionuri([("_delaux", nr)])

10 years, 10 months

Check_MK Git: check_mk: Allow GIT to be used for change tracking ( enable via global option)

by Mathias Kettner

Module: check_mk Branch: master Commit: eeccc4e560710e15533de6abd6e70330e5370d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeccc4e560710e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 31 13:27:13 2013 +0200 Allow GIT to be used for change tracking (enable via global option) --- ChangeLog | 1 + web/htdocs/wato.py | 46 +++++++++- web/plugins/config/wato.py | 1 + web/plugins/wato/check_mk_configuration.py | 135 ++++++++++++++++------------ 4 files changed, 127 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eeccc4e560…

10 years, 10 months

Check_MK Git: check_mk: New api view is now hidden

by Lars Michelsen

Module: check_mk Branch: master Commit: 7137ea0e004bb30a859d0763b9c602f63f70fc40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7137ea0e004bb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 11:53:58 2013 +0200 New api view is now hidden --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 4f65c4b..66ebb7a 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -286,7 +286,7 @@ multisite_builtin_views.update({ '-1'), ('host', ''), ('service', '')], - 'hidden': False, + 'hidden': True, 'hide_filters': [], 'icon' : 'downtime', 'layout': 'table',

10 years, 10 months

Check_MK Git: check_mk: Added new filter for downtime_id field and api_downtimes view

by Lars Michelsen

Module: check_mk Branch: master Commit: bc102589fbdca304e3dccf9d397637b3731d1b56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc102589fbdca3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 10:29:53 2013 +0200 Added new filter for downtime_id field and api_downtimes view --- web/plugins/views/builtin.py | 39 +++++++++++++++++++++++++++++++++++++++ web/plugins/views/filters.py | 2 ++ 2 files changed, 41 insertions(+) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 013674e..4f65c4b 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -277,6 +277,45 @@ multisite_builtin_views.update({ 'sorters': [('downtime_what', False), ('downtime_start_time', False)], 'title': _('Downtimes')}, + 'api_downtimes': {'column_headers': 'pergroup', + 'datasource': 'downtimes', + 'description': 'All host- and service-downtimes (including ids)', + 'group_painters': [('downtime_what', None)], + 'hard_filters': [], + 'hard_filtervars': [('is_service_scheduled_downtime_depth', + '-1'), + ('host', ''), + ('service', '')], + 'hidden': False, + 'hide_filters': [], + 'icon' : 'downtime', + 'layout': 'table', + 'mustsearch': False, + 'name': 'downtimes', + 'num_columns': 1, + 'owner': '', + 'painters': [ + ('host', 'host'), + ('service_description', 'service'), + ('downtime_author', None), + ('downtime_entry_time', None), + ('downtime_start_time', None), + ('downtime_end_time', None), + ('downtime_fixed', None), + ('downtime_duration', None), + ('downtime_comment', None), + ('downtime_id', None), + ], + 'public': True, + 'show_filters': [ + 'service_scheduled_downtime_depth', + 'hostregex', + 'serviceregex', + 'downtime_id', + ], + 'sorters': [('downtime_what', False), + ('downtime_start_time', False)], + 'title': _('Downtimes')}, 'downtimes_of_host': {'column_headers': 'pergroup', 'datasource': 'downtimes', 'description': '', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 321870b..ac7d9bb 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -672,3 +672,5 @@ class BIServiceIsUsedFilter(FilterTristate): return new_rows declare_filter(300, BIServiceIsUsedFilter()) + +declare_filter(301, FilterText("downtime_id", _("Downtime ID"), "downtime", "downtime_id", "downtime_id", "="))

10 years, 10 months

Check_MK Git: check_mk: Added host-only-filter ; Added ssh handler script to receive livedump output via stdin over ssh

by Lars Michelsen

Module: check_mk Branch: master Commit: 27cd90ef9920c8ae5980b0a2b1dd595d82180fa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27cd90ef9920c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 08:37:09 2013 +0200 Added host-only-filter ; Added ssh handler script to receive livedump output via stdin over ssh --- doc/treasures/livedump/livedump | 39 +++++++++++++---------- doc/treasures/livedump/livedump-ssh-recv | 51 ++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 16 deletions(-) diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index e483d0e..b784262 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -101,7 +101,8 @@ def livedump_config(): "GET hosts\n" \ "Columns: name alias address groups check_command " \ "max_check_attempts contacts\n" + \ - opt_host_headers + opt_host_headers + \ + opt_host_only_headers for row in g_connection.query_table_assoc(query): prepare_row(row) row["groupstring"] = ",".join(row["groups"]) @@ -151,7 +152,8 @@ def livedump_state(): query = \ "GET hosts\n" \ "Columns: name state plugin_output perf_data latency\n" \ - + opt_host_headers + + opt_host_headers \ + + opt_host_only_headers for row in g_connection.query_table_assoc(query): encode_row(row) @@ -219,20 +221,22 @@ def bail_out(x): def usage(): sys.stderr.write("""Usage: %s [OPTIONS] [-C] - -C, --config Dump configuration (instead of state) + -C, --config Dump configuration (instead of state) + + -h, --help Show this cruft + -V, --version Show version and exit + -T, --dump-templates Also dump host/service templates - -h, --help Show this cruft - -V, --version Show version and exit - -T, --dump-templates Also dump host/service templates + -s, --socket S connect to Livestatus-socket at S + -s tcp:10.11.0.55:6557 + -s unix:/var/run/nagios/rw/live + -O, --host-only-header H add header H to host queries only (usually Filter: ...) + -H, --host-header H add header H to host queries (usually Filter: ...). + This header is also used in service queries. + -S, --service-header H add header H to service queries (usually Filter: ...) - -s, --socket S connect to Livestatus-socket at S - -s tcp:10.11.0.55:6557 - -s unix:/var/run/nagios/rw/live - -H, --host-header H add header H to host LQL (usually Filter: ...) - -S, --service-header H add header H to service LQL (usually Filter: ...) - - -v, --verbose output debug information an stderr - --debug do not catch Python exceptions + -v, --verbose output debug information an stderr + --debug do not catch Python exceptions """) @@ -251,15 +255,16 @@ def print_version(): # | Main entry point, getopt, etc. | # '----------------------------------------------------------------------' -short_options = 'hVvc:H:S:TC' +short_options = 'hVvc:H:S:O:TC' long_options = [ "help", "version", "verbose", "debug", "socket=", - "host-header=", "service-header=", + "host-header=", "host-only-header=", "service-header=", "dump-templates", "config", "state" ] opt_verbose = False opt_debug = False opt_socket = None opt_host_headers = "" +opt_host_only_headers = "" opt_service_headers = "" opt_dump_templates = False @@ -286,6 +291,8 @@ for o,a in opts: opt_debug = True elif o in [ '-s', '--socket' ]: opt_socket = a + elif o in [ '-O', '--host-only-header' ]: + opt_host_only_headers += a + "\n" elif o in [ '-H', '--host-header' ]: opt_host_headers += a + "\n" elif o in [ '-S', '--service-header' ]: diff --git a/doc/treasures/livedump/livedump-ssh-recv b/doc/treasures/livedump/livedump-ssh-recv new file mode 100644 index 0000000..b8d69ae --- /dev/null +++ b/doc/treasures/livedump/livedump-ssh-recv @@ -0,0 +1,51 @@ +#!/usr/bin/python +# Can be called from remote system via SSH, for example as restricted command +# of a specific SSH key. It reads stdin for +# a) a header (specificing if its the configuration or status info) +# b) the real data as generated by livedump +# +# When the first line contains the string "state", the following lines +# are all treated as checkresult information. If the line contains the +# string "config", the following lines are treated as nagios configuration +# definitions. All chars after the config string in the subject are used +# to identfy the sending system. This is an ident of the system to support +# multiple sending systems. +# +# Configuration is written to etc/nagios/conf.d/remote-<ident>.cfg. +# The status info is sent in nagios state result file format and +# written to tmp/nagios/checkresults directory in a temporary file +# which is then processed by nagios. + +import os +import sys +import tempfile + +omd_root = os.environ.get('OMD_ROOT') + +mode = None +first = True +content = "" + +for line in sys.stdin: + if first: + if line.startswith("status"): + mode = "status" + elif line.startswith("config"): + mode = "config" + ident = line[6:].strip().replace("/", "_").replace(".", "_") + first = False + else: + content += line + +if mode == "config": + file("%s/etc/nagios/conf.d/remote-%s.cfg" % + (omd_root, ident), "w").write(content) + +elif mode == "status": + fd, path = tempfile.mkstemp('', 'c', "%s/tmp/nagios/checkresults" % omd_root) + os.write(fd, content) + os.close(fd) + file(path + ".ok", "w") +else: + sys.stderr.write("ERROR: Invalid mode\n") + sys.exit(1)

10 years, 10 months

Check_MK Git: check_mk: Added new painters for displaying host tags

by Lars Michelsen

Module: check_mk Branch: master Commit: 14c1770cf8ab71ee2cbd174946d8d36bc5833195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14c1770cf8ab71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 08:38:25 2013 +0200 Added new painters for displaying host tags --- ChangeLog | 3 ++- web/plugins/views/painters.py | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5423ebb..7aa80f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,12 +96,13 @@ * Editing localized strings (like the title) is now optional when cloning views or editing cloned views. If not edited, the views inherit the localized strings from their ancestors + * Add: Added simple problems Dashboard + * Added new painters for displaying host tags * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving * FIX: Fixed wrong default settings of view filters in localized multisite * FIX: line wrapping of logwatch entries - * Add: Added simple problems Dashboard WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f2b6969..6bf7529 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1178,14 +1178,27 @@ def paint_host_tags(row): return "", get_host_tags(row) multisite_painters["host_tags"] = { - "title" : _("Host Tags (Check_MK)"), + "title" : _("Host tags (raw)"), "short" : _("Tags"), "columns" : [ "host_custom_variable_names", "host_custom_variable_values" ], "paint" : paint_host_tags, } +def paint_host_tags_with_titles(row): + output = '' + for tag in get_host_tags(row).split(): + output += tag + '<br />\n' + return "", output + +multisite_painters["host_tags_with_titles"] = { + "title" : _("Host tags (with titles)"), + "short" : _("Tags"), + "columns" : [ "host_custom_variable_names", "host_custom_variable_values" ], + "paint" : paint_host_tags_with_titles, +} + multisite_painters["host_comments"] = { - "title" : _("Host Comments"), + "title" : _("Host comments"), "short" : _("Comments"), "columns" : [ "host_comments_with_info" ], "paint" : lambda row: paint_comments("host_", row),

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013