Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Updated bug entries #2280

by Bastian Kuhn

Module: check_mk Branch: master Commit: fabd4cdfd7e70d83113fc863a1815838997ba7ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fabd4cdfd7e70d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 12 14:31:29 2014 +0100 Updated bug entries #2280 --- .bugs/2280 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.bugs/2280 b/.bugs/2280 new file mode 100644 index 0000000..c80110e --- /dev/null +++ b/.bugs/2280 @@ -0,0 +1,21 @@ +Title: Distributed Setup: Error when deleting/creating/login to a connection +Component: wato +State: open +Date: 2014-12-12 14:27:08 +Targetversion: 1.2.5i1 +Class: bug + +Internal error: not all arguments converted during string formatting + +Traceback (most recent call last): + File "/omd/sites/schulung/share/check_mk/web/htdocs/index.py", line 241, in handler + handler() + File "/omd/sites/schulung/share/check_mk/web/htdocs/wato.py", line 237, in page_handler + result = modefunc("action") + File "/omd/sites/schulung/share/check_mk/web/htdocs/wato.py", line 9898, in mode_sites + save_sites(sites) + File "/omd/sites/schulung/share/check_mk/web/htdocs/wato.py", line 10582, in save_sites + create_nagvis_backends(sites) + File "/omd/sites/schulung/share/check_mk/web/htdocs/wato.py", line 10622, in create_nagvis_backends + 'socket="%s"' % site['socket'], +TypeError: not all arguments converted during string formatting

9 years, 9 months

Check_MK Git: check_mk: #1762 FIX lnx_thermal: Now ignoring trip points with level 0

by Lars Michelsen

Module: check_mk Branch: master Commit: 4faa80e0d597bc42df597f26fd53c52d0cdda210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4faa80e0d597bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 13:54:03 2014 +0100 #1762 FIX lnx_thermal: Now ignoring trip points with level 0 A level of 0 seem to mean that there is no trip point configured. --- .werks/1762 | 10 ++++++++++ ChangeLog | 1 + checks/lnx_thermal | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1762 b/.werks/1762 new file mode 100644 index 0000000..9fab8c2 --- /dev/null +++ b/.werks/1762 @@ -0,0 +1,10 @@ +Title: lnx_thermal: Now ignoring trip points with level 0 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418388782 + +A level of 0 seem to mean that there is no trip point configured. diff --git a/ChangeLog b/ChangeLog index 12ba867..ef8d08a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Checks & Agents: * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! + * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/lnx_thermal b/checks/lnx_thermal index ba0edcd..529fe3b 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -64,7 +64,7 @@ def check_lnx_thermal(item, params, info): # ignore active cooling device trip points (means enabling a fan or similar) if tp_name == 'active': continue - if cur > level: + if level != 0 and cur > level: if tp_name in [ 'hot', 'critical' ]: state = max(state, 2) else:

9 years, 9 months

Check_MK Git: check_mk: Fixed building rpm/deb during release

by Lars Michelsen

Module: check_mk Branch: master Commit: 85e2880a63f853c05172de50870d23cdc4a401a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e2880a63f853… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 12:42:50 2014 +0100 Fixed building rpm/deb during release --- agents/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 4699995..bae1e2b 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -53,7 +53,9 @@ waitmax: waitmax.c @echo "Fine. Typing 'make install' as root now will install into /usr/bin" setversion: - git rm -f *.rpm *.deb || true + if [ -d ../.git ]; then \ + git rm -f *.rpm *.deb || true ; \ + fi sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ @@ -62,7 +64,9 @@ setversion: fi ; \ done ; \ $(MAKE) packages - git add *.rpm *.deb + if [ -d ../.git ]; then \ + git add *.rpm *.deb ; \ + fi $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion packages: rpm deb

9 years, 9 months

Check_MK Git: check_mk: Fixed building of agent rpm/deb

by Lars Michelsen

Module: check_mk Branch: master Commit: 3096e285e23419f555a65d71953a3c4a298eadc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3096e285e23419… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 12:39:23 2014 +0100 Fixed building of agent rpm/deb --- agents/Makefile | 2 +- agents/check-mk-agent_1.2.7i1-1_all.deb | Bin 0 -> 17252 bytes agents/check-mk-agent_1.2.7i1-2_all.deb | Bin 17204 -> 0 bytes agents/check_mk_agent-1.2.7i1-1.noarch.rpm | Bin 20213 -> 20213 bytes agents/windows/install_agent-64.exe | Bin 160686 -> 160685 bytes agents/windows/install_agent.exe | Bin 157644 -> 157644 bytes 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/Makefile b/agents/Makefile index d1ede96..4699995 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -53,7 +53,7 @@ waitmax: waitmax.c @echo "Fine. Typing 'make install' as root now will install into /usr/bin" setversion: - git rm -f *.rpm *.deb + git rm -f *.rpm *.deb || true sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ diff --git a/agents/check-mk-agent_1.2.7i1-1_all.deb b/agents/check-mk-agent_1.2.7i1-1_all.deb new file mode 100644 index 0000000..9751285 Binary files /dev/null and b/agents/check-mk-agent_1.2.7i1-1_all.deb differ diff --git a/agents/check-mk-agent_1.2.7i1-2_all.deb b/agents/check-mk-agent_1.2.7i1-2_all.deb deleted file mode 100644 index affa985..0000000 Binary files a/agents/check-mk-agent_1.2.7i1-2_all.deb and /dev/null differ diff --git a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm index e26e304..e4e78b3 100644 Binary files a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm and b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index cd87e90..66a4c58 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index a460125..8399c94 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 9 months

Check_MK Git: check_mk: Fixed building of agent rpm/deb packages

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bafa26324514f825c9e78de048c5923f0926286 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bafa26324514f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 12:38:11 2014 +0100 Fixed building of agent rpm/deb packages Conflicts: agents/Makefile --- agents/Makefile | 34 ++++++++++++++++++++++------------ agents/check_mk_agent.spec | 6 +++--- agents/windows/Makefile | 1 + 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 1aef6d3..d1ede96 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -22,13 +22,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +SHELL = /bin/bash VERSION = 1.2.7i1 +RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check_mk_agent DISTNAME = $(NAME)-$(VERSION) RPM_TOPDIR = $$(pwd)/.rpm.topdir RPM_BUILDROOT = $$(pwd)/.rpm.buildroot RPM_PACKAGE = $(DISTNAME)-1.noarch.rpm -DEB_PACKAGE = check-mk-agent_$(VERSION)-2_all.deb +DEB_PACKAGE = check-mk-agent_$(VERSION)-1_all.deb usage: @echo "make waitmax -- compile waitmax.c" @@ -51,14 +53,16 @@ waitmax: waitmax.c @echo "Fine. Typing 'make install' as root now will install into /usr/bin" setversion: + git rm -f *.rpm *.deb sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ if [ "$$agent" != windows -a "$$agent" != plugins -a "$$agent" != hpux ] ; then \ - sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ + sed -i 's/echo Version: [0-9.a-z-]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ done ; \ $(MAKE) packages + git add *.rpm *.deb $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion packages: rpm deb @@ -71,29 +75,35 @@ rpm $(RPM_PACKAGE): mkdir -p $(RPM_TOPDIR)/BUILD mkdir -p $(RPM_TOPDIR)/SPECS tar czf $(RPM_TOPDIR)/SOURCES/$(NAME)-$(VERSION).tar.gz --transform='s@^@$(DISTNAME)/@' * - sed "s/^Version:.*/Version: $(VERSION)/" $(NAME).spec > $(NAME)-$(VERSION).spec + sed "s/^Version:.*/Version: $(RPM_VERSION)/" $(NAME).spec > $(NAME)-$(VERSION).spec rm -f *.rpm - rpmbuild -ba --buildroot "$(RPM_BUILDROOT)" --define "_topdir $(RPM_TOPDIR)" $(DISTNAME).spec + rpmbuild -ba --buildroot "$(RPM_BUILDROOT)" \ + --define "_topdir $(RPM_TOPDIR)" \ + --define "_version $(VERSION)" \ + $(DISTNAME).spec rm -f $(DISTNAME).spec - mv -v $(RPM_TOPDIR)/RPMS/*/* . + mv -v $(RPM_TOPDIR)/RPMS/*/* $(RPM_PACKAGE) rm -rf $(RPM_TOPDIR) $(RPM_BUILDROOT) deb $(DEB_PACKAGE): $(RPM_PACKAGE) @echo "Sorry. Debian packages currently via alien" - fakeroot alien --scripts --to-deb $(RPM_PACKAGE) - echo "Repackaging $(DEB_PACKAGE)" - rm -rf deb-unpack - mkdir -p deb-unpack + rm -f *.deb + fakeroot alien --scripts -k --to-deb $(RPM_PACKAGE) + DEB_PKG=$$(ls *.deb) ; \ + echo "Repackaging $$DEB_PKG" ; \ + rm -rf deb-unpack ; \ + mkdir -p deb-unpack ; \ cd deb-unpack && \ - ar x ../$(DEB_PACKAGE) && \ + ar x ../$$DEB_PKG && \ mkdir ctrl && \ tar xzf control.tar.gz -C ctrl && \ - sed -i -e '/^Depends:/d' -e 's/^Maintainer:.*/Maintainer: feedback(a)check-mk.org/' ctrl/control && \ + sed -i -e '/^Depends:/d' \ + -e 's/^Version:.*/Version: $(VERSION)-1/' \ + -e 's/^Maintainer:.*/Maintainer: feedback(a)check-mk.org/' ctrl/control && \ tar czf control.tar.gz $(TAROPTS) -C ctrl . && \ ar r ../$(DEB_PACKAGE) debian-binary control.tar.gz data.tar.* rm -rf deb-unpack - clean: rm -rf *~ waitmax diff --git a/agents/check_mk_agent.spec b/agents/check_mk_agent.spec index 99269d3..efd5610 100644 --- a/agents/check_mk_agent.spec +++ b/agents/check_mk_agent.spec @@ -29,8 +29,8 @@ Release: 1 License: GPL Group: System/Monitoring URL: http://mathias-kettner.de/check_mk.html -Source: check_mk_agent-%{version}.tar.gz -BuildRoot: /tmp/rpm.buildroot.check_mk-%{version} +Source: check_mk_agent-%{_version}.tar.gz +BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off BuildArch: noarch @@ -40,7 +40,7 @@ The Check_MK Agent uses xinetd to provide information about the system on TCP port 6556. This can be used to monitor the host via Check_MK. %prep -%setup -q +%setup -n check_mk_agent-%{_version} %install diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 1218416..45b0b0a 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -120,6 +120,7 @@ install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe msi_installer: cd msibuild ; make BUILD_VERSION=$$(cat ../build_version) CHECK_MK_VERSION=$(VERSION) mv msibuild/check_mk_agent.msi . + chmod +x check_mk_agent.msi crash.exe: crash.cc $(CXX) -o $@ $<

9 years, 9 months

Check_MK Git: check_mk: Keepalive mode now also supports the inventory check

by Lars Michelsen

Module: check_mk Branch: master Commit: 55cd033b47eb10d9fe0cc1b8f57bdebb8d2ec966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55cd033b47eb10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 08:57:38 2014 +0100 Keepalive mode now also supports the inventory check --- modules/check_mk.py | 112 +++++++++++++++++++++++++++++++++------------- modules/check_mk_base.py | 8 ++-- 2 files changed, 84 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=55cd033b47…

9 years, 9 months

Check_MK Git: check_mk: #1457 FIX logins: new check renamed from "users" check

by Goetz Golla

Module: check_mk Branch: master Commit: 6ae4068f4f072918e828c2fb9ec61dea7e41c5ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ae4068f4f0729… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 11 17:01:39 2014 +0100 #1457 FIX logins: new check renamed from "users" check The "users" check and "mk_users" plugin have been renamed to "logins" and "mk_logins". If you have utilized the "users" check before, you now need to remove the "mk_users" plugin and install the "mk_logins" plugin on your monitoring clients. Afterwards, you need to execute a new service discovery. --- .werks/1457 | 13 ++++++++ ChangeLog | 4 +++ agents/plugins/mk_logins | 29 +++++++++++++++++ checks/logins | 59 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 6 ++-- 5 files changed, 108 insertions(+), 3 deletions(-) diff --git a/.werks/1457 b/.werks/1457 new file mode 100644 index 0000000..2187236 --- /dev/null +++ b/.werks/1457 @@ -0,0 +1,13 @@ +Title: logins: new check renamed from "users" check +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1418313533 + +The "users" check and "mk_users" plugin have been renamed to "logins" and +"mk_logins". If you have utilized the "users" check before, you now need +to remove the "mk_users" plugin and install the "mk_logins" plugin on your +monitoring clients. Afterwards, you need to execute a new service discovery. diff --git a/ChangeLog b/ChangeLog index 35a6d51..12ba867 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Core & Setup: * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... + Checks & Agents: + * 1457 FIX: logins: new check renamed from "users" check... + NOTE: Please refer to the migration notes! + Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/plugins/mk_logins b/agents/plugins/mk_logins new file mode 100755 index 0000000..2005529 --- /dev/null +++ b/agents/plugins/mk_logins @@ -0,0 +1,29 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +if type who >/dev/null; then + echo "<<<logins>>>" + who | wc -l +fi diff --git a/checks/logins b/checks/logins new file mode 100644 index 0000000..ac9636c --- /dev/null +++ b/checks/logins @@ -0,0 +1,59 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# Example output from agent: +# <<<logins>>> +# 3 + +logins_default_levels = (20,30) + +def inventory_logins(info): + if info: + return [ (None, "logins_default_levels") ] + +def check_logins(_no_item, params, info): + if info: + logins = int(info[0][0]) + warn, crit = params + state = 0 + if logins >= crit: + state = 2 + elif logins >= warn: + state = 1 + + infotext = "%d logins on system, levels at %d/%d" % ( users, warn, crit ) + perfdata = [ ( "logins", logins, warn, crit, 0 ) ] + yield state, infotext, perfdata + + +check_info["logins"] = { + 'check_function' : check_logins, + 'inventory_function' : inventory_logins, + 'service_description' : 'Logins', + 'has_perfdata' : True, + 'group' : 'logins', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1ee4798..ce93a8d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4244,10 +4244,10 @@ register_check_parameters( register_check_parameters( subgroup_os, - "users", - _("Number of Users Logged In"), + "logins", + _("Number of Logins on System"), Tuple( - help = _("This rule defines upper limits for the number of users logged in on a system."), + help = _("This rule defines upper limits for the number of logins on a system."), elements = [ Integer(title = _("Warning at"), unit = _("users"), default_value = 20), Integer(title = _("Critical at"), unit = _("users"), default_value = 30)]),

9 years, 9 months

Check_MK Git: check_mk: #1760 Added search form to manual checks page

by Lars Michelsen

Module: check_mk Branch: master Commit: cdbca2fdb80a765fddb8829415c877732a1f9380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdbca2fdb80a76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 16:15:10 2014 +0100 #1760 Added search form to manual checks page --- .werks/1760 | 10 ++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 31 ++++++++++--------------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.werks/1760 b/.werks/1760 new file mode 100644 index 0000000..74fde3b --- /dev/null +++ b/.werks/1760 @@ -0,0 +1,10 @@ +Title: Added search form to manual checks page +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418310884 + + diff --git a/ChangeLog b/ChangeLog index 556b3a4..cb915b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... + WATO: + * 1760 Added search form to manual checks page + 1.2.6b1: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c9df09..4f4010b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7452,16 +7452,7 @@ def render_global_configuration_variables(default_values, current_settings, show groupnames = g_configvar_groups.keys() groupnames.sort() - html.begin_form("search") - html.write(_("Search for settings: ")) - html.text_input("search", size=32) - html.hidden_fields() - html.hidden_field("mode", "globalvars") - html.set_focus("search") - html.write(" ") - html.button("_do_seach", _("Search")) - html.end_form() - html.write('<br>') + search_form(_("Search for settings:")) at_least_one_painted = False html.write('<div class=globalvars>') @@ -13702,23 +13693,21 @@ def mode_ruleeditor(phase): menu.append((url, title, icon, "rulesets", help)) render_main_menu(menu) - html.write("<BR>") - rule_search_form() - - + html.write("<br>") + search_form(_("Search for rules: "), "rulesets") -def rule_search_form(): +def search_form(title, mode=None): html.begin_form("search") - html.write(_("Search for rules: ")) + html.write(title+' ') html.text_input("search", size=32) html.hidden_fields() - html.hidden_field("mode", "rulesets") + if mode: + html.hidden_field("mode", mode) html.set_focus("search") html.write(" ") html.button("_do_seach", _("Search")) html.end_form() - html.write("<br>") - + html.write('<br>') def rule_is_ineffective(rule, rule_folder, rulespec, hosts): value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) @@ -13915,8 +13904,8 @@ def mode_rulesets(phase, group=None): if not only_host: render_folder_path(keepvarnames = ["mode", "local", "group"]) - if search != None: - rule_search_form() + if search != None or group == 'static': + search_form(_("Search for rules: "), "rulesets") if help != None: help = "".join(help.split("\n", 1)[1:]).strip()

9 years, 9 months

Check_MK Git: check_mk: #1761 FIX Ruleset search is now consistent for host & serviceparameters and manual checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a57f3d4896c4af2ec4d41001c6ec6a2ff96a638 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a57f3d4896c4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 16:44:27 2014 +0100 #1761 FIX Ruleset search is now consistent for host & serviceparameters and manual checks --- .werks/1761 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 21 +++++++++++---------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.werks/1761 b/.werks/1761 new file mode 100644 index 0000000..4acf4f7 --- /dev/null +++ b/.werks/1761 @@ -0,0 +1,10 @@ +Title: Ruleset search is now consistent for host & serviceparameters and manual checks +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418312629 + + diff --git a/ChangeLog b/ChangeLog index cb915b2..35a6d51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ WATO: * 1760 Added search form to manual checks page + * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks 1.2.6b1: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4f4010b..d5e977f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13669,6 +13669,8 @@ def mode_ruleeditor(phase): else: html.write("<h3>%s: %s</h3>" % (_("Host"), only_host)) + search_form(_("Search for rules: "), "rulesets") + # Group names are separated with "/" into main group and optional subgroup. # Do not loose carefully manually crafted order of groups! groupnames = [] @@ -13693,9 +13695,6 @@ def mode_ruleeditor(phase): menu.append((url, title, icon, "rulesets", help)) render_main_menu(menu) - html.write("<br>") - search_form(_("Search for rules: "), "rulesets") - def search_form(title, mode=None): html.begin_form("search") html.write(title+' ') @@ -13867,7 +13866,7 @@ def mode_rulesets(phase, group=None): help = _("Here you can create explicit checks that are not being created by the automatic service discovery.") only_used = False elif search != None: - title = _("Rules matching ") + html.attrencode(search) + title = _("Rules matching") + ": " + html.attrencode(search) help = _("All rules that contain '%s' in their name") % html.attrencode(search) only_used = False else: @@ -13905,7 +13904,7 @@ def mode_rulesets(phase, group=None): render_folder_path(keepvarnames = ["mode", "local", "group"]) if search != None or group == 'static': - search_form(_("Search for rules: "), "rulesets") + search_form(_("Search for rules: "), group != "static" and "rulesets") if help != None: help = "".join(help.split("\n", 1)[1:]).strip() @@ -13926,7 +13925,7 @@ def mode_rulesets(phase, group=None): # Select matching rule groups while keeping their configured order groupnames = [ gn for gn, rulesets in g_rulespec_groups - if only_used or search or gn == group or gn.startswith(group + "/") ] + if only_used or search != None or gn == group or (group and gn.startswith(group + "/")) ] # In case of search we need to sort the groups since main chapters would # appear more than once otherwise. @@ -13961,9 +13960,11 @@ def mode_rulesets(phase, group=None): and search not in varname: continue - if search != None and groupname.startswith("static/"): - continue # search must not find these - + # Show static checks rules only in on dedicated page and vice versa + if group != 'static' and groupname.startswith("static/"): + continue + elif group == 'static' and not groupname.startswith("static/"): + continue # Handle case where a host is specified rulespec = g_rulespecs[varname] @@ -13980,7 +13981,7 @@ def mode_rulesets(phase, group=None): if only_local and num_local_rules == 0: continue - if only_used or search != None: + if group != 'static' and (only_used or search != None): titlename = g_rulegroups[groupname.split("/")[0]][0] else: if '/' in groupname:

9 years, 9 months

Check_MK Git: check_mk: mknotifyd: minor tweaks

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e97e283caf5af7abed1c7acf8e5209a7a591966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e97e283caf5af… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 11 16:36:05 2014 +0100 mknotifyd: minor tweaks --- doc/treasures/mknotifyd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index ee760cd..d42af2b 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -124,9 +124,9 @@ class SpoolfilesHandler: def process_directory(self, dir_path, files_older_than = None): - now = time.time() for root, dirs, files in os.walk(dir_path): for spoolfile in files: + now = time.time() spoolfile_process_result = -1 # Check spoolfile type # Spoolfiles with the key forward are handled locally @@ -464,7 +464,7 @@ def run_notifyd(): g_spoolfiles_handler._should_terminate = True now = time.time() while (g_tcp_server._is_running or g_spoolfiles_handler._is_running) \ - and time.time() - now < 2: + and time.time() - now < 4: time.sleep(0.1) if g_tcp_server._is_running:

9 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014