Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: if64: check now supports clustering

by Götz Golla

Module: check_mk Branch: master Commit: 3d5c59dd7a1e07e4ca92b8a103881730434993a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d5c59dd7a1e07… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 27 10:42:37 2014 +0100 if64: check now supports clustering If you have a cluster of two or more hosts, and the check is configured as a clustered service for an interface, the interface with the highest output traffic is considered the active interface, and only this interface is monitored and assigned to the cluster. The check denotes from which node the interface data is taken. --- .werks/574 | 12 ++++++++ ChangeLog | 1 + checkman/if64 | 10 +++++-- checks/if.include | 83 +++++++++++++++++++++++++++++++++++++++++------------ checks/if64 | 12 ++++---- 5 files changed, 93 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3d5c59dd7a…

10 years, 5 months

Check_MK Git: check_mk: FIX wato inventory: fixed missing services

by Andreas Boesl

Module: check_mk Branch: master Commit: e7f66e58b20b76368c869da043899bdec7582240 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7f66e58b20b76… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 27 10:34:21 2014 +0100 FIX wato inventory: fixed missing services If a host had more inventorized services than they were specified in the global option "Limit the number of rows shown in tables" specified, the excess services got ignored. --- .werks/268 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/268 b/.werks/268 new file mode 100644 index 0000000..54a00f8 --- /dev/null +++ b/.werks/268 @@ -0,0 +1,10 @@ +Title: wato inventory: fixed missing services +Level: 2 +Component: wato +Version: 1.2.5i1 +Date: 1390814913 +Class: fix + +If a host had more inventorized services than they were specified in +the global option "Limit the number of rows shown in tables" specified, +the excess services got ignored. diff --git a/ChangeLog b/ChangeLog index c374413..04f0782 100644 --- a/ChangeLog +++ b/ChangeLog @@ -228,6 +228,7 @@ * 0433 FIX: Creating WATO lock during automations (like e.g. master to slave syncs)... * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places + * 0268 FIX: wato inventory: fixed missing services... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b5226ec..ab66e2c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2557,7 +2557,7 @@ def show_service_table(host, firsttime): if html.var("_scan"): html.hidden_field("_scan", "on") - table.begin(css ="data", searchable = False) + table.begin(css ="data", searchable = False, limit = None) # This option will later be switchable somehow

10 years, 5 months

Check_MK Git: check_mk: FIX Fixed auth. serials permission problem in check_mk standalone installation

by Andreas Boesl

Module: check_mk Branch: master Commit: f8cb2415cd0c119a8e98bd4434d01af22da176a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8cb2415cd0c11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 27 09:56:37 2014 +0100 FIX Fixed auth.serials permission problem in check_mk standalone installation --- .werks/267 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 11 +++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/267 b/.werks/267 new file mode 100644 index 0000000..d6953cc --- /dev/null +++ b/.werks/267 @@ -0,0 +1,13 @@ +Title: Fixed auth.serials permission problem in check_mk standalone installation +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390812956 + +In a standalone installation the path <tt>/usr/local/nagios/etc</tt> is not writable by the apache user. +The user management module tried to create a file <tt>/usr/local/nagios/etc/auth_serials.new</tt> and rename it to +<tt>/usr/local/nagios/etc/auth_serials</tt> afterwards -> failed +The workaround is that no <tt>auth_serials.new</tt> file will be created on standalone installations. +The user management module now directly writes in <tt>auth_serials</tt>. diff --git a/ChangeLog b/ChangeLog index 6ef8201..c374413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0453 FIX: Fix ugly Python exception in host diagnosis page in case of SNMP error... * 0696 FIX: Remove garbled output of cmk -v in state of CMC * 0682 FIX: Allow overriding of active and custom checks by more specific rule... + * 0267 FIX: Fixed auth.serials permission problem in check_mk standalone installation... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index ce7a5b9..7aba253 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -423,7 +423,13 @@ def save_users(profiles): # Write out the users serials serials_file = '%s/auth.serials.new' % os.path.dirname(defaults.htpasswd_file) - out = create_user_file(serials_file, "w") + rename_file = True + try: + out = create_user_file(serials_file, "w") + except: + rename_file = False + out = create_user_file(serials_file[:-4], "w") + def encode_utf8(value): if type(value) == unicode: value = value.encode("utf-8") @@ -432,7 +438,8 @@ def save_users(profiles): for user_id, user in profiles.items(): out.write('%s:%d\n' % (encode_utf8(user_id), user.get('serial', 0))) out.close() - os.rename(serials_file, serials_file[:-4]) + if rename_file: + os.rename(serials_file, serials_file[:-4]) # Write user specific files for id, user in profiles.items():

10 years, 5 months

Check_MK Git: check_mk: Updated bug entries #1088

by Mathias Kettner

Module: check_mk Branch: master Commit: ed54dc9fce428196363059d9339a35df705523c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed54dc9fce4281… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 17:04:48 2014 +0100 Updated bug entries #1088 --- .bugs/1088 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1088 b/.bugs/1088 new file mode 100644 index 0000000..401d001 --- /dev/null +++ b/.bugs/1088 @@ -0,0 +1,9 @@ +Title: Keepalive mode adds multiple --keepalive-fd=__ as time goes by +Component: core +State: open +Date: 2014-01-24 16:57:53 +Targetversion: 1.2.5i1 +Class: nastiness + +It seems that after each config reload one --keepalive-fd=7 is added to the command line. +The Check_MK should remove this option when adding new one.

10 years, 5 months

Check_MK Git: check_mk: downgraded werk 265

by Andreas Boesl

Module: check_mk Branch: master Commit: 45f7a62542f9dc143720bdfaf41ec1c7232b711d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45f7a62542f9dc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 24 16:36:24 2014 +0100 downgraded werk 265 --- .werks/265 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/265 b/.werks/265 index 7d25af0..1c019d6 100644 --- a/.werks/265 +++ b/.werks/265 @@ -1,5 +1,5 @@ Title: mpre_include: run additional mrpe configs within user context -Level: 2 +Level: 1 Component: checks Version: 1.2.5i1 Date: 1390568187

10 years, 5 months

Check_MK Git: check_mk: windows_agent: now supports mrpe include files

by Andreas Boesl

Module: check_mk Branch: master Commit: bb453b034b72937884f079c954914ae1b4f8c1c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb453b034b7293… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 24 16:29:22 2014 +0100 windows_agent: now supports mrpe include files This version introduces the mrpe configuration option <tt>include</tt>. With this option you can define addiontal include files and the user domain in which include files should be executed. F+:check_mk.ini [mrpe] # Run classical Nagios plugins. The word before the command # line is the service description for Nagios. Use backslashes # in Windows-paths. check = Dummy mrpe\check_crit check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 check = Whatever c:\myplugins\check_whatever -w 10 -c 20 # Additional mrpe configs # The include files can be changed during the runtime include \\ab = C:\includes\ab_mrpe.cfg include \\NT-AUTORITÄT\SYSTEM = C:\includes\system_mrpe.cfg # If you omit the user the file is executed with the current user include = C:\includes\default.cfg F-: The syntax in the mrpe include file is the same as in the mrpe section, with the exception that you cannot add further includes in a include file. There is also no need to define a <tt>[mrpe]</tt> section in an included file. You just need to define the <tt>check</tt> lines here. F+:ab_mrpe.cfg check = Dummy mrpe\check_crit check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 F-: Important: Keep in mind that the agent needs the permission to run scripts as other user. Internally it uses the windows command <tt>runas /User:</tt> which prompts for a password if agent has no permission to change to this user. In this case the check_mk agent will get stuck! --- .werks/266 | 40 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 133 +++++++++++++++++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 158208 -> 160768 bytes agents/windows/install_agent.exe | Bin 150334 -> 151693 bytes 5 files changed, 168 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb453b034b…

10 years, 5 months

Check_MK Git: check_mk: Fix localization of WATO host tags

by Mathias Kettner

Module: check_mk Branch: master Commit: 998f2c1fbdb912055e0c93385a732040824fe115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=998f2c1fbdb912… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 16:19:52 2014 +0100 Fix localization of WATO host tags --- web/htdocs/lib.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 3dd76b8..97ef36e 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -354,21 +354,22 @@ def release_all_locks(): __builtin__.default_user_localizations = { - u'Agent type': { "de": u"Art des Agenten", }, - u'Business critical': { "de": u"Geschäftskritisch", }, - u'Check_MK Agent (Server)': { "de": u"Check_MK Agent (Server)", }, - u'Criticality': { "de": u"Kritikalität", }, - u'DMZ (low latency, secure access)': { "de": u"DMZ (geringe Latenz, hohe Sicherheit", }, - u'Do not monitor this host': { "de": u"Diesen Host nicht überwachen", }, - u'Dual: Check_MK Agent + SNMP': { "de": u"Dual: Check_MK Agent + SNMP", }, - u'Legacy SNMP device (using V1)': { "de": u"Alte SNMP-Geräte (mit Version 1)", }, - u'Local network (low latency)': { "de": u"Lokales Netzwerk (geringe Latenz)", }, - u'Networking Segment': { "de": u"Netzwerksegment", }, - u'No Agent': { "de": u"Kein Agent", }, - u'Productive system': { "de": u"Produktivsystem", }, - u'Test system': { "de": u"Testsystem", }, - u'WAN (high latency)': { "de": u"WAN (hohe Latenz)", }, - u'monitor via Check_MK Agent': { "de": u"Überwachung via Check_MK Agent", }, - u'monitor via SNMP': { "de": u"Überwachung via SNMP", }, + u'Agent type': { "de": u"Art des Agenten", }, + u'Business critical': { "de": u"Geschäftskritisch", }, + u'Check_MK Agent (Server)': { "de": u"Check_MK Agent (Server)", }, + u'Criticality': { "de": u"Kritikalität", }, + u'DMZ (low latency, secure access)': { "de": u"DMZ (geringe Latenz, hohe Sicherheit", }, + u'Do not monitor this host': { "de": u"Diesen Host nicht überwachen", }, + u'Dual: Check_MK Agent + SNMP': { "de": u"Dual: Check_MK Agent + SNMP", }, + u'Legacy SNMP device (using V1)': { "de": u"Alte SNMP-Geräte (mit Version 1)", }, + u'Local network (low latency)': { "de": u"Lokales Netzwerk (geringe Latenz)", }, + u'Networking Segment': { "de": u"Netzwerksegment", }, + u'No Agent': { "de": u"Kein Agent", }, + u'Productive system': { "de": u"Produktivsystem", }, + u'Test system': { "de": u"Testsystem", }, + u'WAN (high latency)': { "de": u"WAN (hohe Latenz)", }, + u'monitor via Check_MK Agent': { "de": u"Überwachung via Check_MK Agent", }, + u'monitor via SNMP': { "de": u"Überwachung via SNMP", }, + u'SNMP (Networking device, Appliance)': { "de": u"SNMP (Netzwerkgerät, Appliance)", }, }

10 years, 5 months

Check_MK Git: check_mk: Fix WATO Snapin error message if WATO is disabled

by Mathias Kettner

Module: check_mk Branch: master Commit: 1eb7f66c9878e56093610d60e55140513609f0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb7f66c9878e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 16:19:38 2014 +0100 Fix WATO Snapin error message if WATO is disabled --- web/plugins/sidebar/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 418af3f..487a34a 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -37,6 +37,7 @@ import config, wato def render_wato(mini): if not config.wato_enabled: html.write(_("WATO is disabled in <tt>multisite.mk</tt>.")) + return False elif not config.may("wato.use"): html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) return False

10 years, 5 months

Check_MK Git: check_mk: New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP

by Mathias Kettner

Module: check_mk Branch: master Commit: fdeddedbbc21fa289d14ade4b14f0fe6e34e83ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdeddedbbc21fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 15:55:08 2014 +0100 New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP These two variables have been added to <tt>check_mk_templates.cfg</tt>. --- .werks/684 | 8 ++++++++ ChangeLog | 1 + check_mk_templates.cfg | 2 ++ 3 files changed, 11 insertions(+) diff --git a/.werks/684 b/.werks/684 new file mode 100644 index 0000000..c333d47 --- /dev/null +++ b/.werks/684 @@ -0,0 +1,8 @@ +Title: New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP +Level: 1 +Component: notifications +Version: 1.2.5i1 +Date: 1390575275 +Class: feature + +These two variables have been added to <tt>check_mk_templates.cfg</tt>. diff --git a/ChangeLog b/ChangeLog index 1da06da..a458878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -229,6 +229,7 @@ Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... + * 0684 New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP... * 0108 FIX: Prevent service notification on host alerts... * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 88f1680..a6f04d7 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -366,6 +366,7 @@ define command { NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \ NOTIFY_LASTHOSTSTATE='$LASTHOSTSTATE$' \ NOTIFY_LASTHOSTSTATECHANGE='$LASTHOSTSTATECHANGE$' \ + NOTIFY_LASTHOSTUP='$LASTHOSTUP$' \ NOTIFY_HOSTSTATE='$HOSTSTATE$' \ NOTIFY_HOSTSTATEID='$HOSTSTATEID$' \ NOTIFY_HOSTCHECKCOMMAND='$HOSTCHECKCOMMAND$' \ @@ -375,6 +376,7 @@ define command { NOTIFY_SERVICEDESC='$SERVICEDESC$' \ NOTIFY_LASTSERVICESTATE='$LASTSERVICESTATE$' \ NOTIFY_LASTSERVICESTATECHANGE='$LASTSERVICESTATECHANGE$' \ + NOTIFY_LASTSERVICEOK='$LASTSERVICEOK$' \ NOTIFY_SERVICESTATE='$SERVICESTATE$' \ NOTIFY_SERVICESTATEID='$SERVICESTATEID$' \ NOTIFY_SERVICEOUTPUT='$SERVICEOUTPUT$' \

10 years, 5 months

Check_MK Git: check_mk: Removed lots of trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 83449113626d5fb22d49a630683d8b595fd24e9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83449113626d5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 15:53:10 2014 +0100 Removed lots of trailing spaces --- Makefile | 2 +- check_mk_templates.cfg | 14 ++++++------ checkman/cmciii_lcp_waterin | 2 +- checkman/emcvnx_raidgroups.capacity | 2 +- checkman/emcvnx_raidgroups.capacity_contiguous | 4 ++-- checkman/hitachi_hnas_fc_if | 4 ++-- checkman/mem.used | 2 +- checkman/mikrotik_signal | 4 ++-- checkman/unitrends_backup | 4 ++-- checkman/unitrends_replication | 4 ++-- checks/emcvnx_info | 18 +++++++-------- checks/emcvnx_raidgroups | 28 ++++++++++++------------ checks/hitachi_hnas_volume | 4 ++-- checks/hp_proliant_raid | 2 +- checks/mem | 2 +- checks/mikrotik_signal | 2 +- checks/unitrends_backup | 2 +- checks/unitrends_replication | 4 ++-- web/htdocs/views.py | 2 +- 19 files changed, 53 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8344911362…

10 years, 5 months

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014