Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4640 FIX heartbeat_crm: Fixed crash if output contains capital letters

by Marcel Arentz

Module: check_mk Branch: master Commit: f4b196c78f05978c768da8d3d9920054c10e0aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4b196c78f0597… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri May 5 11:47:53 2017 +0200 4640 FIX heartbeat_crm: Fixed crash if output contains capital letters Change-Id: I97d10b4aaa1c63912ec44d6d6d2ea8016194b2e4 --- .werks/4640 | 10 ++++++++++ checks/heartbeat_crm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4640 b/.werks/4640 new file mode 100644 index 0000000..9803425 --- /dev/null +++ b/.werks/4640 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: Fixed crash if output contains capital letters +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493977561 +Class: fix + + diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index e3ff61d..8f88814 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -214,7 +214,7 @@ def heartbeat_crm_parse_resources(info): for parts in info: line = " ".join(parts) - if line == 'Failed actions:': + if line.lower() == 'failed actions:': blockStart = False elif not blockStart and line == 'Full list of resources:': blockStart = True

7 years, 4 months

4609 FIX Agent bakery package list: Sort rulesets by title now

by Lars Michelsen

Module: check_mk Branch: master Commit: 036c36ebebbd3b7a71e63c99f42accb33e591953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036c36ebebbd3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 11:27:00 2017 +0200 4609 FIX Agent bakery package list: Sort rulesets by title now Change-Id: I4ec584743c76ed3c1d1a07546e80acac0681a976 --- .werks/4609 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4609 b/.werks/4609 new file mode 100644 index 0000000..9b444a2 --- /dev/null +++ b/.werks/4609 @@ -0,0 +1,10 @@ +Title: Agent bakery package list: Sort rulesets by title now +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1493976411 +Class: fix + +

7 years, 4 months

4605 FIX Bakery: Fixed marking agents to be build after changing agent related rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: aaa4c1be38c38f4ebfd2e8ec75a10ac96c0bf967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaa4c1be38c38f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 10:38:12 2017 +0200 4605 FIX Bakery: Fixed marking agents to be build after changing agent related rulesets Change-Id: I8ab640988cbe3ca0a50ce69f791df01a4aa6298f --- .werks/4605 | 11 +++++++++++ web/htdocs/wato.py | 4 +--- web/htdocs/watolib.py | 25 +++++++++++++++++++------ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.werks/4605 b/.werks/4605 new file mode 100644 index 0000000..5e372d3 --- /dev/null +++ b/.werks/4605 @@ -0,0 +1,11 @@ +Title: Bakery: Fixed marking agents to be build after changing agent related rulesets +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1493973466 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 75c6ac0..c49df35 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13554,10 +13554,8 @@ class ModeEditRule(WatoMode): def _save_rule(self): # Just editing without moving to other folder + self._ruleset.edit_rule(self._rule) self._rulesets.save() - add_change("edit-rule", _("Changed properties of rule \"%s\" in folder \"%s\"") % - (self._ruleset.title(), self._folder.alias_path()), - sites=self._folder.all_site_ids()) def _success_message(self): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 1073b42..ec684c9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -243,9 +243,10 @@ def add_change(action_name, text, obj=None, add_user=True, need_sync=None, need_sidebar_reload() # On each change to the Check_MK configuration mark the agents to be rebuild - if has_agent_bakery(): - # pylint: disable=undefined-variable - need_to_bake_agents() + # TODO: Really? Why? + #if has_agent_bakery(): + # import agent_bakery + # agent_bakery.mark_need_to_bake_agents() ActivateChangesWriter().add_change(action_name, text, obj, add_user, need_sync, need_restart, domains, sites) @@ -6706,6 +6707,13 @@ class Ruleset(object): return self._rules[folder.path()][rule_index] + def edit_rule(self, rule): + add_change("edit-rule", _("Changed properties of rule \"%s\" in folder \"%s\"") % + (self.title(), rule.folder.alias_path()), + sites=rule.folder.all_site_ids()) + self._on_change() + + def delete_rule(self, rule): self._rules[rule.folder.path()].remove(rule) add_change("edit-ruleset", _("Deleted rule in ruleset '%s'") % self.title(), @@ -6806,8 +6814,9 @@ class Ruleset(object): def _on_change(self): - if has_agent_bakery() and is_affecting_baked_agents(self.name): # pylint: disable=undefined-variable - need_to_bake_agents() # pylint: disable=undefined-variable + if has_agent_bakery(): + import agent_bakery + agent_bakery.ruleset_changed(self.name) # Returns the outcoming value or None and a list of matching rules. These are pairs @@ -7805,7 +7814,11 @@ def edit_users(changed_users): def has_agent_bakery(): - return 'bake_agents' in globals() + try: + import agent_bakery + return True + except ImportError: + return False def get_folder_cgconf_from_attributes(attributes):

7 years, 4 months

4608 Agent bakery creates Solaris TGZ packages now

by Lars Michelsen

Module: check_mk Branch: master Commit: 63c03a286b9cb1f073d86dc02f173a47b3b6f98b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63c03a286b9cb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 11:06:52 2017 +0200 4608 Agent bakery creates Solaris TGZ packages now The agent bakery can now create agent packages for Solaris in TGZ format. Most agent plugins that are relevant for solaris should be packageable now with these new packages. Change-Id: I0b70cca75c11101edb77a752aee53a7a57a3e37f --- .werks/4608 | 13 +++++++++++++ agents/plugins/mk_inventory.solaris | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4608 b/.werks/4608 new file mode 100644 index 0000000..6f05f78 --- /dev/null +++ b/.werks/4608 @@ -0,0 +1,13 @@ +Title: Agent bakery creates Solaris TGZ packages now +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1493975029 +Class: feature + +The agent bakery can now create agent packages for Solaris in TGZ format. + +Most agent plugins that are relevant for solaris should be packageable now +with these new packages. diff --git a/agents/plugins/mk_inventory.solaris b/agents/plugins/mk_inventory.solaris index 405bd5c..302d01e 100755 --- a/agents/plugins/mk_inventory.solaris +++ b/agents/plugins/mk_inventory.solaris @@ -23,9 +23,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Run and *send* only once every __ seconds +. $MK_CONFDIR/mk_inventory.cfg 2>/dev/null || true -# Run and *send* only once every 4 hours -INTERVAL=14400 +# Default to four hours +INTERVAL=${INVENTORY_INTERVAL:-14400} FLAGFILE=$MK_VARDIR/mk_inventory.last.$REMOTE if [ `uname -r` = "5.10" ]; then

7 years, 4 months

4606 Added context button to agent bakery to rulesets affecting the baked agents

by Lars Michelsen

Module: check_mk Branch: master Commit: aeaebed8e00571aa6d7f7addfc44343f959b85b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeaebed8e00571… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 10:45:37 2017 +0200 4606 Added context button to agent bakery to rulesets affecting the baked agents Change-Id: I4ff65eaf6abd66b81b48bfe615ca17827c8da26b --- .werks/4606 | 11 +++++++++++ web/htdocs/wato.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/4606 b/.werks/4606 new file mode 100644 index 0000000..ac0e6b4 --- /dev/null +++ b/.werks/4606 @@ -0,0 +1,11 @@ +Title: Added context button to agent bakery to rulesets affecting the baked agents +Level: 1 +Component: agents +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1493973915 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c49df35..3aa7d14 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12784,6 +12784,9 @@ class ModeEditRuleset(WatoMode): ("host", self._hostname), ("service", self._item)]), "rulesets") + if has_agent_bakery(): + agent_bakery_context_button(self._name) + def action(self): rule_folder = Folder.folder(html.var("_folder", html.var("folder")))

7 years, 4 months

4607 FIX mk_oracle.aix: Fixed baking mk_oracle plugin into AIX agent tgz

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e12492f4ea554e5c338a41741ffa1d109bb2d46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e12492f4ea554… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 10:53:15 2017 +0200 4607 FIX mk_oracle.aix: Fixed baking mk_oracle plugin into AIX agent tgz Change-Id: Id0165a1451b3e07d28180ac7eefe8784a21672a4 --- .werks/4607 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4607 b/.werks/4607 new file mode 100644 index 0000000..3df0ed3 --- /dev/null +++ b/.werks/4607 @@ -0,0 +1,11 @@ +Title: mk_oracle.aix: Fixed baking mk_oracle plugin into AIX agent tgz +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1493974367 + +

7 years, 4 months

4604 FIX AIX TGZ: Agent plugins were not packed correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e0ea4703f7703cf8326316ff4675b292071225a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e0ea4703f7703… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 09:54:05 2017 +0200 4604 FIX AIX TGZ: Agent plugins were not packed correctly Packing of agent plugins into the AIX tar.gz package was only working for plugins that were also available on linux. Change-Id: I12795134292224f2254c4afa113b7944778e84e9 --- .werks/4604 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4604 b/.werks/4604 new file mode 100644 index 0000000..034f59b --- /dev/null +++ b/.werks/4604 @@ -0,0 +1,12 @@ +Title: AIX TGZ: Agent plugins were not packed correctly +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1493970756 + +Packing of agent plugins into the AIX tar.gz package was only working +for plugins that were also available on linux.

7 years, 4 months

4593 FIX wmi_cpuload: Fixed missing WATO group

by Simon Betz

Module: check_mk Branch: master Commit: cdc4a6390564e5c39fa7938017bd81f0eb0b7132 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdc4a6390564e5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 5 10:36:50 2017 +0200 4593 FIX wmi_cpuload: Fixed missing WATO group Change-Id: I57d43c1a48d995bfa97c2ce7792b8d03c7c159a2 --- .werks/4593 | 11 +++++++++++ checks/wmi_cpuload | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4593 b/.werks/4593 new file mode 100644 index 0000000..cbbc8e6 --- /dev/null +++ b/.werks/4593 @@ -0,0 +1,11 @@ +Title: wmi_cpuload: Fixed missing WATO group +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1493973229 + + diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index 3c90a6c..e433a57 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -56,5 +56,6 @@ check_info['wmi_cpuload'] = { 'parse_function' : parse_wmi_table, 'has_perfdata' : True, 'service_description' : "Processor Queue", - 'includes' : ['wmi.include', 'cpu_load.include'] + 'includes' : ['wmi.include', 'cpu_load.include'], + 'group' : 'cpu_load', }

7 years, 4 months

4603 FIX Bakery continues to build agents when one fails

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b6776f6437a5b6992c57813764940b752de3487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b6776f6437a5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 08:42:44 2017 +0200 4603 FIX Bakery continues to build agents when one fails In case an error occured while baking new agents with the bakery all not yet built packages were left unbuilt. This has been changed now. All error are collected during building and written to the user once all agents are done. Change-Id: Iea2dbc1519bd57759c8b0d59475e540babad2de4 --- .werks/4603 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4603 b/.werks/4603 new file mode 100644 index 0000000..dce64f4 --- /dev/null +++ b/.werks/4603 @@ -0,0 +1,13 @@ +Title: Bakery continues to build agents when one fails +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1493966426 +Class: fix + +In case an error occured while baking new agents with the bakery +all not yet built packages were left unbuilt. This has been changed +now. All error are collected during building and written to the +user once all agents are done.

7 years, 4 months

updated werk 4599

by Sven Rueß

Module: check_mk Branch: master Commit: fb60dcc5a21d161a0303e1b32a4e4134ab769d2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb60dcc5a21d16… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue May 2 12:15:04 2017 +0200 updated werk 4599 Change-Id: I72670f3a3c05e663aa97035866543081db958c53 --- .werks/4599 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4599 b/.werks/4599 index bee4b97..1d9792f 100644 --- a/.werks/4599 +++ b/.werks/4599 @@ -1,4 +1,4 @@ -Title: Fixed rendering of netwrok scan results in folder properties +Title: Fixed rendering of network scan results in folder properties Level: 1 Component: wato Compatible: compat

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017