Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Switch version to 1.2.0

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9649832ba7cd82349db025685675d15d93d0ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9649832ba7cd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 15:13:52 2012 +0200 Switch version to 1.2.0 --- 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 124972 -> 124954 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ad843dd..ea46675 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0b6 +VERSION = 1.2.0 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 4763a7e..1554bac 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.0b6 +echo Version: 1.2.0 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 6391e0d..6da8a43 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.0b6 +echo Version: 1.2.0 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index cf10a36..2016c12 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.0b6 +echo Version: 1.2.0 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9473413..4b7cf9e 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.0b6 +echo Version: 1.2.0 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 0610a57..68b09f3 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.0b6 +echo Version: 1.2.0 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index a3d1811..76c1bf3 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.0b6 +echo Version: 1.2.0 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1c30448..420d660 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.0b6" +#define CHECK_MK_VERSION "1.2.0" #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 eb61a74..df377ba 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 e6c8256..5805f3d 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 f6a50ce..b716308 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 62e6d43..92c6c16 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.0b6" +!define CHECK_MK_VERSION "1.2.0" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 3a6f3c1..f5c1ba1 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0b6-1_all.deb net optional +check-mk_1.2.0-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 11f63b6..7e36ce8 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.0b6], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0], [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 f47cecd..45d5fae 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0b6 +VERSION=1.2.0 NAME=check_mk LANG= LC_ALL=

12 years, 3 months

Check_MK Git: check_mk: avoid duplicate checks cisco_temp_perf and cisco_sensor_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8b54a3c27875be6fc7146b719e209dc68f0bbef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8b54a3c27875b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 15:12:45 2012 +0200 avoid duplicate checks cisco_temp_perf and cisco_sensor_temp --- ChangeLog | 1 + checks/cisco_temp_perf | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0404b2..bd259bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * tcp_conn_stats: handle state BOUND (found on Solaris) * diskstat: support for checking latency, LVM and VxVM on Linux (needs updated agent) + * avoid duplicate checks cisco_temp_perf and cisco_sensor_temp 1.2.0b6: Multisite: diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 3be163a..28ea012 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -91,5 +91,6 @@ check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "Temperature %s", 1, in snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_END ] ) # CISCO-SMI snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None + oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ + oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None # the using cisco_sensor_temp checkgroup_of["cisco_temp_perf"] = "temperature_auto"

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0760

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11ab772220cb0beed2d2270e64788fb828c6480f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11ab772220cb0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 14:03:46 2012 +0200 Updated bug entries #0760 --- .bugs/760 | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/.bugs/760 b/.bugs/760 index 8896902..66d274e 100644 --- a/.bugs/760 +++ b/.bugs/760 @@ -2,9 +2,13 @@ Title: View checkboxes: Request-URI Too Large Component: multisite State: open Date: 2012-05-28 16:16:51 -Targetversion: 1.2.0 +Targetversion: future Class: bug If you select too many checkboxes in a Multisite view and execute a command, then you will get a "Request-URI Too Large". + +We need to convert the complete checkbox logic including +the page refresh to POST. This will then also fix bug +#759. Postponed until after 1.2.0.

12 years, 3 months

Check_MK Git: check_mk: Improved Contrast in form background

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9701314492b9b1656ac755f7b939456e816dd076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9701314492b9b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 13:38:51 2012 +0200 Improved Contrast in form background --- web/htdocs/images/nform_background.png | Bin 214 -> 215 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/nform_background.png b/web/htdocs/images/nform_background.png index c5452b8..d34a9bc 100644 Binary files a/web/htdocs/images/nform_background.png and b/web/htdocs/images/nform_background.png differ

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0728

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1eddddec03c3cbc480e2ff3257f13fc199fea5e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eddddec03c3cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 13:38:34 2012 +0200 Updated bug entries #0728 --- .bugs/728 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/728 b/.bugs/728 index 2054269..1dc8bb8 100644 --- a/.bugs/728 +++ b/.bugs/728 @@ -1,9 +1,12 @@ Title: Schlechter Kontrast bei der Liste von Regeln in Wato Component: wato -State: open +Class: nastiness +State: done Date: 2012-05-30 16:08:34 Targetversion: 1.2.0 -Class: nastiness Der farbliche Kontrast zwischen dem schwarzen Text und dunkeln Hintergrund sorgt bei manchen Monitoren für schlecht lesbare Texte in der Liste von Regeln in Wato + +2012-06-06 13:38:32: changed state open -> done +Hintergrund etwas heller gemacht.

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0766

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb7bfd4b1c816511347c35d2297c982aa649539f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb7bfd4b1c8165… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 13:32:24 2012 +0200 Updated bug entries #0766 --- .bugs/766 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/766 b/.bugs/766 index e53be88..7a4d592 100644 --- a/.bugs/766 +++ b/.bugs/766 @@ -1,9 +1,12 @@ Title: Search filed in WATO folder view does not work Component: wato -State: open +Class: bug +State: done Date: 2012-06-05 18:01:17 Targetversion: 1.2.0 -Class: bug It simply does not filter out anything, regardless what one types in. + +2012-06-06 13:32:18: changed state open -> done +Fixed.

12 years, 3 months

Check_MK Git: check_mk: FIX: fix building of RPM packages (due to mk_mysql, mk_postgres)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0380b2c855792a46ba7be8ef9bb2639221507e9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0380b2c855792a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 13:20:28 2012 +0200 FIX: fix building of RPM packages (due to mk_mysql, mk_postgres) --- ChangeLog | 3 +++ check_mk.spec | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d3a50b..c0404b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0: + Setup: + * FIX: fix building of RPM packages (due to mk_mysql, mk_postgres) + Core: * FIX: fix error message in case of duplicate custom check diff --git a/check_mk.spec b/check_mk.spec index 6ea088e..37bb5fc 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -124,7 +124,8 @@ mkdir -p $R/usr/lib/check_mk_agent/plugins mkdir -p $R/usr/lib/check_mk_agent/local # logwatch and oracle extension -install -m 755 $R/usr/share/check_mk/agents/plugins/mk_* $R/usr/lib/check_mk_agent/plugins +install -m 755 $R/usr/share/check_mk/agents/plugins/mk_logwatch $R/usr/lib/check_mk_agent/plugins +install -m 755 $R/usr/share/check_mk/agents/plugins/mk_oracle $R/usr/lib/check_mk_agent/plugins install -m 755 $R/usr/share/check_mk/agents/logwatch.cfg $R/etc/check_mk install -m 644 $R/usr/share/check_mk/agents/sqlplus.sh $R/etc/check_mk

12 years, 3 months

Check_MK Git: check_mk: FIX: fix error message in case of duplicate custom check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7f4d7f5e0a20a7419ba1337c27399d742a6e650 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7f4d7f5e0a20a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 12:49:24 2012 +0200 FIX: fix error message in case of duplicate custom check --- ChangeLog | 3 +++ modules/check_mk.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bce515b..9d3a50b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0: + Core: + * FIX: fix error message in case of duplicate custom check + WATO: * FIX: add missing icon on cluster hosts to WATO in Multisite views * FIX: fix search field in host table if more than 10 hosts are shown diff --git a/modules/check_mk.py b/modules/check_mk.py index 77ec754..539f143 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1869,10 +1869,10 @@ define service { raise MKGeneralException( "ERROR: Duplicate service description (custom check) '%s' for host '%s'!\n" " - 1st occurrance: checktype = %s, item = %r\n" - " - 2nd occurrance: checktype = active(%s), item = None\n" % - (description, hostname, cn, it, acttype)) + " - 2nd occurrance: checktype = custom(%s), item = %r\n" % + (description, hostname, cn, it, command_name, description)) else: - used_descriptions[description] = ( "custom", description ) + used_descriptions[description] = ( "custom(%s)" % command_name, description ) template = has_perfdata and "check_mk_perf," or "" extraconf = extra_service_conf_of(hostname, description)

12 years, 3 months

Check_MK Git: check_mk: FIX: fix negating hosts in rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d4ebb2a572d631111bec95b4454555a2a9dd84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d4ebb2a572d63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 12:38:47 2012 +0200 FIX: fix negating hosts in rule editor --- ChangeLog | 1 + web/htdocs/wato.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46d3dae..bce515b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: add missing icon on cluster hosts to WATO in Multisite views * FIX: fix search field in host table if more than 10 hosts are shown * FIX: fix bulk edit and form properties (visibility of attributes was broken) + * FIX: fix negating hosts in rule editor Checks & Agents: * fileinfo: added this check to Linux agent. Simply put your diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b03443b..b30eea3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9885,6 +9885,8 @@ def get_rule_conditions(ruleset): negate = html.get_checkbox("negate_hosts") nr = 0 host_list = ListOfStrings().from_html_vars("hostlist") + if negate: + host_list = [ "!" + h for h in host_list ] # append ALL_HOSTS to negated host lists if len(host_list) > 0 and host_list[0][0] == '!': host_list += ALL_HOSTS @@ -10031,7 +10033,7 @@ def mode_edit_rule(phase): valuespec = TextAscii(size = 30)).render_input("hostlist", explicit_hosts) html.checkbox("negate_hosts", negate_hosts, label = - _("Negate: make Rule apply for all but the above hosts")) + _("Negate: make rule apply for all but the above hosts")) html.write("</div>") html.help(_("You can enter a number of explicit host names that rule should or should " "not apply to here. Leave this option disabled if you want the rule to "

12 years, 3 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: 326ada23b80e45b223c22460e173b7873291429a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=326ada23b80e45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 12:38:49 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

← Newer
1
...
17
18
19
20
21
22
23
...
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