Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: Updated latest changes

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b9fc893094240202d637c3edc7b631ba707fef0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9fc8930942402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 12:49:39 2010 +0100 Updated latest changes --- .bugs/9 | 3 +++ ChangeLog | 2 +- web/htdocs/js/check_mk.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/9 b/.bugs/9 index e7942e0..1fa90e2 100644 --- a/.bugs/9 +++ b/.bugs/9 @@ -9,6 +9,9 @@ Class: bug Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: * reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. Nur das reload macht er + + => Wurde behoben. Lösung: Async Request statt Sync Request + * Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt * Snapin "Views": Die Spiegelpunkte sind zu weit links, die Einrückung klappt nicht. diff --git a/ChangeLog b/ChangeLog index 4abb610..3d4bb6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,7 +32,7 @@ and services * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera * Sidebar: Fixed scroll position saving in Opera - * Fixed reloading button animation in Chrome (Changed request to async mode) + * Fixed reloading button animation in Chrome/IE (Changed request to async mode) Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index ded9a04..4e8f46d 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -237,7 +237,7 @@ function performAction(oLink, action, type, site, name1, name2) { var oImg = oLink.childNodes[0]; oImg.src = 'images/icon_reloading.gif'; - // Chrome is not animating the gif during sync ajax request + // Chrome and IE are not animating the gif during sync ajax request // So better use the async request here get_url('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2, actionResponseHandler, oImg);

13 years, 9 months

Check_MK Git: check_mk: Sidebar: Fixed scroll position saving in Opera

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e98dcf3d6d1b02c55a222f60c8de465a8ea1c484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e98dcf3d6d1b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 11:35:57 2010 +0100 Sidebar: Fixed scroll position saving in Opera --- .bugs/18 | 10 +++++++--- ChangeLog | 1 + web/htdocs/js/sidebar.js | 11 +++++++++++ web/htdocs/sidebar.py | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.bugs/18 b/.bugs/18 index 6cb4c2a..a191bac 100644 --- a/.bugs/18 +++ b/.bugs/18 @@ -1,10 +1,11 @@ Title: Browserprobleme bei Opera Component: multisite +State: done +Class: bug +Date: 2010-12-21 16:18:53 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 16:18:53 -Class: bug +Fun: 0 * Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator springt dann immer nach ganz oben. @@ -13,3 +14,6 @@ springt dann immer nach ganz oben. * Im Opera wird sich die aktuelle Scroll-Position der Sidebar nicht korrekt gemerkt. + +2010-12-27 11:35:44: changed state open -> done +Things are working now in current opera version \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 26127f8..130dc30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * new view "Alert Statistics" showing alert statistics for all hosts and services * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera + * Sidebar: Fixed scroll position saving in Opera Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 9eff28d..ab971cb 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -24,6 +24,7 @@ var browser = navigator.userAgent.toLowerCase(); var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); +var weAreOpera = browser.indexOf("opera") != -1; var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; var contentLocation = parent.frames[1].document.location; @@ -456,6 +457,11 @@ function dragScroll(event) { var diff = startY - event.clientY; inhalt.scrollTop += diff; + + // Opera does not fire onunload event which is used to store the scroll + // position. So call the store function manually here. + if(weAreOpera) + storeScrollPos(); startY = event.clientY; @@ -496,6 +502,11 @@ function scrollWheel(event){ if (delta) handle(delta); + // Opera does not fire onunload event which is used to store the scroll + // position. So call the store function manually here. + if(weAreOpera) + storeScrollPos(); + if (event.preventDefault) event.preventDefault(); else diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 53efd52..1403ebe 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -130,7 +130,7 @@ def page_side(h): global html html = h - html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN "http://www.w3.org/TR/html4/frameset.dtd"> + html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head>

13 years, 9 months

Check_MK Git: check_mk: Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c711f14ccfcbf92a14f6aaa433c1abdea8fe06d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c711f14ccfcbf9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 11:12:37 2010 +0100 Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera --- .bugs/18 | 2 ++ ChangeLog | 1 + web/htdocs/.f12 | 2 +- web/htdocs/js/sidebar.js | 17 +++++++++-------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.bugs/18 b/.bugs/18 index bb54a1d..6cb4c2a 100644 --- a/.bugs/18 +++ b/.bugs/18 @@ -9,5 +9,7 @@ Class: bug * Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator springt dann immer nach ganz oben. + ==> Ist behoben. + * Im Opera wird sich die aktuelle Scroll-Position der Sidebar nicht korrekt gemerkt. diff --git a/ChangeLog b/ChangeLog index af97e19..26127f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * new datasource "alert_stats" for computing alert statistics * new view "Alert Statistics" showing alert statistics for all hosts and services + * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index d836a21..c52f4b1 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,6 +1,6 @@ #!/bin/bash set -e -sudo cp -r images *.css *.py *.js /omd/versions/default/share/check_mk/web/htdocs +sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 9231551..9eff28d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -250,14 +250,11 @@ function snapinStopDrag(event) { } function getDivChildNodes(node) { - if(typeof node.children === 'undefined') { - var children = []; - for(var i in node.childNodes) - if(node.childNodes[i].tagName === 'DIV') - children.push(node.childNodes[i]); - return children; - } else - return node.children; + var children = []; + for(var i in node.childNodes) + if(node.childNodes[i].tagName === 'DIV') + children.push(node.childNodes[i]); + return children; } function getSnapinList() { @@ -346,6 +343,10 @@ function getSnapinTargetPos() { * misc sidebar stuff *************************************************/ +function debug(s) { + window.parent.frames[1].document.write(s+'<br />'); +} + function pageHeight() { var h;

13 years, 9 months

Check_MK Git: check_mk: Fixed reloading button animation in Chrome ( Changed request to async mode)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7394d401656bebecf1239f9b9a88d57224210513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7394d401656beb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 12:42:27 2010 +0100 Fixed reloading button animation in Chrome (Changed request to async mode) --- .bugs/10 | 11 ++++++++--- ChangeLog | 1 + web/htdocs/js/check_mk.js | 24 ++++++++++++++++-------- web/plugins/views/painters.py | 2 +- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.bugs/10 b/.bugs/10 index 3306b0b..a3023ff 100644 --- a/.bugs/10 +++ b/.bugs/10 @@ -1,10 +1,15 @@ Title: Multisite mit Chrome kompatible machen Component: multisite +State: done +Class: bug +Date: 2010-12-21 11:01:49 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-21 11:01:49 -Class: bug +Fun: 0 Bekannte Probleme: * reschedule Knopf wird nicht animiert + +2010-12-27 12:41:36: changed state open -> done +Animated gif images are stopped duing sync ajax requests in chrome. So the reloading image is not rotating. +Switched the request to async ajax request. diff --git a/ChangeLog b/ChangeLog index 130dc30..4abb610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ and services * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera * Sidebar: Fixed scroll position saving in Opera + * Fixed reloading button animation in Chrome (Changed request to async mode) Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index ee8528f..ded9a04 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -204,15 +204,12 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn // Everything else: // <undefined> - Unknown format. Simply echo. -function performAction(oLink, action, type, site, name1, name2) { - var oImg = oLink.childNodes[0]; - oImg.src = 'images/icon_reloading.gif'; - +function actionResponseHandler(oImg, code) { var validResponse = true; - var response = get_url_sync('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2); + var response = null; try { - response = eval(response); + response = eval(code); } catch(e) { validResponse = false; } @@ -231,7 +228,18 @@ function performAction(oLink, action, type, site, name1, name2) { oImg.title = 'Invalid response: ' + response; } - validResponse = null; - response = null; + response = null; + validResponse = null; + oImg = null; +} + +function performAction(oLink, action, type, site, name1, name2) { + var oImg = oLink.childNodes[0]; + oImg.src = 'images/icon_reloading.gif'; + + // Chrome is not animating the gif during sync ajax request + // So better use the async request here + get_url('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2, + actionResponseHandler, oImg); oImg = null; } diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e4c90a4..6031e20 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -259,7 +259,7 @@ def paint_icons(what, row): # what is "host" or "service" name2 = row['service_description'] output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="Reschedule an immediate check of this %s" ' \ - 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2, what) + 'src="images/icon_reload.gif" /></a>' % (what, row["site"], row["host_name"], name2, what) return "icons", output

13 years, 9 months

Check_MK Git: check_mk: Fixed up ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b46173eb7f23b4d6d94f8e325e9fb2e90500adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b46173eb7f23b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:25:49 2010 +0100 Fixed up ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838aecf..af97e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Please use display_options instead. * Finally removed deprecated filesystem_levels. Please use check_parameters instead. * Livestatus: The StatsGroupBy: header is still working but now deprecated. - Please simply use Columns: instead. If your query contains at least one Stats: + Please simply use Columns: instead. If your query contains at least one Stats:- header than Columns: has the meaning of the old StatsGroupBy: header Core, Setup, etc.:

13 years, 9 months

Check_MK Git: check_mk: Recopmile Windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 475b077c5b9359bd3885f6239e186e7ad446b353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=475b077c5b9359… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:23:05 2010 +0100 Recopmile Windows agent --- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e2681b1..4691058 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index cdc4516..dc96b21 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 9 months

Check_MK Git: check_mk: Fixed RPM/DEB packaging

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef9740e578698a7176f6b94c5593bc20004b20f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef9740e578698a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:19:46 2010 +0100 Fixed RPM/DEB packaging --- check_mk.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 4e3963e..72ef3de 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -124,6 +124,8 @@ rm -rf $RPM_BUILD_ROOT /etc/check_mk/conf.d/README %config(noreplace) /etc/nagios/objects/* /usr/bin/check_mk +/usr/bin/cmk +/usr/bin/mkp %dir /usr/share/check_mk /usr/share/check_mk/agents /usr/share/check_mk/checks

13 years, 9 months

Check_MK Git: check_mk: setup.sh: several cleanups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccca32fce1e9356f9e8118615c713859211e059c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccca32fce1e935… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:14:32 2010 +0100 setup.sh: several cleanups --- scripts/setup.sh | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 840867b..cd54855 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -164,17 +164,25 @@ ask_title () if [ -z "$YES" ] ; then cat <<EOF -[1;44;37m _ _ _ [0m -[1;44;37m ___| |__ ___ ___| | __ _ __ ___ | | __ [0m -[1;44;37m / __| '_ \ / _ \/ __| |/ / | '_ \` _ \| |/ / [0m -[1;44;37m | (__| | | | __/ (__| < | | | | | | < [0m -[1;44;37m \___|_| |_|\___|\___|_|\_\___|_| |_| |_|_|\_\ [0m -[1;44;37m |_____| [0m + + + + + + + + +[1;44;37m ____ _ _ __ __ _ __ [0m +[1;44;37m / ___| |__ ___ ___| | __ | \/ | |/ / [0m +[1;44;37m | | | '_ \ / _ \/ __| |/ / | |\/| | ' / [0m +[1;44;37m | |___| | | | __/ (__| < | | | | . \ [0m +[1;44;37m \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ [0m +[1;44;37m |_____| [0m [1;44;37m [0m -[1;45;37m check_mk setup $(printf "%32s" Version:' '$VERSION) [0m +[1;45;37m Check_MK setup $(printf "%32s" Version:' '$VERSION) [0m -Welcome to check_mk. This setup will install check_mk into user defined +Welcome to Check_MK. This setup will install Check_MK into user defined directories. If you run this script as root, installation paths below /usr will be suggested. If you run this script as non-root user paths in your home directory will be suggested. You may override the default @@ -234,17 +242,13 @@ ask_dir modulesdir /usr/share/$NAME/modules $HOMEBASEDIR/modules "check_mk modul also create a file 'defaults' in that directory that reflects all settings you are doing right now" -ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web "check_mk's web pages" \ - "Directory where Check_mk's web pages should be installed. Currently these -web pages allow you to search in all of Nagios services and send several -different commands to all found services. That directory should [4;1mnot[0m be +ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web "Check_MK Multisite GUI" \ + "Directory where Check_mk's Multisite GUI should be installed. Multisite is +an optional replacement for the Nagios GUI, but is also needed for the +logwatch extension. That directory should [4;1mnot[0m be in your WWW document root. A separate apache configuration file will be installed that maps the directory into your URL schema" -ask_dir mibsdir /usr/share/snmp/mibs $HOMEBASEDIR/mibs "SNMP mibs" \ - "Directory for SNMP MIB files (for copyright reasons we currently do -not ship any MIB files, though...)" - ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note, however, that most of check_mk's documentation is available only online at @@ -614,10 +618,6 @@ do tar xzf $SRCDIR/doc.tar.gz -C $DESTDIR$docdir && mkdir -p $DESTDIR$checkmandir && tar xzf $SRCDIR/checkman.tar.gz -C $DESTDIR$checkmandir && - if [ -e $SRCDIR/mibs.tar.gz ] ; then - mkdir -p $DESTDIR$mibsdir && - tar xzf $SRCDIR/mibs.tar.gz -C $DESTDIR$mibsdir - fi && mkdir -p $DESTDIR$agentsdir && tar xzf $SRCDIR/agents.tar.gz -C $DESTDIR$agentsdir && for agent in $DESTDIR/$agentsdir/check_mk_*agent.* $DESTDIR/$agentsdir/mk_logwatch ; do @@ -664,7 +664,7 @@ do rm -f $DESTDIR$bindir/check_mk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk && chmod 755 $DESTDIR$bindir/check_mk && - ln -s $DESTDIR$bindir/check_mk cmk && + ln -s check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg &&

13 years, 9 months

Check_MK Git: check_mk: install_nagios.sh: new option -m

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 624876025abc06e26582a796f1b0d74d80a91092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624876025abc06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:00:40 2010 +0100 install_nagios.sh: new option -m --- .bugs/85 | 45 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install_nagios.sh | 16 +++++++++++----- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.bugs/85 b/.bugs/85 new file mode 100644 index 0000000..fe689d4 --- /dev/null +++ b/.bugs/85 @@ -0,0 +1,45 @@ +Title: Modulare Agenten +Component: core +Benefit: 6 +State: open +Cost: 5 +Date: 2010-12-23 08:40:16 +Class: feature + +Die Checks sollen den Code für die Agenten selbst mitbringen. +Die Agenten werden dann auf Wunsch dynamisch zusammengebaut. + +Eine Idee ist z.B., dass jeder Check sich selbst einklassifiziert +in essential/extended/full. In essential sind nur die +absolut wichtigen Checks enthalten. So kann man dann einen +Agenten einer bestimmten Ausbaustufe bauen. + +Umsetzung: + +Erstmal die bestehenden Agenten auseinanderpflücken und in +die Checks einbauen. Das gleiche dann auch für den Windows-Agenten +machen. Gemeinsamer kann auch hier evtl. nach win.include geschoben +werden, aber nicht der generelle Rumpfteil. + +Dann muss man in Check_MK einen Befehl einbauen, um die Agenten +zu erzeugen: cmk -A. Hier gibt es viele denkbare Aufrufvarianten: + +* Angabe des Betriebssystems (windows, linux, aix, hpux, freebsd, solaris). +* Angabe der Wichtigkeit (essential, extended, full). +* beides kombiniert + +Die fertigen Agenten gehen dann nach var/check_mk/agents. Im Falle von +Unix sind es die Shellskripten. Im Falle von Windows ist es der Quellcode, +der natürlich erst noch übersetzt werden muss. + +Im Buildsystem muss ich jetzt darauf achten, dass bei einem 'make' +auch immer alle Agenten gebaut werden. + +Der nächste Schritt wäre dann die Möglichkeit, per main.mk spezifische +Agenten zu bauen, in dem man irgendwie angibt, welche Checks (genauer: +Sektionen) rein sollen. Beispiel: + +# Agent 'hirn' ist wie essential, aber ohne fs, aber mit ntp +agents["hirn"] = [ '@essential', '!fs', 'ntp' ] +agents["hirn2"] = [ '@hirn', '!df', 'depp' ] + diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index bdebe80..a55dcd3 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -54,12 +54,12 @@ exec > >(tee $LOGFILE) 2>&1 set -e -NAGIOS_VERSION=3.2.2 +NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 -RRDTOOL_VERSION=1.4.3 +RRDTOOL_VERSION=1.4.4 CHECK_MK_VERSION=1.1.9i3 PNP_VERSION=0.6.6 -NAGVIS_VERSION=1.5.1 +NAGVIS_VERSION=1.5.6 SOURCEFORGE_MIRROR=dfn NAGIOS_URL="http://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-$NAGIOS_V…" @@ -148,11 +148,16 @@ esac # Process command line options if [ $# -gt 0 ]; then - while getopts "s:y" options $OPTS; do + while getopts "s:ym" options $OPTS; do case $options in y) YES=1 ;; + m) + WITHOUT_MK=1 + NOTICE=" +Setting up without Check_MK!" + ;; s) SITE=$OPTARG ;; @@ -190,6 +195,7 @@ Check_MK on a freshly installed Linux system. It will: The output of this script is logged into $LOGFILE. No user interaction is neccesary. +$NOTICE EOF if [ -z "$YES" ]; then @@ -985,7 +991,7 @@ killall nagios || true /etc/init.d/nagios start activate_initd nagios || true -if [ "$CHECK_MK_VERSION" ] +if [ "$CHECK_MK_VERSION" -a -z "$WITHOUT_MK" ] then # ----------------------------------------------------------------------------- heading "Check_MK"

13 years, 9 months

Check_MK Git: check_mk: Livestatus: write timeperiod transitions to logfile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5245b99b018b592b30d8a4ff29b17fbd7c076596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5245b99b018b59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 16:27:08 2010 +0100 Livestatus: write timeperiod transitions to logfile --- .bugs/7 | 25 ++++++++++++++++++++++--- ChangeLog | 3 +++ livestatus/src/TimeperiodsCache.cc | 21 +++++++++++++++++++-- livestatus/src/TimeperiodsCache.h | 2 ++ livestatus/src/module.c | 26 ++++++++++++++------------ 5 files changed, 60 insertions(+), 17 deletions(-) diff --git a/.bugs/7 b/.bugs/7 index 030a6bf..8112cfd 100644 --- a/.bugs/7 +++ b/.bugs/7 @@ -1,10 +1,11 @@ Title: Timeperiod-Übergänge ins Nagios-Log schreiben Component: livestatus +State: done +Class: feature +Date: 2010-12-21 10:56:28 Benefit: 3 -State: open Cost: 1 -Date: 2010-12-21 10:56:28 -Class: feature +Fun: 0 Livestatus hält ja ohnehin einen Cache der Timeperiods. Immer wenn eine umschaltet, sollte ein Logeintrag gemacht werden. @@ -12,3 +13,21 @@ Auch initial beim Starten des Systems. Anhand dieser Einträge ist es später viel einfacher, die Verfügbarkeiten zu berechnen. Das sollte man recht bald programmieren, damit die Leute schon Gelegenheit haben, Daten zu sammeln. + +2010-12-22 16:13:20: changed state open -> done +Ist erledigt. Jetzt wird immer ein Eintrag +gemacht. Beim Starten von Nagios: + +[1293030598] TIMEPERIOD TRANSITION: 24X7;-1;1 +[1293030598] TIMEPERIOD TRANSITION: 24x7;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni10;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni11;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni9;-1;0 +[1293030598] TIMEPERIOD TRANSITION: none;-1;0 +[1293030598] TIMEPERIOD TRANSITION: workhours;-1;1 + +Später dann: + +[1293030660] TIMEPERIOD TRANSITION: hirni10;1;0 + +Doku von Livestatus is auch bereits aktualisiert. diff --git a/ChangeLog b/ChangeLog index 5715a30..838aecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,9 @@ * Allow more than one column for StatsGroupBy: * Do not use function is_contact_member_of_contactgroup anymore (get compatible with Nagios CVS) + * Livestatus: log timeperiod transitions (active <-> inactive) into Nagios + log file. This will enable us to create availability reports more simple + in future. 1.1.9i2: Checks & Agents: diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 089c277..ed94aba 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -57,14 +57,24 @@ void TimeperiodsCache::update(time_t now) } _cache_time = minutes; - _cache.clear(); // Loop over all timeperiods and compute if we are // currently in timeperiod *tp = timeperiod_list; while (tp) { bool is_in = 0 == check_time_against_period(now, tp); - _cache.insert(std::make_pair(tp, is_in)); + + // check previous state and log transition if state has changed + _cache_t::iterator it = _cache.find(tp); + if (it == _cache.end()) { // first entry + logTransition(tp->name, -1, is_in ? 1 : 0); + _cache.insert(std::make_pair(tp, is_in)); + } + else if (it->second != is_in) { + logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); + it->second = is_in; + } + tp = tp->next; } pthread_mutex_unlock(&_cache_lock); @@ -87,3 +97,10 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp) return is_in; } + +void TimeperiodsCache::logTransition(char *name, int from, int to) +{ + char buffer[64]; + snprintf(buffer, sizeof(buffer), "TIMEPERIOD TRANSITION: %s;%d;%d", name, from, to); + write_to_all_logs(buffer, LOG_INFO); +} diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h index e3d070e..5a3d2a4 100644 --- a/livestatus/src/TimeperiodsCache.h +++ b/livestatus/src/TimeperiodsCache.h @@ -40,6 +40,8 @@ public: ~TimeperiodsCache(); void update(time_t now); bool inTimeperiod(timeperiod *tp); +private: + void logTransition(char *name, int from, int to); }; #endif // _TimeperiodsCache_h diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 87449bc..46c2e81 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -386,54 +386,56 @@ int broker_event(int event_type, void *data) int broker_process(int event_type, void *data) { struct nebstruct_process_struct *ps = (struct nebstruct_process_struct *)data; - if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) + if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) { + update_timeperiods_cache(time(0)); start_threads(); + } } int verify_event_broker_options() { int errors = 0; - if(!(event_broker_options & BROKER_PROGRAM_STATE)) { + if (!(event_broker_options & BROKER_PROGRAM_STATE)) { logger( LG_CRIT, "need BROKER_PROGRAM_STATE (%i) event_broker_option enabled to work.", BROKER_PROGRAM_STATE ); errors++; } - if(!(event_broker_options & BROKER_TIMED_EVENTS)) { + if (!(event_broker_options & BROKER_TIMED_EVENTS)) { logger( LG_CRIT, "need BROKER_TIMED_EVENTS (%i) event_broker_option enabled to work.", BROKER_TIMED_EVENTS ); errors++; } - if(!(event_broker_options & BROKER_SERVICE_CHECKS)) { + if (!(event_broker_options & BROKER_SERVICE_CHECKS)) { logger( LG_CRIT, "need BROKER_SERVICE_CHECKS (%i) event_broker_option enabled to work.", BROKER_SERVICE_CHECKS ); errors++; } - if(!(event_broker_options & BROKER_HOST_CHECKS)) { + if (!(event_broker_options & BROKER_HOST_CHECKS)) { logger( LG_CRIT, "need BROKER_HOST_CHECKS (%i) event_broker_option enabled to work.", BROKER_HOST_CHECKS ); errors++; } - if(!(event_broker_options & BROKER_LOGGED_DATA)) { + if (!(event_broker_options & BROKER_LOGGED_DATA)) { logger( LG_CRIT, "need BROKER_LOGGED_DATA (%i) event_broker_option enabled to work.", BROKER_LOGGED_DATA ); errors++; } - if(!(event_broker_options & BROKER_COMMENT_DATA)) { + if (!(event_broker_options & BROKER_COMMENT_DATA)) { logger( LG_CRIT, "need BROKER_COMMENT_DATA (%i) event_broker_option enabled to work.", BROKER_COMMENT_DATA ); errors++; } - if(!(event_broker_options & BROKER_DOWNTIME_DATA)) { + if (!(event_broker_options & BROKER_DOWNTIME_DATA)) { logger( LG_CRIT, "need BROKER_DOWNTIME_DATA (%i) event_broker_option enabled to work.", BROKER_DOWNTIME_DATA ); errors++; } - if(!(event_broker_options & BROKER_STATUS_DATA)) { + if (!(event_broker_options & BROKER_STATUS_DATA)) { logger( LG_CRIT, "need BROKER_STATUS_DATA (%i) event_broker_option enabled to work.", BROKER_STATUS_DATA ); errors++; } - if(!(event_broker_options & BROKER_ADAPTIVE_DATA)) { + if (!(event_broker_options & BROKER_ADAPTIVE_DATA)) { logger( LG_CRIT, "need BROKER_ADAPTIVE_DATA (%i) event_broker_option enabled to work.", BROKER_ADAPTIVE_DATA ); errors++; } - if(!(event_broker_options & BROKER_EXTERNALCOMMAND_DATA)) { + if (!(event_broker_options & BROKER_EXTERNALCOMMAND_DATA)) { logger( LG_CRIT, "need BROKER_EXTERNALCOMMAND_DATA (%i) event_broker_option enabled to work.", BROKER_EXTERNALCOMMAND_DATA ); errors++; } - if(!(event_broker_options & BROKER_STATECHANGE_DATA)) { + if (!(event_broker_options & BROKER_STATECHANGE_DATA)) { logger( LG_CRIT, "need BROKER_STATECHANGE_DATA (%i) event_broker_option enabled to work.", BROKER_STATECHANGE_DATA ); errors++; }

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010