Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64455 discussions

Check_MK Git: check_mk: Revert "logwatch link no longer uses notes_url"

by Andreas Boesl

Module: check_mk Branch: master Commit: ecbee16d76aa2536c28ac69158f5613a5fec30c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecbee16d76aa25… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 14:10:32 2013 +0200 Revert "logwatch link no longer uses notes_url" This reverts commit fb7554434f8cdce727d0d2e90d007ee4b3f6f5d5. --- ChangeLog | 1 - modules/check_mk.py | 11 +++++++++-- scripts/setup.sh | 1 + web/plugins/icons/builtin.py | 30 +++++++++++++++--------------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index fae1738..d547b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,6 @@ * Column Perf-O-Meter is now sortable: it sorts after the *first* performance value. This might not always be the one you like, but its far better than nothing. - * logwatch: Logwatch link no longer uses notes_url WATO: * Allow to configure check-/retry_interval in second precision diff --git a/modules/check_mk.py b/modules/check_mk.py index 18f6ec6..8ca387a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -109,6 +109,7 @@ www_group = None # unset nagios_startscript = '/etc/init.d/nagios' nagios_binary = '/usr/sbin/nagios' nagios_config_file = '/etc/nagios/nagios.cfg' +logwatch_notes_url = "/nagios/logwatch.php?host=%s&file=%s" rrdcached_socket = None # used by prediction.py rrd_path = None # used by prediction.py @@ -1773,6 +1774,12 @@ def create_nagios_servicedefs(outfile, hostname): else: template = passive_service_template + # Hardcoded for logwatch check: Link to logwatch.php + if checkname == "logwatch": + logwatch = " notes_url\t\t\t" + (logwatch_notes_url % (urllib.quote(hostname), urllib.quote(item))) + "\n" + else: + logwatch = ""; + # Services Dependencies for dep in deps: outfile.write("define servicedependency {\n" @@ -1812,10 +1819,10 @@ def create_nagios_servicedefs(outfile, hostname): host_name\t\t\t%s service_description\t\t%s check_interval\t\t%d -%s check_command\t\t\tcheck_mk-%s +%s%s check_command\t\t\tcheck_mk-%s } -""" % ( template, hostname, description, check_interval, +""" % ( template, hostname, description, check_interval, logwatch, extra_service_conf_of(hostname, description), checkname )) checknames_to_define.add(checkname) diff --git a/scripts/setup.sh b/scripts/setup.sh index 7f672d9..aafa7ff 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -498,6 +498,7 @@ check_result_path = '$check_result_path' nagios_status_file = '$nagios_status_file' nagios_conf_dir = '$nagconfdir' nagios_user = '$nagiosuser' +logwatch_notes_url = '${url_prefix}check_mk/logwatch.py?host=%s&file=%s' www_group = '$wwwgroup' nagios_config_file = '$nagios_config_file' nagios_startscript = '$nagios_startscript' diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 759439c..80188b8 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -274,32 +274,32 @@ multisite_icons.append({ # Adds the url_prefix of the services site to the notes url configured in this site. # It also adds the master_url which will be used to link back to the source site # in multi site environments. -def logwatch_url(sitename, hostname, item): - host_item_url = "check_mk/logwatch.py?host=%s&file=%s" % (urllib.quote(hostname), urllib.quote(item)) +def logwatch_url(sitename, notes_url): + i = notes_url.index("check_mk/logwatch.py") site = html.site_status[sitename]["site"] + master_url = '' if config.is_multisite(): master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' - return site["url_prefix"] + host_item_url + master_url - -def paint_logwatch(what, row, tags, custom_vars): - if row[what + "_check_command"] == 'check_mk-logwatch': - return '<a href="%s"><img class=icon ' \ - 'src="images/icon_logwatch.png\"></a>' % \ - logwatch_url(row["site"], row['host_name'], row['service_description'][4:]) - -multisite_icons.append({ - 'columns': [ 'host_name', 'service_description', 'check_command' ], - 'paint': paint_logwatch, -}) + return site["url_prefix"] + notes_url[i:] + master_url def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options: + # notes_url (only, if not a Check_MK logwatch check pointing to + # logwatch.py. These is done by a special icon) notes_url = row[what + "_notes_url_expanded"] check_command = row[what + "_check_command"] if notes_url: - return '<a href="%s"><img class=icon ' \ + # unmodified original logwatch link + # -> translate into more intelligent icon + if check_command == 'check_mk-logwatch' \ + and "/check_mk/logwatch.py" in notes_url: + return '<a href="%s"><img class=icon ' \ + 'src="images/icon_logwatch.png\"></a>' % \ + logwatch_url(row["site"], notes_url) + else: + return '<a href="%s"><img class=icon ' \ 'src="images/icon_notes.gif"></a>' % notes_url multisite_icons.append({

11 years, 3 months

Check_MK Git: check_mk: Logwatch icon no longer uses notes_url

by Andreas Boesl

Module: check_mk Branch: master Commit: 887a64b80bab773a8a9d9070f0793895624faeed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=887a64b80bab77… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 14:44:33 2013 +0200 Logwatch icon no longer uses notes_url --- ChangeLog | 1 + web/plugins/icons/builtin.py | 44 ++++++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index d547b53..8c6f5e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Column Perf-O-Meter is now sortable: it sorts after the *first* performance value. This might not always be the one you like, but its far better than nothing. + * logwatch: Logwatch icon no longer uses notes_url WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 80188b8..8208221 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -271,36 +271,42 @@ multisite_icons.append({ # | | # +----------------------------------------------------------------------+ -# Adds the url_prefix of the services site to the notes url configured in this site. -# It also adds the master_url which will be used to link back to the source site -# in multi site environments. -def logwatch_url(sitename, notes_url): - i = notes_url.index("check_mk/logwatch.py") +def logwatch_url(sitename, hostname, item): + host_item_url = "check_mk/logwatch.py?host=%s&file=%s" % (htmllib.urlencode(hostname), htmllib.urlencode(item)) site = html.site_status[sitename]["site"] - master_url = '' if config.is_multisite(): master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' - return site["url_prefix"] + notes_url[i:] + master_url + return site["url_prefix"] + host_item_url + master_url +def paint_logwatch(what, row, tags, custom_vars): + if what != "service": + return + if row[what + "_check_command"] == 'check_mk-logwatch': + return '<a href="%s"><img class=icon ' \ + 'src="images/icon_logwatch.png\"></a>' % \ + logwatch_url(row["site"], row['host_name'], row['service_description'][4:]) + +multisite_icons.append({ + 'service_columns': [ 'host_name', 'service_description', 'check_command' ], + 'paint': paint_logwatch, +}) + + +# Adds the url_prefix of the services site to the notes url configured in this site. +# It also adds the master_url which will be used to link back to the source site +# in multi site environments. def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options: - # notes_url (only, if not a Check_MK logwatch check pointing to - # logwatch.py. These is done by a special icon) notes_url = row[what + "_notes_url_expanded"] check_command = row[what + "_check_command"] + if check_command == 'check_mk-logwatch' and \ + "check_mk/logwatch.py?host" in notes_url: + return if notes_url: - # unmodified original logwatch link - # -> translate into more intelligent icon - if check_command == 'check_mk-logwatch' \ - and "/check_mk/logwatch.py" in notes_url: - return '<a href="%s"><img class=icon ' \ - 'src="images/icon_logwatch.png\"></a>' % \ - logwatch_url(row["site"], notes_url) - else: - return '<a href="%s"><img class=icon ' \ - 'src="images/icon_notes.gif"></a>' % notes_url + return '<a href="%s"><img class=icon ' \ + 'src="images/icon_notes.gif"></a>' % notes_url multisite_icons.append({ 'columns': [ 'notes_url_expanded', 'check_command' ],

11 years, 3 months

Check_MK Git: check_mk: notify.py: fixed crash when reporting notifications

by Andreas Boesl

Module: check_mk Branch: master Commit: afa13485d256da944ab65ca11953f9f3c7606f7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa13485d256da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 14:04:39 2013 +0200 notify.py: fixed crash when reporting notifications --- modules/notify.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/notify.py b/modules/notify.py index b6da7d6..8d5f9fc 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -359,6 +359,7 @@ def notify_get_context(): in os.environ.items() if var.startswith("NOTIFY_") and not re.match('^\$[A-Z]+\$$', value)]) + return context def notify_notify():

11 years, 3 months

Check_MK Git: check_mk: fileinfo: no longer inventorize missing files

by Andreas Boesl

Module: check_mk Branch: master Commit: e37fe1ee722c1d3147bc54c8ff8489b5416f11af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e37fe1ee722c1d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 13:34:27 2013 +0200 fileinfo: no longer inventorize missing files --- ChangeLog | 1 + checks/fileinfo | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 63adc24..fae1738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ cache file is twice the maximum cache age * windows agent: no longer tries to execute directories * esx_vsphere_datastores: Fix incomplete performance data + * fileinfo: no longer inventorize missing files(reported by windows agent) Notifications: * Flexible Notification can now filter service levels diff --git a/checks/fileinfo b/checks/fileinfo index d922d49..f224d14 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -47,6 +47,8 @@ def inventory_fileinfo(info, case): added_groups = [] for line in info: if len(line) >= 3: + if line[1] == "missing": + continue groups = fileinfo_groups_of_file(line[0]) if case == 'single' and len(groups) == 0: inventory.append((line[0], {})); @@ -84,7 +86,7 @@ def check_fileinfo(item, params, info): for line in info[1:]: if item == line[0]: if line[1] == "missing": - return (3, "File is missing") + return (3, "File not found") state = 0 size = int(line[1]) age = reftime - int(line[2])

11 years, 3 months

Check_MK Git: check_mk: logwatch link no longer uses notes_url

by Andreas Boesl

Module: check_mk Branch: master Commit: fb7554434f8cdce727d0d2e90d007ee4b3f6f5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb7554434f8cdc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 13:17:24 2013 +0200 logwatch link no longer uses notes_url --- ChangeLog | 1 + modules/check_mk.py | 11 ++--------- scripts/setup.sh | 1 - web/plugins/icons/builtin.py | 30 +++++++++++++++--------------- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3192df3..63adc24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Column Perf-O-Meter is now sortable: it sorts after the *first* performance value. This might not always be the one you like, but its far better than nothing. + * logwatch: Logwatch link no longer uses notes_url WATO: * Allow to configure check-/retry_interval in second precision diff --git a/modules/check_mk.py b/modules/check_mk.py index 8ca387a..18f6ec6 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -109,7 +109,6 @@ www_group = None # unset nagios_startscript = '/etc/init.d/nagios' nagios_binary = '/usr/sbin/nagios' nagios_config_file = '/etc/nagios/nagios.cfg' -logwatch_notes_url = "/nagios/logwatch.php?host=%s&file=%s" rrdcached_socket = None # used by prediction.py rrd_path = None # used by prediction.py @@ -1774,12 +1773,6 @@ def create_nagios_servicedefs(outfile, hostname): else: template = passive_service_template - # Hardcoded for logwatch check: Link to logwatch.php - if checkname == "logwatch": - logwatch = " notes_url\t\t\t" + (logwatch_notes_url % (urllib.quote(hostname), urllib.quote(item))) + "\n" - else: - logwatch = ""; - # Services Dependencies for dep in deps: outfile.write("define servicedependency {\n" @@ -1819,10 +1812,10 @@ def create_nagios_servicedefs(outfile, hostname): host_name\t\t\t%s service_description\t\t%s check_interval\t\t%d -%s%s check_command\t\t\tcheck_mk-%s +%s check_command\t\t\tcheck_mk-%s } -""" % ( template, hostname, description, check_interval, logwatch, +""" % ( template, hostname, description, check_interval, extra_service_conf_of(hostname, description), checkname )) checknames_to_define.add(checkname) diff --git a/scripts/setup.sh b/scripts/setup.sh index aafa7ff..7f672d9 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -498,7 +498,6 @@ check_result_path = '$check_result_path' nagios_status_file = '$nagios_status_file' nagios_conf_dir = '$nagconfdir' nagios_user = '$nagiosuser' -logwatch_notes_url = '${url_prefix}check_mk/logwatch.py?host=%s&file=%s' www_group = '$wwwgroup' nagios_config_file = '$nagios_config_file' nagios_startscript = '$nagios_startscript' diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 80188b8..759439c 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -274,32 +274,32 @@ multisite_icons.append({ # Adds the url_prefix of the services site to the notes url configured in this site. # It also adds the master_url which will be used to link back to the source site # in multi site environments. -def logwatch_url(sitename, notes_url): - i = notes_url.index("check_mk/logwatch.py") +def logwatch_url(sitename, hostname, item): + host_item_url = "check_mk/logwatch.py?host=%s&file=%s" % (urllib.quote(hostname), urllib.quote(item)) site = html.site_status[sitename]["site"] - master_url = '' if config.is_multisite(): master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' - return site["url_prefix"] + notes_url[i:] + master_url + return site["url_prefix"] + host_item_url + master_url + +def paint_logwatch(what, row, tags, custom_vars): + if row[what + "_check_command"] == 'check_mk-logwatch': + return '<a href="%s"><img class=icon ' \ + 'src="images/icon_logwatch.png\"></a>' % \ + logwatch_url(row["site"], row['host_name'], row['service_description'][4:]) + +multisite_icons.append({ + 'columns': [ 'host_name', 'service_description', 'check_command' ], + 'paint': paint_logwatch, +}) def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options: - # notes_url (only, if not a Check_MK logwatch check pointing to - # logwatch.py. These is done by a special icon) notes_url = row[what + "_notes_url_expanded"] check_command = row[what + "_check_command"] if notes_url: - # unmodified original logwatch link - # -> translate into more intelligent icon - if check_command == 'check_mk-logwatch' \ - and "/check_mk/logwatch.py" in notes_url: - return '<a href="%s"><img class=icon ' \ - 'src="images/icon_logwatch.png\"></a>' % \ - logwatch_url(row["site"], notes_url) - else: - return '<a href="%s"><img class=icon ' \ + return '<a href="%s"><img class=icon ' \ 'src="images/icon_notes.gif"></a>' % notes_url multisite_icons.append({

11 years, 3 months

Check_MK Git: check_mk: jasperreports: removed libs. inserted download links into README

by Andreas Boesl

Module: check_mk Branch: master Commit: 936f21da42f3bfdfdb688ea4c756b0dc7d383f7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=936f21da42f3bf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 12:37:20 2013 +0200 jasperreports: removed libs. inserted download links into README --- doc/jasperreports/README.jasperreports-livestatus | 11 +++++++++++ doc/jasperreports/libs/com-jaspersoft-ireport.jar | Bin 8959460 -> 0 bytes doc/jasperreports/libs/jasperreports-4.7.0.jar | Bin 3990589 -> 0 bytes doc/jasperreports/libs/json_simple-1.1.jar | Bin 16046 -> 0 bytes 4 files changed, 11 insertions(+) diff --git a/doc/jasperreports/README.jasperreports-livestatus b/doc/jasperreports/README.jasperreports-livestatus index 3dd8f06..bca2e3a 100644 --- a/doc/jasperreports/README.jasperreports-livestatus +++ b/doc/jasperreports/README.jasperreports-livestatus @@ -3,6 +3,17 @@ The livestatus.jar plugin provides the capability to start livestatus queries within the iReport application. These are executed through the plugins JRQueryExecuter interface. +Prerequesite for building +========================= +Download the following libraries and put them into the libs path + +jasperreports-4.7.0.jar +http://sourceforge.net/projects/jasperreports/files/jasperreports/JasperReports 4.7.0/ + +com-jaspersoft-ireport.jar from iReport-4.7.0.tar.gz +http://sourceforge.net/projects/ireport/files/iReport/iReport-4.7.0/iReport-4.7.0.tar.gz/download + + Build livestatus.jar ====================== To create the livestatus.jar file from scratch type: diff --git a/doc/jasperreports/libs/.gitignore b/doc/jasperreports/libs/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/doc/jasperreports/libs/com-jaspersoft-ireport.jar b/doc/jasperreports/libs/com-jaspersoft-ireport.jar deleted file mode 100644 index a1d0c29..0000000 Binary files a/doc/jasperreports/libs/com-jaspersoft-ireport.jar and /dev/null differ diff --git a/doc/jasperreports/libs/jasperreports-4.7.0.jar b/doc/jasperreports/libs/jasperreports-4.7.0.jar deleted file mode 100644 index 4cfc1d6..0000000 Binary files a/doc/jasperreports/libs/jasperreports-4.7.0.jar and /dev/null differ diff --git a/doc/jasperreports/libs/json_simple-1.1.jar b/doc/jasperreports/libs/json_simple-1.1.jar deleted file mode 100644 index f395f41..0000000 Binary files a/doc/jasperreports/libs/json_simple-1.1.jar and /dev/null differ

11 years, 3 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: f6cc5db926f35caf4e6f796ffde0b1ab9d59dd64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6cc5db926f35c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 6 12:38:17 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Liveproxyd: handle case where no config file exists

by Mathias Kettner

Module: check_mk Branch: master Commit: fa06f58c17b59db465ec49a32cae4fb515a9d0b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa06f58c17b59d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 6 10:35:41 2013 +0200 Liveproxyd: handle case where no config file exists --- doc/treasures/liveproxy/liveproxyd | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 431debe..a87cf10 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -713,13 +713,14 @@ def signal_handler(signum, stack_frame): g_need_reload = True def read_configuration(): - try: - execfile(opt_configfile, globals()) - except Exception, e: - if opt_debug: - raise - bail_out("Cannot read configuration file %s: %s" % ( - opt_configfile, e)) + if os.path.exists(opt_configfile): + try: + execfile(opt_configfile, globals()) + except Exception, e: + if opt_debug: + raise + bail_out("Cannot read configuration file %s: %s" % ( + opt_configfile, e)) # Create state object for all sites for sitename, siteconf in sites.items():

11 years, 3 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 47271ae6d7f98fdef7e881bb89cdb1d14422ffb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47271ae6d7f98f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 17:51:24 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0892

by Mathias Kettner

Module: check_mk Branch: master Commit: 294920270b11d070dfe14ff9069642d2694ae699 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294920270b11d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 17:51:23 2013 +0200 Updated bug entries #0892 --- .bugs/892 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.bugs/892 b/.bugs/892 new file mode 100644 index 0000000..c428f30 --- /dev/null +++ b/.bugs/892 @@ -0,0 +1,23 @@ +Title: Invalid JSON output for BI aggregates? +Component: multisite +State: open +Date: 2013-06-05 17:50:48 +Targetversion: 1.2.3 +Class: bug + +Example: + +[ + [ + 'aggr_name', + 'aggr_state', + 'aggr_output' + ], + [ + "CPU Usage", + "OK", + "" + ] +] + +Problem are the single quotes in the table headers.

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits