Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: Improved handling of multisite authentication in check_bi_local script

by Lars Michelsen

Module: check_mk Branch: master Commit: f0c43ff5713b47dc6f4c375c0a1000cfa38aaf71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0c43ff5713b47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 14:46:40 2013 +0200 Improved handling of multisite authentication in check_bi_local script --- doc/treasures/check_bi_local.py | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py index 1081008..cd60af7 100755 --- a/doc/treasures/check_bi_local.py +++ b/doc/treasures/check_bi_local.py @@ -24,46 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example for creating real Nagios checks from BI aggregations. +# Example for creating real Nagios checks from BI aggregations. # Installation: # 1. Put this file in /usr/lib/check_mk_agent/local # 2. Make the file executable # 3. Add a correct url_prefix (OMD site and slash) -# user and password with read access to Multisite. +# user and password with read access to Multisite. -url_prefix = "" # non-OMD installations +url_prefix = "event/" # non-OMD installations # url_prefix = "mysite/" # with OMD site name -# HTTP Basic Auth +# Authentication credentials user = "omdadmin" password = "omd" -cookie = None - -# Alternatively: Multisite Cookie authentication: -# If you are using Cookie base authentication, then -# login with your browser and get the cookie content -# of auth_... from your browser settings and put -# it here: -# cookie = "omdadmin:1329218457.69:16b1d572fe059e00a89b7f24592733f2" - # Do not change anything below import os, sys -if cookie: - logininfo = "" - opts = "-b 'auth_=%s'" % cookie -else: - logininfo = "%s:%s@" % (user, password) - opts = "" - -url = 'http://%slocalhost/%scheck_mk/view.py?view_name=aggr_summary&output_format=python' % \ - (logininfo, url_prefix) +url = 'http://localhost/%scheck_mk/login.py?_login=1&_username=%s&_password=%s' \ + '&_origtarget=view.py%%3Fview_name=aggr_summary%%26output_format=python' % \ + (url_prefix, user, password) try: - command = "curl --noproxy localhost --silent %s '%s'" % (opts, url) + command = "curl -u \"%s:%s\" -b /dev/null -L --noproxy localhost --silent '%s'" % \ + (user, password, url) output = os.popen(command).read() data = eval(output) except:

11 years, 1 month

Check_MK Git: check_mk: Fixed handling of default ldap sync plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 84cb4cb86f5c2c56fb2fa06ed6c1001ffccb9be0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cb4cb86f5c2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 13:14:18 2013 +0200 Fixed handling of default ldap sync plugins --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 35dba4f..d5e3532 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -707,6 +707,7 @@ register_configvar(group, 'user accounts for gathering their attributes. The user options which get imported ' 'into Check_MK from LDAP will be locked in WATO.'), elements = userdb.ldap_attribute_plugins_elements, + default_keys = ['email', 'alias', 'auth_expire' ], ), domain = "multisite", in_global_settings = False,

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1034, #1035, #1036, #1037, #1038

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: beb8d0f1ba4675f739a81eaad7e542c21bf9ccc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beb8d0f1ba4675… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Aug 27 12:14:48 2013 +0200 Updated bug entries #1034, #1035, #1036, #1037, #1038 --- .bugs/1034 | 58 ++++++++++++++++++++++++++++++++++++++++++++ .bugs/1035 | 57 +++++++++++++++++++++++++++++++++++++++++++ .bugs/1036 | 37 ++++++++++++++++++++++++++++ .bugs/1037 | 29 ++++++++++++++++++++++ .bugs/1038 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 260 insertions(+) diff --git a/.bugs/1034 b/.bugs/1034 new file mode 100644 index 0000000..7e0c95d --- /dev/null +++ b/.bugs/1034 @@ -0,0 +1,58 @@ +Title: modify check_mk_agent.linux - heartbeat_crm test for clusters with pacemaker since 1.1.9 +Component: core +State: open +Date: 2013-08-27 10:22:15 +Targetversion: 1.2.3 +Class: todo + +came in via feedback@ // original mail still available at feedback/gitbug folder + + +From: Stefan Botter <jsj(a)jsj.dyndns.org> +To: feedback(a)check-mk.org +Subject: [PATCH] - modify check_mk_agent.linux - heartbeat_crm test for clusters with pacemaker since 1.1.9 +Date: Tue, 28 May 2013 09:45:22 +0200 + + +From 13d33c76eb02b87e6f816a67dba393b586e9d4bf Mon Sep 17 00:00:00 2001 +From: Stefan Botter <jsj(a)jsj.dyndns.org> +Date: Tue, 28 May 2013 09:38:06 +0200 +Subject: [PATCH 1/1] change heartbeat_crm: since pacemaker 1.1.9 there +are no + /var/run files, also use crm status instead of crm_mon + + +Signed-off-by: Stefan Botter <jsj(a)jsj.dyndns.org> +--- + agents/check_mk_agent.linux | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux +index 335ba79..118fa41 100755 +--- a/agents/check_mk_agent.linux ++++ b/agents/check_mk_agent.linux +@@ -371,9 +371,18 @@ fi + # Heartbeat monitoring + # Different handling for heartbeat clusters with and without CRM + # for the resource state ++# pacemaker since 1.1.9 has no /var/run files, ugly detect FTB ++newPM=0 ++for n in /dev/shm/qb-cib_rw-response-*-data; do if [ -f $n ]; then +newPM=1; break; fi; done + if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then + echo '<<<heartbeat_crm>>>' + crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ +s/^\s//; s/^\s/_/g' ++elif [ $newPM != 0 ]; then ++ echo '<<<heartbeat_crm>>>' ++ # pacemaker since 1.1.9 ++ # additionally, in that case use crm status, as crm_mon segfaults ++ # also add line for identification of resources in agent output, +which is missing from crm status ++ crm status | sed -e '/^Online:/{:a;n;/^$/!ba;i\Full list of +resources:' -e '}' | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ +s/^\s//; s/^\s/_/g' + fi + if type cl_status > /dev/null 2>&1; then + echo '<<<heartbeat_rscstatus>>>' +-- 1.7.10.4 diff --git a/.bugs/1035 b/.bugs/1035 new file mode 100644 index 0000000..765fe9b --- /dev/null +++ b/.bugs/1035 @@ -0,0 +1,57 @@ +Title: make nfsexports plugin work with rpcbind too +Component: checks +State: open +Date: 2013-08-27 10:31:53 +Targetversion: 1.2.3 +Class: nastiness + +came in via checkmk-en@ // mail still avialable at feedback/gitbug folder + + +Date: Mon, 03 Jun 2013 19:25:04 +0200 +From: morlix <morlix(a)morlix.de> +To: checkmk-en(a)lists.mathias-kettner.de +Subject: [Check_mk (english)] [PATCH] FIX nfsexports plugin: enhance daemon + process detection + +Hello, + +today i added the nfsexports plugin to my check_mk_agent and wondered +why it doesn't find any exports. + +After looking into the script i knew the problem. +The script just looks for portmap but one some systems this daemons has +the name rpcbind. + +So i created this patch to check for both variants. + +Kind regards, + +morlix + + +0001-FIX-nfsexports-plugin-enhance-daemon-process-detecti.patch + +From d917306e23396baf7ae4f7bfc94c95a1d3fc2c15 Mon Sep 17 00:00:00 2001 +From: morlix <morlix(a)morlix.de> +Date: Mon, 3 Jun 2013 19:19:53 +0200 +Subject: [PATCH] FIX: nfsexports plugin: enhance daemon process detection + +--- + agents/plugins/nfsexports | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/plugins/nfsexports b/agents/plugins/nfsexports +index 185de07..d5ca96d 100755 +--- a/agents/plugins/nfsexports ++++ b/agents/plugins/nfsexports +@@ -7,7 +7,7 @@ + if [ -r /etc/exports ]; then + EXPORTS=$(grep -v -e ^# -e ^$ /etc/exports) + fi +-pgrep portmap 1>/dev/null && pgrep rpc.mountd 1>/dev/null && DAEMONS="ok" ++pgrep '(portmap|rpcbind)' 1>/dev/null && pgrep rpc.mountd 1>/dev/null && DAEMONS="ok" + + # any exports or have running daemons? then look for registered exports + if [[ $EXPORTS ]]; then +-- 1.8.1.2 diff --git a/.bugs/1036 b/.bugs/1036 new file mode 100644 index 0000000..43329c7 --- /dev/null +++ b/.bugs/1036 @@ -0,0 +1,37 @@ +Title: df_check_filesystem_single returns a 2-tuple when check_esx_vsphere_datastores expects 3 +Component: checks +State: open +Date: 2013-08-27 10:50:42 +Targetversion: 1.2.3 +Class: bug + +came in via feedback@ // mail is still available at feedback/gitbug folder + + +From: Clynt Heikes <cheikes(a)peak6.com> +To: "'feedback(a)check-mk.org'" <feedback(a)check-mk.org> +Subject: [Bug]:df_check_filesystem_single returns a 2-tuple when + check_esx_vsphere_datastores expects 3 + + +def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, params): + + if size_mb == 0: + + return (1, "size of filesystem is 0 MB") + + + + + +def check_esx_vsphere_datastores(item, params, info): + +… + +… + +… + + state, infotext, perfdata = df_check_filesystem_single( + + g_hostname, item, size_mb, avail_mb, params) diff --git a/.bugs/1037 b/.bugs/1037 new file mode 100644 index 0000000..1061495 --- /dev/null +++ b/.bugs/1037 @@ -0,0 +1,29 @@ +Title: check_mk_agent.exe unable to restart after a crash: logstate.txt 0 bytes +Component: checks +State: open +Date: 2013-08-27 10:58:29 +Targetversion: 1.2.3 +Class: bug + +came in via feedback@ // original mail still available in feedback/gitbug folder + + +Date: Fri, 07 Jun 2013 08:56:13 -0400 +From: "Peter Rogers" <peterrogers(a)email.com> +Message-ID: <20130607125613.34790(a)gmx.com> +MIME-Version: 1.0 +Subject: check_mk_agent.exe unable to restart after a crash +To: feedback(a)check-mk.org + + +Host = Windows 7 +CMK Agent = Agent version 1.2.2p1 + +I have found a problem where the check_mk_agent.exe is unable to restart after a crash because the logstate.txt file becomes currupt. + +Attached is an example currupt logstate.txt file. + +To work around the problem I remove the logstate.txt and then start the check_mk_agent.exe successfully. + + +hint by bs: the attached logstate.txt is 0 bytes diff --git a/.bugs/1038 b/.bugs/1038 new file mode 100644 index 0000000..99e9d80 --- /dev/null +++ b/.bugs/1038 @@ -0,0 +1,79 @@ +Title: problem with mrpe if lable has white space characters +Component: checks +State: open +Date: 2013-08-27 12:12:33 +Targetversion: 1.2.3 +Class: bug + +came in via feedback@ // original mail still available in feedback/gitbug folder + + +Date: Wed, 26 Jun 2013 15:03:06 +0200 +Message-ID: <CACA1nGEzOmECJufVGOgUqZm6tAxGH+vHoXoEh7SGbx7uw+3ZwQ(a)mail.gmail.com> +Subject: Fwd: [BUG]: MRPE Checks mit Performance Daten bringen Fehler +From: =?ISO-8859-1?Q?Andreas_D=F6hler?= <andreas.doehler(a)gmail.com> +To: Check MK Feedback <feedback(a)check-mk.org> + + + +Hallo zusammen, + +habe heute eine seltsame Sache mit einigen MRPE Checks gehabt. +Falls die Checks Performance Daten liefern und das Label der Performance Daten Leerzeichen enthält so wir der Check mit einer Exception abgebrochen. + +Traceback (most recent call last): + File "/usr/share/check_mk/modules/check_mk.py", line 5442, in <module> + do_check(hostname, ipaddress, check_types) + File "/usr/share/check_mk/modules/check_mk_base.py", line 888, in do_check + agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress, only_check_types) + File "/usr/share/check_mk/modules/check_mk_base.py", line 1197, in do_all_checks_on_host + result = check_function(item, params, info) + File "/usr/share/check_mk/checks/mrpe", line 89, in check_mrpe + perf_parsed = map(mrpe_parse_perfdata, perfdata) + File "/usr/share/check_mk/checks/mrpe", line 41, in mrpe_parse_perfdata + varname, valuetxt = perfinfo.split("=", 1) +ValueError: need more than 1 value to unpack + +Bei genauerer Untersuchung hab ich festgestellt das dieses Verhalten seit dem Umbau des MRPE am 22.05. (Commit 7705017d0d5db5093d9bdaa1538eecac56832dfe) auftritt. +Das Problem besteht aus zwei Punkten. +Einmal diese Zeile +perfdata = parts[1].strip().split() +Hierbei werden nicht nur vorn und hinten die Leerzeichen abgeschnitten sondern auch der String vom Performancedaten Label zerschnitten. +Beispiel: +'Cluster Groups on This Node'=0;0;0 Perfdaten noch ok +["'Cluster", 'Groups', 'on', 'This', "Node'=0;0;0"] nach der "Behandlung" + +Der zweite Punkt tritt dann auf wenn ich den String hier im ganzen lasse. +'Cluster Groups on This Node'=0;0;0 +und es nur einen Perfomance Daten Wert gibt dann wird perfdata nicht zur Liste und bringt einen Fehler dann beim Aufruf der map Funktion in Zeile 90 +Deshalb hab ich extra noch vor der ersten perfdata Zuweisung in Zeile 70 eine Zeile eingefügt mit perfdata = [] und Zeile 70 auf perfdata += parts[1].strip() geändert. +Danach funktionieren wieder alle meine MRPE Checks mit Performance Daten ohne Fehler. + +Einen MRPE Check mit mehreren Werten hatte ich leider nicht an der Hand zum testen. +Damit ist der Abschnitt ab # Further lines noch offen ob das alles so klappt. :) + +Gruß +Andreas + + + +mrpe.diff + +--- a/mrpe 2013-06-26 10:05:15.000000000 +0200 ++++ b/mrpe 2013-06-26 14:59:54.000000000 +0200 +@@ -57,6 +57,7 @@ + line = line[1:] + else: + check_name = None ++ perfdata = [] + if line[0] == item: + state = int(line[1]) + # convert to original format by joining and replacing \1 back with \n +@@ -67,7 +68,7 @@ + parts = lines[0].split("|", 1) + output = [parts[0].strip()] + if len(parts) > 1: +- perfdata = parts[1].strip().split() ++ perfdata.append(parts[1].strip()) + else: + perfdata = []

11 years, 1 month

Check_MK Git: check_mk: Reserved 10 bug IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1642748c1873f0dc337ec5de51a92c4ab57e9614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1642748c1873f0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Aug 27 10:18:54 2013 +0200 Reserved 10 bug IDS --- .bugs/1032 | 29 +++++++++++++++++++++++++++++ .bugs/1033 | 9 +++++++++ .bugs/first_free | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.bugs/1032 b/.bugs/1032 new file mode 100644 index 0000000..0b0ba68 --- /dev/null +++ b/.bugs/1032 @@ -0,0 +1,29 @@ +Title: f5_bigip_psu: inventory finds only one psu +Component: checks +State: open +Date: 2013-08-27 09:18:20 +Targetversion: 1.2.3 +Class: bug + +came in by mail to mk@ // original email still available at feedback/gitbug folder + + +Date: Mon, 27 May 2013 15:51:12 +0200 +Message-ID: <CALhzvFj+4jk3t0YmkRGFNfLcLKuSo_r1+OOtLvS-hWESX95Nzw(a)mail.gmail.com> +Subject: Re: Bugs in f5_bigip checks, proposed patch included +From: miro ramza <miroramza(a)gmail.com> +To: Mathias Kettner <mk(a)mathias-kettner.de> + + +Hi Mathias, + +it was pretty long time, and during this time I found one more necessary change to f5_bigip_psu check. + +50c50 +< inventory.append((psu, None)) +--- +> inventory.append((("%s" % psu), None)) + +tested on BIG-IP 11.3.0 HF5 SW/ BIG-IP 3900HW. + +Miro diff --git a/.bugs/1033 b/.bugs/1033 new file mode 100644 index 0000000..a8f340b --- /dev/null +++ b/.bugs/1033 @@ -0,0 +1,9 @@ +Title: package dependency ethtool is missing for agent +Component: core +State: open +Date: 2013-08-27 10:14:07 +Targetversion: 1.2.3 +Class: nastiness + +check_mk agent benoetigt ethtool, damit lnx_if check funktioniert +sollte ethtool in den rpm/deb-Packages als Requires aufgenommen werden? diff --git a/.bugs/first_free b/.bugs/first_free index 4fba33e..0eb5aea 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1037 +1047

11 years, 1 month

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 42c04c51160d398999ada3c9920b5f3623e3f7ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c04c51160d39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 10:14:02 2013 +0200 Updated changelog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 84cf24e..88a058e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,9 @@ * notify.py: Matching service level: Use the hosts service level if a service has no service level set * notify.py: fixed bug with local notification spooling + * HTML notifications: Now adding optional links to host- and service names + when second argument notification script is configured to the base url of the + monitoring installation (e.g. http://<host>/<site>/ in case of OMD setups) Multisite: * User accounts can now be locked after a specified amount of auth

11 years, 1 month

Check_MK Git: check_mk: Host-/ Service-URLs in notificatios always link to the complete frameset now

by Lars Michelsen

Module: check_mk Branch: master Commit: de633c4dc8ab6e692aac062f570988512ccd6eb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de633c4dc8ab6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 10:06:52 2013 +0200 Host-/Service-URLs in notificatios always link to the complete frameset now --- modules/notify.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 944baa0..ab788a3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -485,10 +485,12 @@ def notify_notify(context): elif notify_mode == 'fake-host': set_fake_env('host', context) - context['HOSTURL'] = '/check_mk/view.py?view_name=hoststatus&host=%s' % urlencode(context['HOSTNAME']) + context['HOSTURL'] = '/check_mk/index.py?start_url=%s' % \ + urlencode('view.py?view_name=hoststatus&host=%s' % context['HOSTNAME']) if context['WHAT'] == 'SERVICE': - context['SERVICEURL'] = '/check_mk/view.py?view_name=service&host=%s&service=%s' % \ - (urlencode(context['HOSTNAME']), urlencode(context['SERVICEDESC'])) + context['SERVICEURL'] = '/check_mk/index.py?start_url=%s' % \ + urlencode('view.py?view_name=service&host=%s&service=%s' % + (context['HOSTNAME'], context['SERVICEDESC'])) if notify_mode in [ 'fake-service', 'fake-host' ]: sys.exit(call_notification_script(plugin, [], context, True))

11 years, 1 month

Check_MK Git: check_mk: HTML mails: Support now argument 2 to be the url to the site to construct urls for mails

by Lars Michelsen

Module: check_mk Branch: master Commit: fc696ae0d99e11eb2b89e7998adbfc0b0f0dc18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc696ae0d99e11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 09:55:44 2013 +0200 HTML mails: Support now argument 2 to be the url to the site to construct urls for mails --- notifications/mail | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/notifications/mail b/notifications/mail index 5a42692..01bbf08 100755 --- a/notifications/mail +++ b/notifications/mail @@ -2,6 +2,11 @@ # HTML Emails with included Graphs # This script creates a very beautiful mail in multipart format with # attached graphs and such neat stuff. Sweet! +# +# Argument 1: Full system path to the pnp4nagios index.php for fetching +# the graphs. Usually auto configured in OMD. +# Argument 2: HTTP-URL-Prefix to open multisite. When provided, several +# links are added to the mail. import os, re, sys, subprocess from email.mime.multipart import MIMEMultipart @@ -169,7 +174,7 @@ tmpl_host_subject = 'Check_MK: $HOSTNAME$ - $NOTIFICATIONTYPE$' tmpl_host_txt = ''' Host: $HOSTNAME$ ($HOSTALIAS$) Address: $HOSTADDRESS$ - +$HOSTLINK$ State: $LASTHOSTSTATE$ -> $HOSTSTATE$ ($NOTIFICATIONTYPE$) Output: $HOSTOUTPUT$ Perfdata: $HOSTPERFDATA$ @@ -183,7 +188,7 @@ tmpl_host_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>Name</td> - <td>$HOSTNAME$ ($HOSTALIAS$)</td> + <td>$LINKEDHOSTNAME$ ($HOSTALIAS$)</td> </tr> <tr class="data even0"> <td class=left>Address</td> @@ -211,9 +216,9 @@ tmpl_service_subject = 'Check_MK: $HOSTNAME$/$SERVICEDESC$ $NOTIFICATIONTYPE$' tmpl_service_txt = ''' Host: $HOSTNAME$ ($HOSTALIAS$) -Address: $HOSTADDRESS$ +Address: $HOSTADDRESS$$HOSTLINK$ -Service: $SERVICEDESC$ +Service: $SERVICEDESC$$SERVICELINK$ State: $LASTSERVICESTATE$ -> $SERVICESTATE$ ($NOTIFICATIONTYPE$) Output: $SERVICEOUTPUT$ Perfdata: $SERVICEPERFDATA$ @@ -227,7 +232,7 @@ tmpl_service_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>Hostname</td> - <td>$HOSTNAME$ ($HOSTALIAS$)</td> + <td>$LINKEDHOSTNAME$ ($HOSTALIAS$)</td> </tr> <tr class="data even0"> <td class=left>Address</td> @@ -235,7 +240,7 @@ tmpl_service_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>Service description</td> - <td>$SERVICEDESC$</td> + <td>$LINKEDSERVICEDESC$</td> </tr> <tr> <th colspan=2>State</th> @@ -352,6 +357,8 @@ def main(): in os.environ.items() if var.startswith("NOTIFY_")]) + print repr(context) + # Fetch graphs for this object. It first tries to detect how many sources # are available for this object. Then it loops through all sources and # fetches retrieves the images. If a problem occurs, it is printed to @@ -362,6 +369,25 @@ def main(): sys.stderr.write('Unable to fetch graph infos: %s\n' % e) num_sources = 0 + # If argument 2 is given, we know the base url to the installation and can add + # links to hosts and services. ubercomfortable! + if context.get('PARAMETER_2'): + base_url = context['PARAMETER_2'].rstrip('/') + host_url = base_url + context['HOSTURL'] + + context['LINKEDHOSTNAME'] = '<a href="%s">%s</a>' % (host_url, context['HOSTNAME']) + context['HOSTLINK'] = '\nLink: %s' % host_url + + if context['WHAT'] == 'SERVICE': + service_url = base_url + context['SERVICEURL'] + context['LINKEDSERVICEDESC'] = '<a href="%s">%s</a>' % (service_url, context['SERVICEDESC']) + context['SERVICELINK'] = '\nLink: %s' % service_url + else: + context['LINKEDHOSTNAME'] = context['HOSTNAME'] + context['LINKEDSERVICEDESC'] = context['SERVICEDESC'] + context['HOSTLINK'] = '' + context['SERVICELINK'] = '' + attachments = [] graph_code = '' for source in range(0, num_sources):

11 years, 1 month

Check_MK Git: check_mk: HTML notifications: minor layout improvements

by Lars Michelsen

Module: check_mk Branch: master Commit: af6e8666589641915d5f1d49987fe1e7528448e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af6e8666589641… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 08:59:54 2013 +0200 HTML notifications: minor layout improvements --- notifications/.f12 | 6 +++--- notifications/mail | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/notifications/.f12 b/notifications/.f12 index b46875f..a53fe50 100644 --- a/notifications/.f12 +++ b/notifications/.f12 @@ -1,3 +1,3 @@ -sudo mkdir -p /omd/versions/default/share/check_mk/notifications -sudo cp -p * /omd/versions/default/share/check_mk/notifications - +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo mkdir -p /omd/sites/$SITE/share/check_mk/notifications +sudo cp -vp * /omd/sites/$SITE/share/check_mk/notifications diff --git a/notifications/mail b/notifications/mail index a96f434..5a42692 100755 --- a/notifications/mail +++ b/notifications/mail @@ -111,11 +111,10 @@ tr.even3 { background-color: #ffefaf; } td.state { text-align: center; font-weight: bold; - width: 32px; } /* OK/UP */ -.state0, .hstate0, .state0 a, .hstate0 a { +.state0, .stateOK, .hstate0, .hstateUP, .state0 a, .hstate0 a { background-color: #0b3; color: #fff; } @@ -123,27 +122,27 @@ td.state { white-space: nowrap; } /* WARN */ -.state1, .state1 a, tr.groupheader td.state1 { +.state1, .stateWARNING, .state1 a, tr.groupheader td.state1 { background-color: #ff0; color: #000; } /* CRIT/DOWN */ -.state2, .hstate1, .state2 a, .hstate2 a { +.state2, .stateCRITICAL, .hstate1, .hstateDOWN, .state2 a, .hstate2 a { background-color: #f00; color: #fff; } /* UNKNOWN / UNREACH */ -.state3, .hstate2, .state3 a, .hstate2 a { +.state3, .stateUNKNOWN, .hstate2, .hstateUNREACHABLE, .state3 a, .hstate2 a { background-color: #f80; color: #fff; } /* PENDING */ -.statep, .hstatep, .statep a, .hstatep a { +.statep, .statePENDING, .hstatep, .hstatePENDING, .statep a, .hstatep a { background-color: #888; color: #fff; } /* in DOWNTIME */ -.stated, .hstated, .stated a, .hstated a { +.stated, .stateDOWNTIME, .hstated, .hstateDOWNTIME, .stated a, .hstated a { background-color: #0af; color: #fff; } @@ -195,7 +194,7 @@ tmpl_host_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>State</td> - <td class="state hstate hstate$HOSTSTATEID$">$LASTHOSTSTATE$ -> $HOSTSTATE$ ($NOTIFICATIONTYPE$)</td> + <td class="state hstate">$LASTHOSTSTATE$>/span> → $HOSTSTATE$ ($NOTIFICATIONTYPE$)</td> </tr> <tr class="data even0"> <td class="left">Output</td> @@ -243,7 +242,7 @@ tmpl_service_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>State</td> - <td class="state svcstate state$SERVICESTATEID$">$LASTSERVICESTATE$ -> $SERVICESTATE$ ($NOTIFICATIONTYPE$)</td> + <td class="state svcstate">$LASTSERVICESTATE$ → $SERVICESTATE$ ($NOTIFICATIONTYPE$)</td> </tr> <tr class="data even0"> <td class="left">Output</td>

11 years, 1 month

Check_MK Git: check_mk: Added time information to notify crash log

by Lars Michelsen

Module: check_mk Branch: master Commit: fa3e6769b9ce882f14bf4d4820fbf551d1d00500 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa3e6769b9ce88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 27 08:59:02 2013 +0200 Added time information to notify crash log --- modules/notify.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 4f5a12e..8cb81ee 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -319,7 +319,8 @@ def do_notify(args): crash_dir = var_dir + "/notify" if not os.path.exists(crash_dir): os.makedirs(crash_dir) - file(crash_dir + "/crash.log", "a").write("CRASH:\n%s\n\n" % format_exception()) + file(crash_dir + "/crash.log", "a").write("CRASH (%s):\n%s\n" % + (time.strftime("%Y-%m-%d %H:%M:%S"), format_exception())) def notify_data_available():

11 years, 1 month

Check_MK Git: check_mk: Added deprecated dir in agent/windows/plugins

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8f39596b63e7637d470561876bffe03814cbfbc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f39596b63e763… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 26 19:03:56 2013 +0200 Added deprecated dir in agent/windows/plugins --- agents/windows/plugins/{ => deprecated}/windows_time.bat | 0 agents/windows/plugins/{ => deprecated}/wmicchecks.bat | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/windows_time.bat b/agents/windows/plugins/deprecated/windows_time.bat similarity index 100% rename from agents/windows/plugins/windows_time.bat rename to agents/windows/plugins/deprecated/windows_time.bat diff --git a/agents/windows/plugins/wmicchecks.bat b/agents/windows/plugins/deprecated/wmicchecks.bat similarity index 100% rename from agents/windows/plugins/wmicchecks.bat rename to agents/windows/plugins/deprecated/wmicchecks.bat

11 years, 1 month

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013