Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Modularized login and cookie validation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c0cf0c4baedc6dbb3815634b43d8a3e27a28ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c0cf0c4baedc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 30 15:09:45 2012 +0100 Modularized login and cookie validation --- ChangeLog | 1 + web/htdocs/config.py | 9 +++ web/htdocs/index.py | 4 +- web/htdocs/login.py | 40 +++--------- web/htdocs/userdb.py | 67 +++++++++++++++++++ web/htdocs/wato.py | 12 +--- web/plugins/userdb/htpasswd.py | 96 ++++++++++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 38 +++++++++++ 8 files changed, 225 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c0cf0c4ba…

11 years, 10 months

Check_MK Git: check_mk: ldap/userdb: fixed some styling issues

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2cb7e59c36b3178439f4e700002c57f263698bbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cb7e59c36b317… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 13:41:23 2012 +0100 ldap/userdb: fixed some styling issues --- web/htdocs/wato.py | 4 +++- web/plugins/userdb/htpasswd.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5b5ecf4..8146253 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7808,10 +7808,12 @@ def mode_users(phase): # Connector html.write("<td>%s</td>" % userdb.get_connector(user.get('connector'))['title']) + locked_attributes = userdb.locked_attributes(user.get('connector')) + # Authentication if "automation_secret" in user: auth_method = _("Automation") - elif user.get("password"): + elif user.get("password") or 'password' in locked_attributes: auth_method = _("Password") else: auth_method = "<i>%s</i>" % _("none") diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index 5fc9f56..1044e88 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -112,7 +112,7 @@ def htpasswd_save(users): multisite_user_connectors.append({ 'id': 'htpasswd', - 'title': _('htpasswd file'), + 'title': _('htpasswd'), # Register hook functions 'login': htpasswd_login,

11 years, 10 months

Check_MK Git: check_mk: Fixed dynamic values of default user profile options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f3b77cb81692a15f5d892e75808e81bca1b2829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f3b77cb81692a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 15:41:23 2012 +0100 Fixed dynamic values of default user profile options --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f7708ed..f7c12c0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -430,13 +430,13 @@ register_configvar(group, title = _('User Roles'), help = _('Specify the initial roles of an automatically created user.'), default_value = [ 'user' ], - choices = list_roles(), + choices = list_roles, )), ('contactgroups', ListChoice( title = _('Contact groups'), help = _('Specify the initial contact groups of an automatically created user.'), default_value = [], - choices = list_contactgroups(), + choices = list_contactgroups, )), ], optional_keys = [],

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0873

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1056142e2c71a78901be3eea329026231c478d11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1056142e2c71a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 11:27:26 2012 +0100 Updated bug entries #0873 --- .bugs/873 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/873 b/.bugs/873 new file mode 100644 index 0000000..8d623ec --- /dev/null +++ b/.bugs/873 @@ -0,0 +1,9 @@ +Title: mkeventd/user_connector options in WATO are visible/invisible only after apache restart +Component: wato +State: open +Date: 2012-11-13 11:26:16 +Targetversion: future +Class: nastiness + +When enablding/disabling the mkeventd or enabling/disabling a user connector in WATO, +the depending options are only visible/invisible after restarting the apache webserver.

11 years, 10 months

Check_MK Git: check_mk: ldap: removed debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9d94e8c0773fc98a8ae719b6f9fd4817e53ae31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9d94e8c0773fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 14:41:22 2012 +0100 ldap: removed debug output --- web/htdocs/valuespec.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6d43212..70c42b3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2130,7 +2130,6 @@ class LDAPDistinguishedName(TextAscii): # At least one DC= must be in distinguished name found_dc = False for part in dn: - html.write(repr(part[0])) key, val = part[0][:2] if key.lower() == 'dc': found_dc = True

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' into ldap

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d60ac1e1020b1303916e62ea7f168ea49be013a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d60ac1e1020b13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 15 10:34:08 2012 +0100 Merge branch 'master' into ldap Conflicts: web/htdocs/index.py ---

11 years, 10 months

Check_MK Git: check_mk: Increased version to 1.2.1i4

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91a60c21d7de81b0f8bb2264379c53a56b887060 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a60c21d7de81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 21 12:28:02 2012 +0100 Increased version to 1.2.1i4 --- 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.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/crash.exe | Bin 20536 -> 20024 bytes agents/windows/install_agent.exe | Bin 129204 -> 130737 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 23023 -> 22511 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index b21b0a1..00fb85a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.1i4: + 1.2.1i3: Core: * added HOST/SERVICEPROBLEMID to notification macros diff --git a/Makefile b/Makefile index ddc8abe..95a2462 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.1i3 +VERSION = 1.2.1i4 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 d721159..1d49063 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index d69b923..c9b5bab 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.1i3 +echo Version: 1.2.1i4 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index e822054..08b0493 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 70b3a54..39ccbcb 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.1i3 +echo Version: 1.2.1i4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 2591196..d43a9cc 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 5fe670c..4f5c6d1 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 81518d1..5e99dd5 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 40c8506..a728cf0 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.1i3" +$say "Version: 1.2.1i4" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 5d369d0..5b7d57e 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i3 +echo Version: 1.2.1i4 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 8a2c5e3..e56597b 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -74,7 +74,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.1i3" +#define CHECK_MK_VERSION "1.2.1i4" #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 701c010..a3df30e 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 d44f87b..64981ad 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 a501684..733e1bc 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 e12fd69..eb50a8e 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.1i3" +!define CHECK_MK_VERSION "1.2.1i4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index b647bce..009fb89 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 63a2211..60c14a4 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.1i3-1_all.deb net optional +check-mk_1.2.1i4-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index ebbef35..965ee42 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.1i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.1i4], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 5c97162..328c12c 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.1i3" +VERSION="1.2.1i4" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 247a457..233851a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.1i3 +VERSION=1.2.1i4 NAME=check_mk LANG= LC_ALL=

11 years, 10 months

Check_MK Git: check_mk: AIX agent: Fix issue with MRPE scripts that use exit. Now using ksh93 instead of POSIX shell.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 408422d4689a17d28503ec8865a7ebb83ec21c94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=408422d4689a17… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Nov 21 11:30:19 2012 +0100 AIX agent: Fix issue with MRPE scripts that use exit. Now using ksh93 instead of POSIX shell. --- agents/check_mk_agent.aix | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7e38e74..d721159 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/ksh93 # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

11 years, 10 months

Check_MK Git: check_mk: FIX: if Checks now fallback to byte as UOM if none was specified in parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0a02a8d53cafd96415c05a2dde0ebd784dfb915c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a02a8d53cafd9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Nov 20 17:58:04 2012 +0100 FIX: if Checks now fallback to byte as UOM if none was specified in parameters --- checks/if.include | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/if.include b/checks/if.include index b61c6dd..3fc3de4 100644 --- a/checks/if.include +++ b/checks/if.include @@ -140,7 +140,7 @@ def check_if_common(item, params, info): targetspeed = params.get("speed") targetstate = params.get("state") average = params.get("average") - unit = params.get("unit") + unit = params.get("unit", "B") unit_multiplier = unit == "Bit" and 8.0 or 1.0 # error checking might be turned off @@ -241,9 +241,9 @@ def check_if_common(item, params, info): # Even if the measurement unit is set to "bit" the WARN and CRIT levels are # still reported as bytes to stay compatible with older rrd data if unit == "Bit": - if bw_crit: + if bw_crit and bw_crit != None: bw_crit = bw_crit / 8 - if bw_warn: + if bw_warn and bw_warn != None: bw_warn = bw_warn / 8 # Performance counters

11 years, 10 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: 878ec13a0c847838f1d870c83bb7845545b449e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=878ec13a0c8478… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Nov 20 17:58:12 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012