Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: c74a0126c2e56fa0a33cd88aa1e8b370b777ba15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74a0126c2e56f… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 17:44:47 2017 +0100 Refactored backup. Change-Id: I96ea1f7eaea4f10fe7ffd03a4607d38d2d3a3627 --- web/htdocs/backup.py | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 844d517..556c118 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -416,7 +416,7 @@ class Jobs(BackupEntityCollection): def show_list(self, editable=True): - html.write("<h2>%s</h2>" % _("Jobs")) + html.h2(_("Jobs")) table.begin(sortable=False, searchable=False) for job_ident, job in sorted(self.objects.items()): @@ -867,9 +867,9 @@ class PageBackupJobState(object): def page(self): - html.write("<div id=\"job_details\">") + html.open_div(id_="job_details") self.show_job_details() - html.write("</div>") + html.close_div() html.javascript("refresh_job_details('%s', '%s', %s)" % (self._update_url(), self._ident, "true" if is_site() else "false")) @@ -882,7 +882,7 @@ class PageBackupJobState(object): job = self._job state = job.state() - html.write("<table class=\"data backup_job\">") + html.open_table(class_=["data", "backup_job"]) css = "state0" state_txt = job.state_name(state["state"]) @@ -893,13 +893,18 @@ class PageBackupJobState(object): else: state_txt = _("Finished") elif state["state"] == None: - css = "" - - html.write("<tr class=\"data even0\"><td class=\"left legend\">%s</td>" % _("State")) - html.write("<td class=\"state %s\">%s</td></tr>" % (css, state_txt)) - - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Runtime")) - html.write("<td>") + css = None + + html.open_tr(class_=["data", "even0"]) + html.td(_("State"), class_=["left", "legend"]) + html.open_td(class_=["state", css]) + html.write(state_txt) + html.close_td() + html.close_tr() + + html.open_tr(class_=["data", "odd0"]) + html.td(_("Runtime"), class_="left") + html.open_td() if state["started"]: html.write(_("Started at %s") % render.date_and_time(state["started"])) duration = time.time() - state["started"] @@ -908,12 +913,17 @@ class PageBackupJobState(object): duration = state["finished"] - state["started"] html.write(_(" (Duration: %s)") % render.timespan(duration)) - html.write("</td></tr>") + html.close_td() + html.close_tr() - html.write("<tr class=\"data even0\"><td class=\"left legend\">%s</td>" % _("Output")) - html.write("<td class=\"log\"><pre>%s</pre></td></tr>" % html.attrencode(state["output"])) + html.open_tr(class_=["data", "even0"]) + html.td(_("Output"), class_=["left", "legend"]) + html.open_td(class_="log") + html.pre(state["output"]) + html.close_td() + html.close_tr() - html.write("</table>") + html.close_table() #. @@ -985,7 +995,7 @@ class Target(BackupEntity): if info["config"]["encrypt"] != None: html.write(info["config"]["encrypt"]) else: - html.write(_("No")) + html.write_text(_("No")) if info["type"] == "Appliance": table.cell(_("Clustered")) @@ -1023,7 +1033,9 @@ class Targets(BackupEntityCollection): def show_list(self, title=None, editable=True): title = title if title else _("Targets") - html.write("<h2>%s</h2>" % title) + html.open_h2() + html.write(title) + html.close_h2() if not editable and is_site(): html.write("<p>%s</p>" % _("These backup targets can not be edited here. You need to " "open the device backup management.")) @@ -1734,9 +1746,8 @@ class PageBackupRestore(object): html.end_context_buttons() html.show_user_errors() - html.write("<p>%s</p>" % - _("To be able to decrypt and restore the encrypted backup, you need to enter the " - "passphrase of the encryption key.")) + html.p(_("To be able to decrypt and restore the encrypted backup, you need to enter the " + "passphrase of the encryption key.")) html.begin_form("key", method="GET") html.hidden_field("_action", "start") html.hidden_field("_backup", backup_ident)

7 years, 7 months

4366 FIX Fixed random exception related to html.unplug() in GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: e353482f0773a8ee0b71d490e4fadf4c83616995 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e353482f0773a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 08:13:15 2017 +0100 4366 FIX Fixed random exception related to html.unplug() in GUI Change-Id: Ic794a9861fcf05193f27ec0e3ff5477ee8292d65 --- .werks/4366 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 27 ++++++++++++++++----------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.werks/4366 b/.werks/4366 new file mode 100644 index 0000000..cdf871d --- /dev/null +++ b/.werks/4366 @@ -0,0 +1,10 @@ +Title: Fixed random exception related to html.unplug() in GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487142764 + + diff --git a/ChangeLog b/ChangeLog index 1d1ef1d..fdb2954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT + * 4366 FIX: Fixed random exception related to html.unplug() in GUI 1.4.0b1: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6c97fa9..535f391 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -361,25 +361,30 @@ class OutputFunnel(object): # Pull the plug for a moment to allow the sink content to pass through. def flush(self): - if self.is_plugged(): - text = self.plug_text[self.plug_level] - self.plug_text[self.plug_level] = "" - self.plug_level -= 1 - self.write(text) - self.plug_level += 1 + if not self.is_plugged(): + return None + + text = self.plug_text[self.plug_level] + self.plug_text[self.plug_level] = "" + self.plug_level -= 1 + self.write(text) + self.plug_level += 1 # Get the sink content in order to do something with it. def drain(self): - if self.is_plugged(): - text = self.plug_text[self.plug_level] - self.plug_text[self.plug_level] = '' - return text - else: + if not self.is_plugged(): return '' + text = self.plug_text[self.plug_level] + self.plug_text[self.plug_level] = '' + return text + def unplug(self): + if not self.is_plugged(): + return + self.flush() self.plug_text.pop() self.plug_level -= 1

7 years, 7 months

4365 FIX Service availability: Host down could not be rewritten to other states like CRIT

by Lars Michelsen

Module: check_mk Branch: master Commit: 31258ef42e8caf1b02b8536a4c7bf7b03b2572da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31258ef42e8caf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 15:14:44 2017 +0100 4365 FIX Service availability: Host down could not be rewritten to other states like CRIT Change-Id: Id28e3a384030c61c5de45817bcb9ef99938ced96 --- .werks/4365 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/availability.py | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4365 b/.werks/4365 new file mode 100644 index 0000000..336db5c --- /dev/null +++ b/.werks/4365 @@ -0,0 +1,9 @@ +Title: Service availability: Host down could not be rewritten to other states like CRIT +Level: 1 +Component: multisite +Compatible: compat +Version: 1.5.0i1 +Date: 1487081636 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 51038e1..d0bd40b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 4331 FIX: check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL) + Multisite: + * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT + 1.4.0b1: Core & Setup: diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index db50c8d..1c750ed 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -736,7 +736,9 @@ def compute_availability(what, av_rawdata, avoptions): else: s = "in_downtime" elif what != "host" and span["host_down"] and avoptions["consider"]["host_down"]: - s = "host_down" + # Reclassification due to state grouping + s = avoptions["state_grouping"].get("host_down", "host_down") + elif span["is_flapping"] and avoptions["consider"]["flapping"]: s = "flapping" else:

7 years, 7 months

4203 FIX Fix failed SSH login in Linux remote alert handlers on some distributions

by Mathias Kettner

Module: check_mk Branch: master Commit: 508dbf647e0c32556f93d04eb357ce300e9b8001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=508dbf647e0c32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 15:15:20 2017 +0100 4203 FIX Fix failed SSH login in Linux remote alert handlers on some distributions When the baked agent package automatically creates the SSH access for executing remote alert handlers by modifying <tt>.ssh/authorized_keys</tt> it puts two spaces instead of just one after the word <tt>ssh-rsa</tt>. This seems to make <b>some</b> versions of SSH unhappy and ignore that key. This has been fixed. You need to rebake and reinstall your agents in order to fix that after updating Check_MK. As a workaround you can manually remove the duplicate space in <tt>.ssh/authorized_keys</tt> in the home directory of the target user. Change-Id: I9dc3b467500ab7c2d9f12282ced4da1b28cd1202 --- .werks/4203 | 18 ++++++++++++++++++ ChangeLog | 1 + 2 files changed, 19 insertions(+) diff --git a/.werks/4203 b/.werks/4203 new file mode 100644 index 0000000..9e92d72 --- /dev/null +++ b/.werks/4203 @@ -0,0 +1,18 @@ +Title: Fix failed SSH login in Linux remote alert handlers on some distributions +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487081543 + +When the baked agent package automatically creates the SSH access for +executing remote alert handlers by modifying <tt>.ssh/authorized_keys</tt> +it puts two spaces instead of just one after the word <tt>ssh-rsa</tt>. This +seems to make <b>some</b> versions of SSH unhappy and ignore that key. This +has been fixed. You need to rebake and reinstall your agents in order to +fix that after updating Check_MK. + +As a workaround you can manually remove the duplicate space in +<tt>.ssh/authorized_keys</tt> in the home directory of the target user. diff --git a/ChangeLog b/ChangeLog index d0bd40b..1d1ef1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.5.0i1: Checks & Agents: * 4331 FIX: check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL) + * 4203 FIX: Fix failed SSH login in Linux remote alert handlers on some distributions... Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT

7 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 046ee14340d638b81a25024f289a80dcb2f96c0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=046ee14340d638… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 15:13:48 2017 +0100 Reserved 20 Werk IDS Change-Id: Iad430bb2929cbd7c869d5ab8509d559e8e63dc47 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d9f8374..e6a49d5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4365 +4385

7 years, 7 months

4331 FIX check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL)

by Lars Michelsen

Module: check_mk Branch: master Commit: b6dce8bd6d23e465f3d479ba1ccd4ce2720d10b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6dce8bd6d23e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 14:50:35 2017 +0100 4331 FIX check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL) Change-Id: Ic6446edc801a2f79e19e2863f8c25523ee46278f --- .werks/4331 | 9 +++++++++ ChangeLog | 2 ++ active_checks/check_sql | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4331 b/.werks/4331 new file mode 100644 index 0000000..2e3c43b --- /dev/null +++ b/.werks/4331 @@ -0,0 +1,9 @@ +Title: check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL) +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487080179 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8834fc5..51038e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.5.0i1: + Checks & Agents: + * 4331 FIX: check_sql: Is now printing FreeTDS debug messages in verbose mode (with MSSQL) 1.4.0b1: diff --git a/active_checks/check_sql b/active_checks/check_sql index 65f4721..a2079bf 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -30,7 +30,9 @@ # https://pypi.python.org/pypi/ibm_db -import sys, getopt +import sys +import getopt +import os def usage(): @@ -166,6 +168,9 @@ try: db=opt_name, user=opt_user, passwd=opt_password ) elif opt_dbms == "mssql": + if opt_verbose: + os.environ["TDSDUMP"] = "stdout" + import pymssql # mssql driver db = pymssql if opt_port == None:

7 years, 7 months

Updated changelogs and werks to correct 1.4.0b1 version

by Lars Michelsen

7 years, 7 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f2ca20a94c057e1e7ee709e6d728d733b253d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f2ca20a94c057… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 13:08:49 2017 +0100 Testcommit Change-Id: I38ce9b106f5746f4680920bfda5f1585e73b9391 --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 44596d1..955a9b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ 1.5.0i1: - 1.4.0i4: Core & Setup: * 4286 SNMP MIBs of the Event Console can now be packed using MKPs...

7 years, 7 months

Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 25c72d268e7f5153cce439304f7cc2537543374f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c72d268e7f51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 11:58:50 2017 +0100 Tescommit Change-Id: I80e1b5b9b7f5ecc6f86ab49039c96ccb6166873c --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 955a9b5..44596d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.5.0i1: + 1.4.0i4: Core & Setup: * 4286 SNMP MIBs of the Event Console can now be packed using MKPs...

7 years, 7 months

Fixed version info in crash log.

by Sven Panne

Module: check_mk Branch: master Commit: 992046911e2d761e2dd17e9b39f828bbab687b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=992046911e2d76… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 14 11:38:55 2017 +0100 Fixed version info in crash log. Change-Id: I69e4544aa9fed94f9e781ba77225e6c6420bf9a7 --- agents/windows/Makefile | 4 ++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1329152 -> 1329152 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15658018 -> 15658018 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1329152 -> 1329152 bytes agents/windows/check_mk_agent.exe | Bin 1305600 -> 1305600 bytes agents/windows/check_mk_agent.msi | Bin 2904576 -> 2904576 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13549114 -> 13549114 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305600 -> 1305600 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 567960 -> 586828 bytes agents/windows/install_agent.exe | Bin 565029 -> 583891 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes 13 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 6760c2a..c35eeab 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,12 +27,12 @@ SHELL = /bin/bash VERSION = 1.5.0i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags) +GIT_REV = $(shell git rev-parse --verify --short HEAD) DEPDIR = depend DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td -COMMON_OPTS = -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++14 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(GIT_REV)\" +COMMON_OPTS = -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++14 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(VERSION)-$(GIT_REV)\" COPTIONS = -O2 -Wformat=2 -Werror $(COMMON_OPTS) $(DEPFLAGS) # for debug builds #COPTIONS = -O0 $(COMMON_OPTS) $(DEPFLAGS) diff --git a/agents/windows/build_version b/agents/windows/build_version index 166c7ce..bcf6e41 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2539 +2541 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f215b1b..b2ea483 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index f1b99ec..e84b793 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 881e4a6..3955a4d 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 79d7da4..ef93271 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 6905ccf..95b7b00 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 27c88b2..c35ce70 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 5ffebcf..11c52f4 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 70c7b87..a672400 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8b51347..b5289a8 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 e97e527..ffb4e49 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 142db98..dbd94c0 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

7 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017