Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c338f45d4c908834e048f38c758267f9590533e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c338f45d4c9088… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 17:30:57 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 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: 190ce9ed8431d79590c2b33ab4043daa8be1ec33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=190ce9ed8431d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 15:26:40 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: add missing CSS files for mobile GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 293ca3a0936f0b44c270c7c751aa0e0adb2db0ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=293ca3a0936f0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 15:26:27 2011 +0100 FIX: add missing CSS files for mobile GUI --- ChangeLog | 3 +++ Makefile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d55f6bf..fe23ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * linux agent - ipmi: Creating directory of cache file if not exists * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in order to be consistent with other checks + + Multisite: + * FIX: ship missing CSS files for mobile GUI WATO: * Optimized wraps in host lists tag column diff --git a/Makefile b/Makefile index f850053..89a0416 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ CONFDIR = /etc/$(NAME) LIBDIR = $(PREFIX)/lib/$(NAME) DISTNAME = $(NAME)-$(VERSION) TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ - --exclude=.gitignore + --exclude=.gitignore --exclude=.*.swp DOWNLOADURL = http://mathias-kettner.de/download/$(DISTNAME).tar.gz LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ configure.ac ltmain.sh Makefile.am Makefile.in missing \ @@ -62,7 +62,7 @@ dist: mk-livestatus mkdir -p $(DISTNAME) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/images/icons/*.png htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls)

12 years, 9 months

Check_MK Git: check_mk: Added missing ie.css file

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 465e2c639bb3b85fac4c514afd9e1c5e16de62c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=465e2c639bb3b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 15:16:14 2011 +0100 Added missing ie.css file --- web/htdocs/ie.css | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/web/htdocs/ie.css b/web/htdocs/ie.css new file mode 100644 index 0000000..147f7ed --- /dev/null +++ b/web/htdocs/ie.css @@ -0,0 +1,33 @@ +/* ++------------------------------------------------------------------+ +| ____ _ _ __ __ _ __ | +| / ___| |__ ___ ___| | __ | \/ | |/ / | +| | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +| | |___| | | | __/ (__| < | | | | . \ | +| \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +| | +| Copyright Mathias Kettner 2012 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. + +*/ + +/* Stylesheet for special IE definitions */ + +.aggrtree span.state { + zoom: 1; + display: inline; +}

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96312744f08b9a6d1591fc66ac2d238b5d703067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96312744f08b9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 15:13:11 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Several cleanups to prevent css/ js warning messages in e.g. Firefox

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3d21fa38b0740ab737909ef89f114d2b4a16c03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d21fa38b0740… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 15:05:50 2011 +0100 Several cleanups to prevent css/js warning messages in e.g. Firefox --- ChangeLog | 3 +++ web/htdocs/bi.css | 2 -- web/htdocs/check_mk.css | 3 ++- web/htdocs/dashboard.css | 2 +- web/htdocs/dashboard.py | 7 +++++-- web/htdocs/htmllib.py | 11 +++++++---- web/htdocs/js/check_mk.js | 8 ++++---- web/htdocs/js/search.js | 2 +- web/htdocs/js/sidebar.js | 8 ++++---- web/htdocs/js/wato.js | 2 +- web/htdocs/sidebar.css | 8 ++++---- web/plugins/sidebar/shipped.py | 2 +- 12 files changed, 33 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b3d21fa38b…

12 years, 9 months

Check_MK Git: check_mk: Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7da4008b4fc5c60923bef33a93338aad770acf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7da4008b4fc5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:05:00 2011 +0100 Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory --- ChangeLog | 2 ++ web/htdocs/js/wato.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f15fe7..bc60218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ WATO: * Optimized wraps in host lists tag column + * Bulk inventory: Remove leading pipe signs in progress bar on main + folder inventory 1.1.13i1: Multisite: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 614fb56..b3045b9 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -387,7 +387,8 @@ function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_s if (progress_items.length > 0) { // Progressing progress_running = true; - update_progress_title(progress_items[0]); + // Remove leading pipe signs (when having no folder set) + update_progress_title(progress_items[0].replace(/^\|*/g, '')); get_url(url_prefix + '&_transid=-1&_item=' + escape(progress_items[0]), progress_handle_response, [ mode, progress_items[0] ]); } else {

12 years, 9 months

Check_MK Git: check_mk: Bugfix: Calling activate_changes hook also in distributed WATO setups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a19b469c225a1104ca33de2b4adc69d70a0552d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a19b469c225a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:55:51 2011 +0100 Bugfix: Calling activate_changes hook also in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 7 +++++-- web/plugins/wato/nagvis_auth.py | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc60218..c3a3e6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * Optimized wraps in host lists tag column * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory + * Bugfix: Calling activate_changes hook also in distributed WATO setups 1.1.13i1: Multisite: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f2c7740..ea83557 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2580,7 +2580,6 @@ def mode_changelog(phase): else: try: check_mk_local_automation("restart") - call_hook_activate_changes() except Exception, e: if config.debug: raise @@ -3141,6 +3140,11 @@ def check_mk_local_automation(command, args=[], indata=""): log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), sudo_msg)) + + # On successful "restart" command execute the activate changes hook + if command == 'restart': + call_hook_activate_changes() + try: if config.debug: log_audit(None, "automation", "Result from automation: %s" % outdata) @@ -7010,7 +7014,6 @@ def automation_push_snapshot(): log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) if html.var("restart", "no") == "yes": check_mk_local_automation("restart") - call_hook_activate_changes() return True except Exception, e: if config.debug: diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index aab63fb..d33fdbd 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -178,5 +178,6 @@ if config.wato_write_nagvis_auth and defaults.omd_root: [] ) - api.register_hook('users-saved', generate_auth_file) - api.register_hook('roles-saved', lambda x: generate_auth_file(load_users())) + api.register_hook('users-saved', generate_auth_file) + api.register_hook('roles-saved', lambda x: generate_auth_file(load_users())) + api.register_hook('activate-changes', lambda x: generate_auth_file(load_users()))

12 years, 9 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d92be5707dcd798e49847d6d40cb3f49329827ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d92be5707dcd79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:56:17 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3a3e6f..72c2b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory * Bugfix: Calling activate_changes hook also in distributed WATO setups + * NagVis auhtorization file generation is also executed on activate_changes 1.1.13i1: Multisite:

12 years, 9 months

Check_MK Git: check_mk: Bugfix: Fixed javascript error when doing replication in distributed

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f1c9082bf0d81120acfd9d94ff36c8191514f5d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c9082bf0d811… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 14:01:43 2011 +0100 Bugfix: Fixed javascript error when doing replication in distributed wato environments when not having the sidebar open --- ChangeLog | 4 +++- web/htdocs/js/wato.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c2b7b..484706a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,8 +11,10 @@ * Optimized wraps in host lists tag column * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory - * Bugfix: Calling activate_changes hook also in distributed WATO setups * NagVis auhtorization file generation is also executed on activate_changes + * Bugfix: Calling activate_changes hook also in distributed WATO setups + * Bugfix: Fixed javascript error when doing replication in distributed + wato environments when not having the sidebar open 1.1.13i1: Multisite: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index b3045b9..98adf36 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -456,7 +456,8 @@ function wato_replication_result(siteid, code) { } function wato_replication_finish() { - parent.frames[1].location.reload(); // reload sidebar + if(parent && parent.frames[1]) + parent.frames[1].location.reload(); // reload sidebar oDiv = document.getElementById("act_changes_button"); oDiv.style.display = "none"; }

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits