Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Fixed mrproper in Makefile

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: b8b55d41920051b69df7675f0e18045d6a049676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b55d41920051… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 11:11:31 2012 +0200 Fixed mrproper in Makefile --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0fb1ab0..ad843dd 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ clean: find -name "*~" | xargs rm -f mrproper: - git clean -xfd -e .bugs || git clean -xfd + git clean -xfd -e .bugs 2>/dev/null || git clean -xfd check: @set -e ; for checkfile in *.HS ; do \

12 years, 3 months

Check_MK Git: check_mk: Set version to 1.2.0b6

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3b5c324c47166c1e9e7951f5166a4b0cbec599c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3b5c324c47166… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 11:10:39 2012 +0200 Set version to 1.2.0b6 --- ChangeLog | 2 +- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124978 -> 124972 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 16 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fee8e1..bb35ad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.0: +1.2.0b6: Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page diff --git a/Makefile b/Makefile index 0067e9f..0fb1ab0 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0b5 +VERSION = 1.2.0b6 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7684cad..4763a7e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 9f7722a..6391e0d 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 0a2bba6..cf10a36 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2b03e46..ec86486 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index ec2ed5a..0610a57 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 290430a..a3d1811 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0b5 +echo Version: 1.2.0b6 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 72f770c..1c30448 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.0b5" +#define CHECK_MK_VERSION "1.2.0b6" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a2dcb57..eb61a74 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 57bb721..e6c8256 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 87a13dc..f6a50ce 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 3873053..62e6d43 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.0b5" +!define CHECK_MK_VERSION "1.2.0b6" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index a19f46d..3a6f3c1 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0b5-1_all.deb net optional +check-mk_1.2.0b6-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 5054283..11f63b6 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.0b5], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0b6], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index c908336..f47cecd 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0b5 +VERSION=1.2.0b6 NAME=check_mk LANG= LC_ALL=

12 years, 3 months

Check_MK Git: check_mk: Agents/MacOS X - add ntp / tcp session monitoring

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b2111eeeb1395647e17721a8a74827a1ab23f213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2111eeeb13956… Author: Florian Heigl <florian.heigl(a)gmail.com> Date: Sat Jun 2 14:16:44 2012 +0200 Agents/MacOS X - add ntp / tcp session monitoring Signed-off-by: Florian Heigl <fh(a)mathias-kettner.de> --- agents/check_mk_agent.macosx | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 7f143e9..ec2ed5a 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -57,6 +57,25 @@ print $1,$7,$5,$6,"0","0","0","0","0",$10,$8,$9,"0","0",$11,"0","0"; }' echo '<<<ps>>>' ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' +# NTP seems to be enabled as a default +echo '<<<ntp>>>' + ntpq -pn | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + +# TCP Conn stats +echo '<<<tcp_conn_stats>>>' + netstat -ntfinet | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' + +############################### +# Things up for takers: +############################### +# *Add agent debug mode +# *OSX SW Raid status +# *launchctl daemon status +# *hw sensors, how to query them? +# *OSX Server specific stuff, LDAP, etc... +# *Rewrite cpu / ps check to be faster - takes >1s on my laptop + + # MK's Remote Plugin Executor if [ -e "/etc/mrpe.cfg" ] then

12 years, 3 months

Check_MK Git: check_mk: FIX: Added missing permission check when an admin defined a view for other users

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e1387c341f8cfb3e4b4f667a9ea38f516d369ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e1387c341f8cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 4 09:10:29 2012 +0200 FIX: Added missing permission check when an admin defined a view for other users --- web/htdocs/views.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e9fe53e..5c33613 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -280,6 +280,11 @@ def available_views(): # 2. views of special users allowed to globally override builtin views for (u, n), view in html.multisite_views.items(): if n not in views and view["public"] and config.user_may(u, "force_views"): + # Honor original permissions for the current user + permname = "view.%s" % n + if config.permission_exists(permname) \ + and not config.may(permname): + continue views[n] = view # 3. Builtin views, if allowed. @@ -293,8 +298,7 @@ def available_views(): if n not in views and view["public"] and config.user_may(u, "publish_views"): # Is there a builtin view with the same name? If yes, honor permissions. permname = "view.%s" % n - if (u, n) in html.multisite_views \ - and config.permission_exists(permname) \ + if config.permission_exists(permname) \ and not config.may(permname): continue views[n] = view

12 years, 3 months

Check_MK Git: check_mk: Removed unused old .f12 file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fea79afb35cf3bbc3736cc69c694f16dd9f76671 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea79afb35cf3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 14:53:16 2012 +0200 Removed unused old .f12 file --- web/plugins/pages/.f12 | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/plugins/pages/.f12 b/web/plugins/pages/.f12 deleted file mode 100644 index eda8113..0000000 --- a/web/plugins/pages/.f12 +++ /dev/null @@ -1,2 +0,0 @@ -sudo cp -pv *.py /omd/versions/default/share/check_mk/web/plugins/pages -sudo omd restart wato apache

12 years, 3 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: efb899d65b178d514a4c0668bc8df753514054c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efb899d65b178d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 4 08:44:12 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: I18n'ed two error messages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f0bc23545a7575f75d28822559df7331623c76e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f0bc23545a757… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 08:17:51 2012 +0200 I18n'ed two error messages --- web/htdocs/views.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3d537b3..e9fe53e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -254,14 +254,14 @@ def load_views(): sourcecode = f.read() t += 1 if t > 10: - raise MKGeneralException("Cannot load views from %s/view.mk: file empty or not flushed" % dirpath) + raise MKGeneralException(_("Cannot load views from %s/view.mk: file empty or not flushed") % dirpath) views = eval(sourcecode) for name, view in views.items(): view["owner"] = user view["name"] = name html.multisite_views[(user, name)] = view except SyntaxError, e: - raise MKGeneralException("Cannot load views from %s/views.mk: %s" % (dirpath, e)) + raise MKGeneralException(_("Cannot load views from %s/views.mk: %s") % (dirpath, e)) html.available_views = available_views()

12 years, 3 months

Check_MK Git: check_mk: fixed exception with custom views created by normal users

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9dd423b016bf26869eced8462fff222825c0dbab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd423b016bf26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 08:17:35 2012 +0200 fixed exception with custom views created by normal users --- ChangeLog | 1 + web/htdocs/config.py | 3 +++ web/htdocs/views.py | 5 ++++- 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 249d6f3..9fee8e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ option "B" again * FIX: preselected "refresh" option did not reflect view settings but was simply the first available option - usually 30. + * FIX: fixed exception with custom views created by normal users WATO: * FIX: Fixed "select all" button in hosts & folders for IE diff --git a/web/htdocs/config.py b/web/htdocs/config.py index d4381c1..6df6cb4 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -301,6 +301,9 @@ def need_permission(pname): "then please ask you administrator to provide you with " "the following permission: '<b>%s</b>'.") % perm["title"]) +def permission_exists(pname): + return pname in permissions_by_name + def get_role_permissions(): role_permissions = {} # Loop all permissions diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8e35f9e..3d537b3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -292,7 +292,10 @@ def available_views(): for (u, n), view in html.multisite_views.items(): if n not in views and view["public"] and config.user_may(u, "publish_views"): # Is there a builtin view with the same name? If yes, honor permissions. - if (u, n) in html.multisite_views and not config.may("view.%s" % n): + permname = "view.%s" % n + if (u, n) in html.multisite_views \ + and config.permission_exists(permname) \ + and not config.may(permname): continue views[n] = view

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0762

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88b83ec76ee3c19661c155f262f528bf37d844a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88b83ec76ee3c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 20:37:15 2012 +0200 Updated bug entries #0762 --- .bugs/762 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/762 b/.bugs/762 new file mode 100644 index 0000000..6c8086d --- /dev/null +++ b/.bugs/762 @@ -0,0 +1,12 @@ +Title: Command form off at empty table, but that might change +Component: multisite +State: open +Date: 2012-06-03 20:35:28 +Targetversion: future +Class: nastiness + +If a view has no rows then the command form is deactivated. +But as time goes by the view might have entries. The command +form is not being activated automtically - nevertheless. Better +solution: Always have it active. When it comes to executing +give then a warning if not items for the commands are available.

12 years, 3 months

Check_MK Git: check_mk: Minor layout fix in 2-column Dict ValueSpec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01c3ff1b159f54ae69e21bde7d5c974e9bdb58ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01c3ff1b159f54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 20:35:14 2012 +0200 Minor layout fix in 2-column Dict ValueSpec --- web/htdocs/check_mk.css | 4 ++-- web/htdocs/valuespec.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a533478..d6301e4 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -365,10 +365,10 @@ table.dictionary td.dictright { border-style: none; } -div.dictelement * { +td.dictleft div.dictelement * { font-size: 8pt; } -div.dictelement { +td.dictleft div.dictelement { font-size: 8pt; padding-left: 10px; border-left: 2px solid #ccc; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 599995b..250147a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1678,7 +1678,7 @@ class Dictionary(ValueSpec): def render_input_normal(self, varprefix, value): html.write("<table class=dictionary>") for param, vs in self._elements: - html.write("<tr><td class=dictleft>") + html.write('<tr><td class=dictleft>') div_id = varprefix + "_d_" + param vp = varprefix + "_p_" + param if self._optional_keys and param not in self._required_keys: @@ -1690,10 +1690,12 @@ class Dictionary(ValueSpec): label=vs.title()) else: visible = True - html.write(" %s" % vs.title()) + if vs.title(): + html.write(" %s" % vs.title()) if self._columns == 2: - html.write(':') + if vs.title(): + html.write(':') html.help(vs.help()) html.write('</td><td class=dictright>') else:

12 years, 3 months

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012