Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85ca75a16d87e9afb95ef5131268e923281d2640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85ca75a16d87e9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 6 14:21:30 2012 +0200 add new bug entry --- .bugs/715 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/715 b/.bugs/715 new file mode 100644 index 0000000..a3afa8f --- /dev/null +++ b/.bugs/715 @@ -0,0 +1,10 @@ +Title: WATO permission "edit views" = False disables display of custom views +Component: wato +State: open +Date: 2012-07-06 14:16:42 +Targetversion: 1.2.0 +Class: bug + +if a user is restricted of the rights to edit/create views of his own, he'll also not be able to +see any views that you put in his views.mk +It should be possible to still use that were "installed" on setup.

12 years, 2 months

Check_MK Git: check_mk: FIX: Compile livecheck also if diet libc is missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 491f544c2d7c5274691245463cd5dd3c90264b1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=491f544c2d7c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 14:03:24 2012 +0200 FIX: Compile livecheck also if diet libc is missing --- ChangeLog | 4 ++++ livestatus/src/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cdad1d..2eb3c72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,13 @@ 1.2.0p3: Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations + BI: * Great speed up of rule compilation in large environments + Livecheck: + * FIX: Compile livecheck also if diet libc is missing + 1.2.0p2: Core: * simulation_mode: legacy_checks, custom_checks and active_checks diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 0c69f99..6c59c91 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -51,9 +51,11 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ ContactgroupsColumn.cc opids.cc auth.cc livechecking.c -if HAVE_DIET livecheck: livecheck.c strutil.cc check_icmp.c +if HAVE_DIET diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ +else + $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ endif livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC

12 years, 2 months

Check_MK Git: check_mk: BI: fix problem with FOREACH in leaf nodes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e786b6cfd6bf197933d15af214c91a33c0ac5556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e786b6cfd6bf19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 13:55:03 2012 +0200 BI: fix problem with FOREACH in leaf nodes --- web/htdocs/bi.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 908c64f..14689d3 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -342,6 +342,7 @@ def find_matching_services(what, calllist): continue m = regex(service_re).match(service) if m: + svc_matches = tuple(m.groups()) matches.add(host_matches + svc_matches) else: service_nomatch_cache.add(mo)

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2cf8151ad1aa21d9ed7533422b24e79b255e526d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cf8151ad1aa21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 13:55:06 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Logwatch: Catch another hard SATA controller error by default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1fd5498272d941ebe5bd2dbeeb13c8ec19764d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1fd5498272d94… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 6 13:17:10 2012 +0200 Logwatch: Catch another hard SATA controller error by default --- agents/logwatch.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index cba8c7c..95e8f4b 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -38,6 +38,7 @@ I mdadm.*: Rebuild.*event detected W mdadm\[ W ata.*hard resetting link + W ata.*soft reset failed (.*FIS failed) /var/log/syslog /var/log/kern.log C panic

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85884c6fe9e3912a3e7517ee9a8c336b5f8a44bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85884c6fe9e391… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 6 13:17:28 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fix creation of nagios directories

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60da7c3bedd18be08b1b8f44f201792fa2c20652 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60da7c3bedd18b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:43:42 2012 +0200 Fix creation of nagios directories --- web/htdocs/lib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 1304038..5030383 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -63,7 +63,7 @@ class MKInternalError(Exception): # and make it writable for the group def make_nagios_directory(path): if not os.path.exists(path): - parent_dir, lastpart = path.rsplit('/', 1) + parent_dir, lastpart = path.rstrip('/').rsplit('/', 1) make_nagios_directory(parent_dir) try: os.mkdir(path)

12 years, 2 months

Check_MK Git: check_mk: FIX: remove refresh information on non-refreshable pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb662a1a48fe52955b2c0a85cc6665618dbd4e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb662a1a48fe52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:37:10 2012 +0200 FIX: remove refresh information on non-refreshable pages --- web/htdocs/htmllib.py | 5 +++-- web/htdocs/pages.css | 5 +++++ web/htdocs/views.css | 4 ---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index deffebd..4de2a71 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -850,8 +850,9 @@ class html: if self.req.header_sent: self.bottom_focuscode() corner_text = "" - corner_text += '<div id=foot_refresh>%s</div>' % \ - _("refresh: <div id=foot_refresh_time>%s</div> secs") % self.browser_reload + corner_text += '<div style="display: %s" id=foot_refresh>%s</div>' % ( + (self.browser_reload and "inline-block" or "none", + _("refresh: <div id=foot_refresh_time>%s</div> secs") % self.browser_reload)) if self.render_headfoot: si = self.render_status_icons() self.write("<table class=footer><tr>" diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 501ef80..cf547fc 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -161,6 +161,11 @@ body.main table.footer img.statusicon { top: -3px; } +div#foot_refresh, div#foot_refresh_time { + display: inline-block; +} + + /*-------------------------------------------------------------------------. | ____ _ _ _ _ _ | | / ___|___ _ __ | |_ _____ _| |_| (_)_ __ | | _____ | diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 56c0cb7..60ce869 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -32,10 +32,6 @@ body.main.dashlet { padding: 0px; } -div#foot_refresh, div#foot_refresh_time { - display: inline-block; -} - /*-------------------------------------------------------------------------. | _____ _ ___ ___ _ _ | | |_ _|_ _| |__ ___ ( _ ) / _ \ _ __ | |_(_) ___ _ __ ___ |

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22920a4425d361154dc74d6c9e86ea27cf589752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22920a4425d361… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:37:12 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: mssql_backup: Fixed problems with datetime/ timezone calculations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dacd77491a84c67bc2e46f577cd82bddacf66a0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dacd77491a84c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 6 09:53:54 2012 +0200 mssql_backup: Fixed problems with datetime/timezone calculations --- ChangeLog | 2 ++ agents/windows/plugins/mssql.vbs | 2 +- checks/mssql_backup | 11 +++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bfcfa3..8cdad1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.0p3: + Checks & Agents: + * mssql_backup: Fixed problems with datetime/timezone calculations BI: * Great speed up of rule compilation in large environments diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index c2dc35c..faceb6f 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -144,7 +144,7 @@ For Each instId In instIds.Keys Dim lastBackupDate wscript.echo "<<<mssql_backup>>>" For Each dbName in dbNames.Keys - RS.open "SELECT DATEDIFF(s, '19700101', MAX(backup_finish_date)) AS last_backup_date " & _ + RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date " & _ "FROM msdb.dbo.backupset " & _ "WHERE database_name = '" & dbName & "'", CONN Do While Not RS.Eof diff --git a/checks/mssql_backup b/checks/mssql_backup index 75f5679..2f5f363 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -24,7 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime +import datetime, time +import pytz #<<<mssql_backup>>> #MSSQL_SQLEXPRESS test123 1331207325 @@ -38,14 +39,12 @@ def inventory_mssql_backup(info): def check_mssql_backup(item, params, info): for line in info: - inst, tablespace, last_backup_timestamp = line + inst, tablespace, last_backup_date, last_backup_time = line if item == inst + ' ' + tablespace: - last_backup_timestamp = int(last_backup_timestamp) - dt = datetime.datetime.fromtimestamp(last_backup_timestamp) + dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[0:5]) state = 0 - now = datetime.datetime.now() - sec_ago = int(now.strftime('%s')) - last_backup_timestamp + sec_ago = (datetime.datetime.now() - dt).seconds if params is not None: if sec_ago >= params[1]:

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits