Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 74fadac9bcd93637a04f678bb77b33fbe63b400c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74fadac9bcd936… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 17:09:23 2014 +0100 Merge brancl 'master' of ssh://mathias-kettner.de/check_mk ---

9 years, 9 months

Check_MK Git: check_mk: #1738 FIX oracle_instance: Be compatible to old oracle agent outputs

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e5ea6786b2a0535e4d85b1478297eef7ffdefcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5ea6786b2a05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 16:42:38 2014 +0100 #1738 FIX oracle_instance: Be compatible to old oracle agent outputs --- .werks/1738 | 9 +++++++++ ChangeLog | 1 + checks/oracle_instance | 10 +++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/1738 b/.werks/1738 new file mode 100644 index 0000000..f9ae8c0 --- /dev/null +++ b/.werks/1738 @@ -0,0 +1,9 @@ +Title: oracle_instance: Be compatible to old oracle agent outputs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418139738 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 47e6f17..e8074a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,6 +156,7 @@ * 1735 FIX: oracle_instance: Inventory function deals better with old bogus agent output * 1736 FIX: lparstat_aix: Trying to deal with more kind of lparstat output... * 1737 FIX: mk_sap: Working around garbled SAP state file when multiple instances were running parallel + * 1738 FIX: oracle_instance: Be compatible to old oracle agent outputs Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/oracle_instance b/checks/oracle_instance index 5607ba3..5f8e108 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -66,10 +66,18 @@ def check_oracle_instance(item, params, info): if line[1] == 'FAILURE': return 2, " ".join(line[2:]) + state = 0 + + # Be compatible to old oracle agent plugin output + if len(line) == 6: + sid, version, openmode, logins, _unused, _unused2 = line + infotext = 'Status %s, Version %s, Logins %s' % (openmode, version, logins.lower()) + state, infotext = state_marker(state, infotext, 'logins', logins, 'RESTRICTED') + return state, infotext + sid, version, openmode, logins, archiver, up_seconds, dbid, \ log_mode, database_role, force_logging, name = line - state = 0 infotext = "Database Name %s, Status %s" % \ (name, openmode)

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2275

by Bastian Kuhn

Module: check_mk Branch: master Commit: 92dc53a3be2632524ebb8536e626790b3e2a90bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92dc53a3be2632… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 9 16:22:45 2014 +0100 Updated bug entries #2275 --- .bugs/2275 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2275 b/.bugs/2275 new file mode 100644 index 0000000..84fa109 --- /dev/null +++ b/.bugs/2275 @@ -0,0 +1,8 @@ +Title: Filters are missing after adding a view to a dashboard +Component: multisite +State: open +Date: 2014-12-09 16:21:48 +Targetversion: 1.2.5i1 +Class: bug + +After adding a new view to a dashboard, the list of filters in the view are empty.

9 years, 9 months

Check_MK Git: check_mk: #1749 Allow title of notifiation script to be in third line if second line is encoding : utf-8

by Mathias Kettner

Module: check_mk Branch: master Commit: 94bf2708088d10857a92ba2afdc8a32d8f790630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94bf2708088d10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 16:07:32 2014 +0100 #1749 Allow title of notifiation script to be in third line if second line is encoding: utf-8 This allows to write Python script with non-ASCII characters as notification scripts: F+:mynotify #!/usr/bin/python # encoding: utf-8 # Notify With Föbäz F-: --- .werks/1749 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 18 insertions(+) diff --git a/.werks/1749 b/.werks/1749 new file mode 100644 index 0000000..3e73821 --- /dev/null +++ b/.werks/1749 @@ -0,0 +1,15 @@ +Title: Allow title of notifiation script to be in third line if second line is encoding: utf-8 +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1418137567 +Class: feature + +This allows to write Python script with non-ASCII characters as notification scripts: + +F+:mynotify +#!/usr/bin/python +# encoding: utf-8 +# Notify With Föbäz +F-: diff --git a/ChangeLog b/ChangeLog index 47e6f17..b2bae67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -262,6 +262,7 @@ Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... * 1650 Enabled rule based notifications by default (for new installations)... + * 1749 Allow title of notifiation script to be in third line if second line is encoding: utf-8... * 1168 FIX: HTML mails can now be configured to display graphs among each other... * 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core... * 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9315159..4867850 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11408,6 +11408,8 @@ def load_notification_scripts_from(adir): lines = file(path) lines.next() line = lines.next().strip() + if line.startswith("#") and "encoding:" in line: + line = lines.next().strip() if line.startswith("#"): info["title"] = line.lstrip("#").strip().split("#", 1)[0] while True:

9 years, 9 months

Check_MK Git: check_mk: Fixed typo in notification script name

by Mathias Kettner

Module: check_mk Branch: master Commit: 883906a7cde35568d68464f44b677b0cb4c839f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=883906a7cde355… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 16:00:12 2014 +0100 Fixed typo in notification script name --- notifications/spectrum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notifications/spectrum b/notifications/spectrum index 37d945a..dee63b2 100755 --- a/notifications/spectrum +++ b/notifications/spectrum @@ -1,5 +1,5 @@ #!/usr/bin/python -# Sepectrum Server +# Spectrum Server # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

9 years, 9 months

Check_MK Git: check_mk: Cleaned up import

by Lars Michelsen

Module: check_mk Branch: master Commit: 15f93b3f21faaa515da44d7a8d30bffc293bb384 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f93b3f21faaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 15:46:41 2014 +0100 Cleaned up import --- agents/plugins/mk_sap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 55adffe..dfd1ef9 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -38,7 +38,7 @@ # # During development the "CCMS_Doku.pdf" was really helpful. -import os, sys +import os, sys, fcntl import time, datetime # sapnwrfc needs to know where the libs are located. During @@ -486,7 +486,6 @@ try: # Only write the state file once per run. And only when it has been changed if state_file_changed: - import fcntl new_file = STATE_FILE + '.new' fd = os.open(new_file, os.O_WRONLY | os.o_CREAT) fcntl.flock(fd, fcntl.LOCK_EX)

9 years, 9 months

Check_MK Git: check_mk: #1737 FIX mk_sap: Working around garbled SAP state file when multiple instances were running parallel

by Lars Michelsen

Module: check_mk Branch: master Commit: 88bafd82f3eaf65696c68158c7ab531ff1932e7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88bafd82f3eaf6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 15:46:02 2014 +0100 #1737 FIX mk_sap: Working around garbled SAP state file when multiple instances were running parallel --- .werks/1737 | 9 +++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/1737 b/.werks/1737 new file mode 100644 index 0000000..b3ba801 --- /dev/null +++ b/.werks/1737 @@ -0,0 +1,9 @@ +Title: mk_sap: Working around garbled SAP state file when multiple instances were running parallel +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418136328 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1572a3a..47e6f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,7 @@ * 1748 FIX: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data * 1735 FIX: oracle_instance: Inventory function deals better with old bogus agent output * 1736 FIX: lparstat_aix: Trying to deal with more kind of lparstat output... + * 1737 FIX: mk_sap: Working around garbled SAP state file when multiple instances were running parallel Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 36509a3..55adffe 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -486,7 +486,13 @@ try: # Only write the state file once per run. And only when it has been changed if state_file_changed: - file(STATE_FILE, 'w').write(repr(states)) + import fcntl + new_file = STATE_FILE + '.new' + fd = os.open(new_file, os.O_WRONLY | os.o_CREAT) + fcntl.flock(fd, fcntl.LOCK_EX) + os.write(fd, repr(states)) + os.close(fd) + os.rename(STATE_FILE+'.new', STATE_FILE) except Exception, e: sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e)

9 years, 9 months

Check_MK Git: check_mk: Fix some rare occasions where cmk --flush could fail

by Mathias Kettner

Module: check_mk Branch: master Commit: fc0dc63c01f9607bb08b51bbee08f2f4a5db5334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc0dc63c01f960… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 15:33:18 2014 +0100 Fix some rare occasions where cmk --flush could fail --- modules/check_mk.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9b5e8ef..f56b71c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3184,17 +3184,22 @@ def remove_autochecks_of(hostname, checktypes = None): # None = all if double_quoted.startswith('("'): count += 1 splitted = double_quoted.split('"') - if splitted[1] != hostname or (checktypes != None and splitted[3] not in checktypes): + if len(splitted) < 4: + lines.append(line) # invalid or irrelevant line + elif splitted[1] != hostname or (checktypes != None and splitted[3] not in checktypes): if splitted[3] not in check_info: sys.stderr.write('Removing unimplemented check %s\n' % splitted[3]) - continue - lines.append(line) + removed += 1 + else: + lines.append(line) else: removed += 1 if len(lines) == 0: if opt_verbose: sys.stdout.write("Deleting %s.\n" % fn) - os.remove(fn) + if os.path.exists(fn): + os.remove(fn) + elif count > len(lines): if opt_verbose: sys.stdout.write("Removing %d checks from %s.\n" % (count - len(lines), fn)) @@ -3210,7 +3215,8 @@ def remove_all_autochecks(): for f in glob.glob(autochecksdir + '/*.mk'): if opt_verbose: sys.stdout.write("Deleting %s.\n" % f) - os.remove(f) + if os.path.exists(f): + os.remove(f) def reread_autochecks(): global checks @@ -5169,7 +5175,8 @@ def do_cleanup_autochecks(): if f not in newfiles: if opt_debug: sys.stdout.write("Deleting %s\n" % f) - os.remove(f) + if os.path.exists(f): + os.remove(f) def find_bin_in_path(prog): for path in os.environ['PATH'].split(os.pathsep):

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2211

by Lars Michelsen

Module: check_mk Branch: master Commit: 5eebb4b2080dc2cd5544f5a19a9340331063ce13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eebb4b2080dc2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 14:15:29 2014 +0100 Updated bug entries #2211 --- .bugs/2211 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.bugs/2211 b/.bugs/2211 new file mode 100644 index 0000000..5d66c5e --- /dev/null +++ b/.bugs/2211 @@ -0,0 +1,39 @@ +Title: Make mailq check monitor different queues individually +Component: checks +State: open +Date: 2014-12-09 14:04:59 +Targetversion: future +Class: feature + +I am currently migrating from using NRPE/nagios-statd to check_mk and I +have some checks that I have written for monitoring postfix mail queues. + +I found the check_mk postfix_mailq check but it seems to only provide +the total mailq number. The check I had been using was a nagios plugin +running via NRPE that just counted the files directly in the various +spool directories. It just takes the queue name as an option. + +On my production mail servers it is very useful to be able to set +limits for each queue. + +For example: +* deferred is normally higher on busy servers due to undelivable mail, + bounces, remote server problems, etc. (thousands) +* active should usually be pretty low when the server is functioning + correctly (<20 on relays, <150 on machine receiving mail and + doing spam processing) +* maildrop might have spikes if services are injecting a lot of mail + but should clear quickly if the server is functioning well +* hold should almost always be zero unless an admin is doing things + or postfix is configured to automatically put certain things on + hold (in which case you probably want to know about it). This + is handy for reminding me to take things back off hold when I + forget +* corrupt should probably always be zero + +I can continue to use my local check via MRPE, but it would be much +nicer if check_mk's native check could support this. (and if it does, +checking the spool dirs directly is probably lighter weight than +running mailq). + +Oh and the separate perfdata would be interesting too.

9 years, 9 months

Check_MK Git: check_mk: #1734 check_sql: Added support for DB2 ( thanks to Troels Arvin)

by Lars Michelsen

Module: check_mk Branch: master Commit: d9016eb92f8826d2c65a652eda1cab690dbc846f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9016eb92f8826… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 14:17:13 2014 +0100 #1734 check_sql: Added support for DB2 (thanks to Troels Arvin) --- .werks/1734 | 9 +++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_sql | 19 ++++++++++++++++++- web/plugins/wato/active_checks.py | 9 +++++---- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.werks/1734 b/.werks/1734 new file mode 100644 index 0000000..c70c517 --- /dev/null +++ b/.werks/1734 @@ -0,0 +1,9 @@ +Title: check_sql: Added support for DB2 (thanks to Troels Arvin) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418130932 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index effd197..0a08068 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices * 1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) * 1694 cisco_wlc/cisco_wlc_clients: Added support for Cisco AIR-CT2504-K9 + * 1734 check_sql: Added support for DB2 (thanks to Troels Arvin) * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 51b7aa3..c2aa87a 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -24,6 +24,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# DB2 support requires installation of the IBM Data Server Client: +# http://www-01.ibm.com/support/docview.wss?uid=swg27016878 +# as well as the ibm_db2 Python DBI driver for DB2: +# https://pypi.python.org/pypi/ibm_db import sys, getopt @@ -48,7 +52,7 @@ OPTIONS: -p PASS, --password PASS Password for database access -d DBMS, --dbms DBMS Name of the database management system. Default is 'postgres', other valid values are - 'mysql', 'mssql' and 'oracle' + 'mysql', 'mssql', 'oracle' and 'db2' -H HOST, --hostname HOST Hostname or IP-Address where the database lives. Default is '127.0.0.1' -P PORT, --port PORT Port used to connect to the database -n NAME, --name NAME Name of the database on the DBMS @@ -179,6 +183,19 @@ try: opt_port=1521 cstring = opt_user+"/"+opt_password+"@"+opt_hostname+":"+str(opt_port)+"/"+opt_name db_connection = db.connect(cstring) + + elif opt_dbms == "db2": + import ibm_db # IBM data server driver + import ibm_db_dbi + db = ibm_db + if opt_port == None: + opt_port=50000 + cstring = 'DRIVER={IBM DB2 ODBC DRIVER};DATABASE='+opt_name+ \ + ';HOSTNAME='+opt_hostname+';PORT='+str(opt_port)+';PROTOCOL=TCPIP;'+ \ + 'UID='+opt_user+';PWD='+opt_password+';' + ibm_db_conn = db.connect(cstring,'','') + db_connection = ibm_db_dbi.Connection(ibm_db_conn) + else: print "UNKNOWN - dbms not found" sys.exit(3) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1b5497b..31083e7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -256,10 +256,11 @@ register_rule(group, DropdownChoice( title = _("Type of Database"), choices = [ - ( "mysql", _("MySQL") ), - ( "postgres", _("PostgreSQL") ), - ( "mssql", _("MSSQL") ), - ( "oracle", _("Oracle") ), + ("mysql", _("MySQL")), + ("postgres", _("PostgreSQL")), + ("mssql", _("MSSQL")), + ("oracle", _("Oracle")), + ("db2", _("DB2")), ], default_value = "postgres", ),

9 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014