Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Fixed agent build process

by Lars Michelsen

Module: check_mk Branch: master Commit: ebd6e547fea01ee4c2a5f40fdc027fbf970263fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd6e547fea01e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 15:20:02 2014 +0100 Fixed agent build process --- Makefile | 1 + agents/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index baadd20..ea72c82 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ dist: mk-livestatus mk-eventd cp multisite.mk multisite.mk-$(VERSION) tar czf $(DISTNAME)/conf.tar.gz $(TAROPTS) main.mk-$(VERSION) multisite.mk-$(VERSION) rm -f main.mk-$(VERSION) multisite.mk-$(VERSION) + $(MAKE) -C agents packages tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents \ --exclude "msibuild" \ --exclude "build_version" \ diff --git a/agents/Makefile b/agents/Makefile index 39a863c..1aef6d3 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -58,6 +58,7 @@ setversion: sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ done ; \ + $(MAKE) packages $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion packages: rpm deb

9 years, 9 months

Check_MK Git: check_mk: pre-packed agents are now shipped with regular check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 343d155c0145d68968dcc8f2e248733dc230b4a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=343d155c0145d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 15:03:25 2014 +0100 pre-packed agents are now shipped with regular check_mk --- Makefile | 18 ++++-------------- agents/Makefile | 10 ++++++++++ agents/windows/Makefile | 6 ++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index f057ac6..baadd20 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ dist: mk-livestatus mk-eventd --exclude "logstate.txt" \ --exclude "*.unversioned.exe" \ --exclude "*.cc" \ + --exclude "*.c" \ --exclude "*.res" \ --exclude "*~" \ --exclude "Makefile" \ @@ -168,25 +169,14 @@ version: if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi setversion: - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile agents/Makefile ; \ - for agent in agents/* ; do \ - if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins -a "$$agent" != agents/hpux ] ; then \ - sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ - fi ; \ - done ; \ - sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer*.nsi ; \ - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ + sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/liveproxy/liveproxyd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ - echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ - cd agents/windows ; rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; make ; cd ../.. ; \ - cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe ; \ - cp agents/windows/install_agent-64.exe check-mk-agent-$(NEW_VERSION)-64.exe ; \ - cp agents/windows/check_mk_agent.msi check-mk-agent-$(NEW_VERSION).msi + echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files + $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion headers: doc/helpers/headrify diff --git a/agents/Makefile b/agents/Makefile index 7bee157..8741b8b 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -50,6 +50,16 @@ waitmax: waitmax.c fi @echo "Fine. Typing 'make install' as root now will install into /usr/bin" +setversion: + sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms ; \ + for agent in *; 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; \ + fi ; \ + done ; \ + $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion + packages: rpm deb rpm $(RPM_PACKAGE): diff --git a/agents/mk-job.solaris b/agents/mk-job.solaris old mode 100644 new mode 100755 diff --git a/agents/windows/Makefile b/agents/windows/Makefile index da6fc8e..1218416 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -40,6 +40,12 @@ all: fix_linebreaks install_agent.exe install_agent-64.exe msi_installer .PHONY: inc_build_version fix_linebreaks +setversion: + sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' installer*.nsi ; \ + sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; \ + make + # Converts all files which are targeted to a windows system to CRLF fix_linebreaks: for F in mrpe/* plugins/* *.ini; do \

9 years, 9 months

Check_MK Git: check_mk: Fixed version number update for agents

by Lars Michelsen

Module: check_mk Branch: master Commit: 5148f3585dc10335c905c28a5bb42de8803ffed9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5148f3585dc103… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 15:07:46 2014 +0100 Fixed version number update for agents Conflicts: agents/windows/install_agent-64.exe agents/windows/install_agent.exe --- agents/Makefile | 6 +++--- agents/windows/install_agent-64.exe | Bin 160686 -> 160686 bytes agents/windows/install_agent.exe | Bin 157644 -> 157644 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 8741b8b..39a863c 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -52,13 +52,13 @@ waitmax: waitmax.c setversion: sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ - sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms ; \ - for agent in *; do \ + 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; \ fi ; \ done ; \ - $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion + $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion packages: rpm deb diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2b6ab0e..cd87e90 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 8a4115a..a460125 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: The RPM and DEB package of the Check_MK agent are now shipped with the regular package

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b5f09d8b6f3bec97b453aa29f5fe9100c3f5a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b5f09d8b6f3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 14:50:14 2014 +0100 The RPM and DEB package of the Check_MK agent are now shipped with the regular package of Check_MK. For example in OMD environments, they are located in <tt>share/check_mk/agents</tt>. --- .werks/1759 | 11 +++++++++++ ChangeLog | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/1759 b/.werks/1759 new file mode 100644 index 0000000..0161274 --- /dev/null +++ b/.werks/1759 @@ -0,0 +1,11 @@ +Title: Packed RPM and DEB agent packages are now shipped with normal Check_MK package +Level: 1 +Component: core +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418305715 + +The RPM and DEB package of the Check_MK agent are now shipped with the regular package +of Check_MK. For example in OMD environments, they are located in <tt>share/check_mk/agents</tt>. diff --git a/ChangeLog b/ChangeLog index 77b0a5e..556b3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.7i1: + Core & Setup: + * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... + Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 9 months

Check_MK Git: check_mk: #1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report

by Lars Michelsen

Module: check_mk Branch: master Commit: ec2fd321366864a73c164adf92af350d6544435b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec2fd321366864… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 14:47:31 2014 +0100 #1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report In case of exceptions in the Web GUI, the handling should be easier now. We have full details on the first page without the need to perform an additional request with debug mode enabled. Added a context button for reporting the issue via mail to the feedback address. --- .werks/1758 | 12 ++++++++++++ ChangeLog | 2 ++ web/htdocs/htmllib.py | 29 +++++++++++++++++++++++++++++ web/htdocs/index.py | 7 +------ web/htdocs/lib.py | 7 ++----- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/.werks/1758 b/.werks/1758 new file mode 100644 index 0000000..5b36ab9 --- /dev/null +++ b/.werks/1758 @@ -0,0 +1,12 @@ +Title: Improved exception hander: Shows details without additional debug request, added mailto link for error report +Level: 1 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418305269 + +In case of exceptions in the Web GUI, the handling should be easier now. We have full details on the first page without the need to perform an additional request with debug mode enabled. + +Added a context button for reporting the issue via mail to the feedback address. diff --git a/ChangeLog b/ChangeLog index 7f240fe..77b0a5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.7i1: + Multisite: + * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... 1.2.6b1: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3d72fff..24bc89a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -911,6 +911,35 @@ class html: h += '</div>' return h + def show_exception(self, e): + details = \ + 'Page: ' + self.myfile + '\r\n\r\n' \ + + 'GET/POST-Variables:\r\n' \ + + '\r\n'.join([ ' '+n+'='+v for n, v in sorted(self.vars.items()) ]) + '\r\n' \ + + '\r\n' \ + + format_exception() + + mail_body = \ + "Dear Check_MK Developer team,\r\n\r\n" \ + + "I hereby send you a report of a crash in the Check_MK Web GUI:\r\n\r\n" \ + + details + "\r\n" \ + + "\r\n\r\nWith best regards,\r\n\r\n" + + self.begin_context_buttons() + mailto_url = self.makeuri_contextless([ + ("subject", "Check_MK GUI Crash Report - " + defaults.check_mk_version), + ("body", mail_body)], filename="mailto:feedback@check-mk.org") + self.context_button(_("Submit Report"), mailto_url, "email") + self.end_context_buttons() + + self.show_error("%s: %s" % (_('Internal error'), self.attrencode(e))) + + self.begin_foldable_container("html", "exc_details", False, _("Details")) + self.write('<div class=log_output>') + self.write("<pre>%s</pre>" % details) + self.write('</div>') + self.end_foldable_container() + def show_error(self, msg): if self.mobile: self.write('<center>') diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ca97019..3dd259a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -317,12 +317,7 @@ def handler(req, fields = None, profiling = True): html.write(_("Internal error") + ": %s\n" % html.attrencode(e)) elif not fail_silently: html.header(_("Internal error")) - if config.debug: - html.show_error("%s: %s<pre>%s</pre>" % - (_('Internal error'), html.attrencode(e), html.attrencode(format_exception()))) - else: - url = html.makeuri([("debug", "1")]) - html.show_error("%s: %s (<a href=\"%s\">%s</a>)" % (_('Internal error') + ':', html.attrencode(e), url, _('Retry with debug mode'))) + html.show_exception(e) html.footer() response_code = apache.OK diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 9da5812..f36b9f5 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -320,11 +320,8 @@ def format_plugin_output(output, row = None): return output def format_exception(): - import traceback, StringIO, sys - txt = StringIO.StringIO() - t, v, tb = sys.exc_info() - traceback.print_exception(t, v, tb, None, txt) - return txt.getvalue() + import traceback + return traceback.format_exc() # Escape/strip unwanted chars from (user provided) strings to # use them in livestatus queries. Prevent injections of livestatus

9 years, 9 months

Check_MK Git: check_mk: Rewrote code for creating RPM/DEB of agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 01ff1ee3ec63e22b03298ba3da1e550fc3df0e52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01ff1ee3ec63e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 11 14:41:36 2014 +0100 Rewrote code for creating RPM/DEB of agents --- .gitignore | 4 - Makefile | 88 ++------ agents/.gitignore | 1 + agents/Makefile | 48 +++++ agents/check-mk-agent_1.2.7i1-2_all.deb | Bin 0 -> 17204 bytes agents/check_mk_agent-1.2.7i1-1.noarch.rpm | Bin 0 -> 20213 bytes agents/check_mk_agent.spec | 102 ++++++++++ check_mk.spec | 305 ---------------------------- 8 files changed, 170 insertions(+), 378 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=01ff1ee3ec…

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: c88d34cb9e0c17d8878581bc8f9270b2e4b65de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c88d34cb9e0c17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 14:40:55 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 11ad811..3bc34dd 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1758 +1778

9 years, 9 months

Check_MK Git: check_mk: New generic temperature ruleset, not yet in use

by Mathias Kettner

Module: check_mk Branch: master Commit: 85a87c41a05e1c441210e116a159c9800978f7b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85a87c41a05e1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 11 12:33:01 2014 +0100 New generic temperature ruleset, not yet in use --- web/plugins/wato/check_parameters.py | 75 +++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 95d3b0c..1ee4798 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4918,6 +4918,79 @@ register_check_parameters( None ) + +# New temperature rule for modern temperature checks that have the +# sensor type (e.g. "CPU", "Chassis", etc.) as the beginning of their +# item (e.g. "CPU 1", "Chassis 17/11"). This will replace all other +# temperature rulesets in future. Note: those few temperature checks +# that do *not* use an item, need to be converted to use one single +# item (other than None). +register_check_parameters( + subgroup_environment, + "temperature", + _("Temperature"), + Transform( + Dictionary( + elements = [ + ( "levels", + Tuple( + title = _("Upper Temperature Levels"), + elements = [ + Integer(title = _("warning at"), unit = u"°C", default_value = 26), + Integer(title = _("critical at"), unit = u"°C", default_value = 30), + ] + )), + ( "levels_lower", + Tuple( + title = _("Lower Temperature Levels"), + elements = [ + Integer(title = _("warning at"), unit = u"°C", default_value = 0), + Integer(title = _("critical at"), unit = u"°C", default_value = -10), + ] + )), + ( "output_unit", + DropdownChoice( + title = _("Display values in "), + choices = [ + ( "c", _("Celsius") ), + ( "f", _("Fahrenheit") ), + ( "k", _("Kelvin") ), + ] + )), + ## ( "input_unit", + ## DropdownChoice( + ## title = _("Override unit of sensor"), + ## help = _("In some rare cases the unit that is signalled by the sensor " + ## "is wrong and e.g. the sensor sends values in Fahrenheit while " + ## "they are misinterpreted as Celsius. With this setting you can " + ## "force the reading of the sensor to be interpreted as customized. "), + ## choices = [ + ## ( "c", _("Celsius") ), + ## ( "f", _("Fahrenheit") ), + ## ( "k", _("Kelvin") ), + ## ] + ## )), + ## ( "sensor_levels", + ## DropdownChoice( + ## title = _("Interpretation of Sensor's own temperature status"), + ## choices = [ + ## ( "ignore", _("Ignore sensor's own levels") ), + ## ( "sensor", _("Only use sensor's levels, ignore yours" ) ), + ## ( "best", _("Use least critical of your and sensor's levels") ), + ## ( "worst", _("Use most critical of your and sensor's levels") ), + ## ] + ## )), + + ] + ), + forth = lambda v: type(v) == tuple and { "levels" : v } or v, + ), + TextAscii( + title = _("Sensor ID"), + help = _("The identifier of the thermal sensor.")), + "dict", +) + register_check_parameters( subgroup_environment, "room_temperature", @@ -4932,7 +5005,7 @@ register_check_parameters( ]), TextAscii( title = _("Sensor ID"), - help = _("The identifier of the themal sensor.")), + help = _("The identifier of the thermal sensor.")), "first" )

9 years, 9 months

Check_MK Git: check_mk: Updated makefile

by Lars Michelsen

Module: check_mk Branch: master Commit: 5bfc60db85ba9ec57cddd56925872d231a319378 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bfc60db85ba9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 11:24:46 2014 +0100 Updated makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 0cfb58d..6b64f70 100644 --- a/Makefile +++ b/Makefile @@ -162,6 +162,7 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 13.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 13.10" \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 14.04" \ -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \

9 years, 9 months

Check_MK Git: check_mk: Updated version to next innovation version

by Lars Michelsen

Module: check_mk Branch: master Commit: cbac0f2fab4d388def1a5627489a8e5732c44c6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbac0f2fab4d38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 11:25:55 2014 +0100 Updated version to next innovation version --- 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/Makefile | 2 +- agents/windows/check_mk_agent-64.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent.exe | Bin 178688 -> 178688 bytes agents/windows/install_agent-64.exe | Bin 160572 -> 160686 bytes agents/windows/install_agent.exe | Bin 157529 -> 157644 bytes agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- debian/files | 2 +- doc/treasures/liveproxy/liveproxyd | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 23 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 6b64f70..6eab014 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.5i7 +VERSION = 1.2.7i1 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 be27f7a..616270e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -112,7 +112,7 @@ function run_cached { } echo '<<<check_mk>>>' -echo Version: 2014.12.01 +echo Version: 1.2.7i1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 008d613..b517fbe 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -104,7 +104,7 @@ function run_cached() { } echo '<<<check_mk>>>' -echo Version: 1.2.5i7 +echo Version: 1.2.7i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index a355ff9..49b3571 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.5i7 +echo Version: 1.2.7i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a476f0c..165170e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -109,7 +109,7 @@ function run_cached () { export -f run_cached echo '<<<check_mk>>>' -echo Version: 1.2.5i7 +echo Version: 1.2.7i1 echo AgentOS: linux echo AgentDirectory: $MK_CONFDIR echo DataDirectory: $MK_VARDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index d01c5bb..f2ad060 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.5i7 +echo Version: 1.2.7i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index bf2b027..a8f7dbe 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.5i7 +echo Version: 1.2.7i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 75ff1d1..76ad428 100755 --- 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.5i7 +echo Version: 1.2.7i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 55fc93c..6c44335 100755 --- 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.5i7" +$say "Version: 1.2.7i1" $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 18842fb..1bc04d5 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -91,7 +91,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.2.5i7 +echo Version: 1.2.7i1 echo AgentOS: solaris diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 7b7aad6..da6fc8e 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.5i7 +VERSION = 1.2.7i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i586-mingw32msvc-windres COPTIONS = -s -O2 -Wall -Werror -static -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b7fec3e..6e5eaff 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.exe b/agents/windows/check_mk_agent.exe index 718690a..ce2546b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 72b7f39..2b6ab0e 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 d571f24..8a4115a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index b63e4b6..ae3d4cf 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.5i7" +!define CHECK_MK_VERSION "1.2.7i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index b2155f5..3740fdc 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.5i7" +!define CHECK_MK_VERSION "1.2.7i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index b68440e..6c63d62 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.5i7-1_all.deb net optional +check-mk_1.2.7i1-1_all.deb net optional diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index db0f64a..bd38d8f 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -3,7 +3,7 @@ import os, sys, getopt, signal, time, socket, select, traceback, re, gzip, StringIO -VERSION="1.2.5i7" +VERSION="1.2.7i1" sites = {} dump_interval = 5 # dump state once every five seconds diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index ee760cd..6a21ab6 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.5i7" +VERSION="1.2.7i1" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index f6d8d05..e7e2544 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.5i7], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.7i1], [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 2d13f05..9b81150 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.5i7" +VERSION="1.2.7i1" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 6786b26..789668f 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.5i7 +VERSION=1.2.7i1 NAME=check_mk LANG= LC_ALL=

9 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
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