Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65231 discussions

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 306813e3ffb91d10d3ad1e369f6ba2159cab8e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=306813e3ffb91d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 30 12:42:41 2010 +0100 Updated internal doku --- LIESMICH.zutun | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index d0bd000..0214640 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -88,6 +88,7 @@ geloggt wird nur das Starten und Beenden (was ja im Hauptthread läuft). Windows-Agent: Memory-Check neu machen. Swap stimmt nicht. Evtl. zwei getrennte Checks für Memory and Pagefile. + ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- @@ -507,3 +508,4 @@ dies nur wenn wenn in config was ändert oder bei livestatus (wegen der persistenten Verbindungen). Sonst kanns einem egal sein, wenn man ein neues Modul bekommt. +Windows-Agent: VB-Scripts automatisch mit cscript ausführen.

13 years, 11 months

Check_MK Git: check_mk: wato: Fixed first inventory for services with spaces in item names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 904ac8da2097d928201e4c7a177e85ad51a01895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=904ac8da2097d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 13:25:23 2010 +0100 wato: Fixed first inventory for services with spaces in item names --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1cb6c67..d84e751 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -420,7 +420,7 @@ def mode_inventory(phase, firsttime): elif (html.has_var("_activate_all") or html.has_var("_fixall")) and st == "new": active_checks[(ct, item)] = paramstring else: - varname = "_%s_%s" % (ct, item) + varname = ("_%s_%s" % (ct, item)).replace(' ', '+') if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring

13 years, 11 months

Check_MK Git: check_mk: Fixed wato url when using multiple sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73a1cfd7664b02a43945eda9a6534fd98132dc74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73a1cfd7664b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 13:07:00 2010 +0100 Fixed wato url when using multiple sites --- web/plugins/sidebar/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index f40a7bb..86dc9e2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -19,7 +19,7 @@ def render_wato_files(): state = html.site_status[sitename]["state"] if state != "disabled": html.write("<h3>%s</h3>\n" % site["alias"]) - ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py" + ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py?site=" + sitename html.javascript("document.write(get_url_sync('%s'));" % ajax_url) else: ajax_wato_files(html) @@ -27,10 +27,14 @@ def render_wato_files(): def ajax_wato_files(h): global html html = h + sitename = html.var('site', '') if config.may("use_wato"): for filename, title, roles in config.config_files: if config.role in roles: - bulletlink(title, "wato.py?filename=%s" % filename) + if sitename: + bulletlink(title, "/%s/check_mk/wato.py?filename=%s" % (sitename, filename)) + else: + bulletlink(title, "wato.py?filename=%s" % filename) sidebar_snapins["wato"] = {

13 years, 11 months

Check_MK Git: check_mk: Fixed undefined var after non sudo exception during --automation call

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68f14653c0ceb35abc8564ce1c451d9f87c0c3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68f14653c0ceb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 12:48:08 2010 +0100 Fixed undefined var after non sudo exception during --automation call --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 11f5921..1cb6c67 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -501,6 +501,7 @@ def check_mk_automation(command, args=[], indata=""): commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] + sudo_msg = '' if commandargs[0] == 'sudo': sudo_msg = ("<p>The webserver is running as user which has no rights on the " "needed Check_MK/Nagios files.<br />Please ensure you have set-up "

13 years, 11 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9bde15d99ca8dea7a8d5f1c448b7091345fc4b4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bde15d99ca8de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 2 15:53:14 2010 +0100 Updated internal doku --- LIESMICH.zutun | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 6d9300a..900b19d 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -512,3 +512,5 @@ sein, wenn man ein neues Modul bekommt. Snapins: die letzten 10 Notifikationen, die letzten 10 Alerts (evtl. umschaltbar per Tabs) + +Acknowledgements: Ankreuzung, ob persistent oder nicht

13 years, 11 months

Check_MK Git: check_mk: wato: Removing tty requirement for apache user in sudo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e39a76eff735d42badb8d065dc5fcdc2c86d3ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e39a76eff735d… Author: Lars Michelsen <lm(a)larsmichelsen.com> Date: Mon Nov 29 18:34:25 2010 +0100 wato: Removing tty requirement for apache user in sudo --- scripts/setup.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 654306e..a6097ff 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -542,14 +542,14 @@ create_sudo_configuration () return fi - sudoline="$wwwuser ALL = (root) NOPASSWD: $bindir/check_mk --automation *" + sudolines="Defaults:$wwwuser !requiretty\n$wwwuser ALL = (root) NOPASSWD: $bindir/check_mk --automation *" if [ ! -e /etc/sudoers ] ; then echo "You do not have sudo installed. Please install sudo " echo "and add the following line to /etc/sudoers if you want" echo "to use WATO - the Check_MK Web Administration Tool" echo - echo "$sudoline" + echo -e "$sudolines" echo echo return @@ -563,7 +563,7 @@ create_sudo_configuration () echo >> /etc/sudoers echo "# Needed for WATO - the Check_MK Web Administration Tool" >> /etc/sudoers - echo "$sudoline" >> /etc/sudoers + echo -e "$sudolines" >> /etc/sudoers } while true

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'wato'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a4fd47b53cb7245b118011becc74be156cb6967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a4fd47b53cb72… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 2 11:01:50 2010 +0100 Merge branch 'wato' Signed-off-by: Mathias Kettner <mk(a)mathias-kettner.de> ---

13 years, 11 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: 20887b7a3decd5390e02b68b9922f381abbc68a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20887b7a3decd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 2 10:59:22 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 11 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 440e6e2dc2d8837efd5b3295c1fd5db195f157fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=440e6e2dc2d883… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 2 10:57:40 2010 +0100 Updated internal doku --- LIESMICH.zutun | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index d0bd000..6d9300a 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -88,6 +88,9 @@ geloggt wird nur das Starten und Beenden (was ja im Hauptthread läuft). Windows-Agent: Memory-Check neu machen. Swap stimmt nicht. Evtl. zwei getrennte Checks für Memory and Pagefile. +Ansicht Hostgruppen: Auch wenn man die Gruppierung nach Sites ausschaltet, +bleibt die Ansicht weiterhin nach Sites gruppiert? --> Sortierung falsch. + ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- @@ -507,3 +510,5 @@ dies nur wenn wenn in config was ändert oder bei livestatus (wegen der persistenten Verbindungen). Sonst kanns einem egal sein, wenn man ein neues Modul bekommt. +Snapins: die letzten 10 Notifikationen, die letzten 10 Alerts +(evtl. umschaltbar per Tabs)

13 years, 11 months

Check_MK Git: check_mk: Final fix for omd apache shared mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fd4e84df63c5447b2b04ca686ac515766fb5fdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fd4e84df63c54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 30 17:44:11 2010 +0100 Final fix for omd apache shared mode --- web/htdocs/wato.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c0d68c..68a5b8b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -489,18 +489,18 @@ def check_mk_automation(command, args=[], indata=""): # - When not set try to detect the command for OMD or non OMD installations # - OMD 'own' apache mode or non OMD: check_mk --automation # - OMD 'shared' apache mode: Full path to the binary and the defaults - commandargs = [] if defaults.check_mk_automation: commandargs = defaults.check_mk_automation.split() + cmd = commandargs + [ command ] + args else: apache_user, omd_mode, omd_site = html.omd_mode() if not omd_mode or omd_mode == 'own': commandargs = [ 'check_mk', '--automation' ] + cmd = commandargs + [ command ] + args else: - commandargs = [ 'sudo', '-u', omd_site, '/usr/bin/env', 'python', - '/omd/sites/'+omd_site+'/share/check_mk/modules/check_mk.py', - '--defaults', '/omd/sites/'+omd_site+'/etc/check_mk/defaults', - '--automation' ] + commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] + cmd = commandargs + cmd[-1] += ' ' + ' '.join([ command ] + args) if commandargs[0] == 'sudo': sudo_msg = ("<p>The webserver is running as user which has no rights on the " @@ -513,9 +513,7 @@ def check_mk_automation(command, args=[], indata=""): "%s ALL = (%s) NOPASSWD: %s *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, omd_site, " ".join(commandargs[3:]))) - - cmd = commandargs + [ command ] + args + (apache_user, apache_user, omd_site, " ".join(commandargs[1:]))) try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits