Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64661 discussions

Check_MK Git: check_mk: #1477 New screenshot mode for Multisite

by Mathias Kettner

Module: check_mk Branch: master Commit: 3dd5245d3096018f0b4d139fc6277a66a59d71c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dd5245d309601… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 07:17:59 2014 +0100 #1477 New screenshot mode for Multisite If you add <tt>screenshotmode = True</tt> to your <tt>multisite.mk</tt> or add a <tt>?screenshotmode=1</tt> to your URL, then Multisite will replace the fancy blue background by a plain white. This makes it easier to screenshot parts of the GUI like configuration boxes, sidebar snapins, etc. --- .werks/1477 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 8 +++++++- web/htdocs/index.py | 4 ++++ web/htdocs/login.css | 5 ++++- web/htdocs/pages.css | 8 ++++++++ web/plugins/config/builtin.py | 1 + 7 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.werks/1477 b/.werks/1477 new file mode 100644 index 0000000..cb6a212 --- /dev/null +++ b/.werks/1477 @@ -0,0 +1,11 @@ +Title: New screenshot mode for Multisite +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1414477007 +Class: feature + +If you add <tt>screenshotmode = True</tt> to your <tt>multisite.mk</tt> or add a <tt>?screenshotmode=1</tt> +to your URL, then Multisite will replace the fancy blue background by a plain white. This makes it easier +to screenshot parts of the GUI like configuration boxes, sidebar snapins, etc. diff --git a/ChangeLog b/ChangeLog index af93fea..36fc182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1411 New builting views for the history of scheduled downtimes * 1185 mobile ui: Added a new view to see events from the Event Console * 1412 Speed up of displaying and sorting after WATO folder path + * 1477 New screenshot mode for Multisite... * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e24a5f4..53820a2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -71,6 +71,7 @@ class html: self.keybindings_enabled = True self.io_error = False self.enable_debug = False + self.screenshotmode = True self.help_visible = False self.treestates = {} self.treestates_for_id = None @@ -750,7 +751,12 @@ class html: if self.output_format == "html": if not self.header_sent: self.html_head(title, **args) - self.write('<body class="main %s">' % self.var("_body_class", "")) + body_classes = [ "main" ] + if self.var("_body_class"): + body_classes.append(self.var("_body_class")) + if self.screenshotmode: + body_classes.append("screenshotmode") + self.write('<body class="%s">' % " ".join(body_classes)) self.header_sent = True if self.render_headfoot: self.top_heading(title) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b43ddb6..22e982a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -106,6 +106,10 @@ def handler(req, fields = None, profiling = True): config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True + + if html.var("screenshotmode") or config.screenshotmode: # Omit fancy background, make it white + html.screenshotmode = True + html.enable_debug = config.debug html.set_buffering(config.buffered_http_stream) diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 78c77f3..6b499ed 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -43,7 +43,6 @@ body.main { vertical-align: middle; } - div#login { background-image: url("images/login_spotlight.png"); background-repeat: no-repeat; @@ -56,6 +55,10 @@ div#login { /* border: 1px solid yellow; */ } +body.main.screenshotmode div#login { + background-image: url(""); +} + img#login_window { width: 370px; height: 230px; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index d395b96..5590450 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -70,6 +70,14 @@ body.main { background-color: #426D8A; } +/* Special mode for creating screenshots of single elements. Omit background. + This can be selected in multisite.mk with screenshotmode = True or screenshotmode=1 + on the URL */ +body.main.screenshotmode { + background-image: url(""); + background-color: white; +} + body.main div.main { padding-left: 10px; border-left: 1px solid red; diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8c82e27..6e98986 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -34,6 +34,7 @@ roles = {} # User supplied roles # define default values for all settings debug = False +screenshotmode = False profile = False users = [] admin_users = []

9 years, 11 months

Check_MK Git: check_mk: Reserved 5 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 20850093bc2882ad2f3a7a3c89f5567b5f2dc6ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20850093bc2882… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 07:16:38 2014 +0100 Reserved 5 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3ffc420..3d9eda7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1477 +1482

9 years, 11 months

Check_MK Git: check_mk: reformatted werk 1422

by Andreas Boesl

Module: check_mk Branch: master Commit: afa862395285c9c206279fefca3e9c482cfcc7fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa862395285c9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 27 16:38:01 2014 +0100 reformatted werk 1422 --- .werks/1422 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.werks/1422 b/.werks/1422 index 8c4bd3d..f20ef0b 100644 --- a/.werks/1422 +++ b/.werks/1422 @@ -6,13 +6,13 @@ Version: 1.2.5i6 Date: 1413821252 Class: feature -Previously the virtual machines and hosts power states were always assigned to the queried vCenter or host system. -You can now configure via WATO rule <tt>Check state of VMWare ESX via vSphere</tt> that this information is piggybacked -'down' to the esx hosts or the virtual machines. - -With this new feature a virtual machine may also have the following informations -<tt>ESX Hostsystem OK - Running on esx.mathias-kettner.de</tt> -<tt>VM LinuxIII OK - power state: poweredOn, running on [esx.mathias-kettner.de]</tt> - +Previously the virtual machines and hosts power states were always assigned to the queried vCenter or host system. +You can now configure via WATO rule Check state of VMWare ESX via vSphere that this information is piggybacked +'down' to the esx hosts or the virtual machines. +With this new feature a virtual machine may also have the following informations +C+: +ESX Hostsystem OK - Running on esx.mathias-kettner.de +VM LinuxIII OK - power state: poweredOn, running on [esx.mathias-kettner.de] +C-:

9 years, 11 months

Check_MK Git: check_mk: Updated formatting of Werk #1425, yet again

by Mathias Kettner

Module: check_mk Branch: master Commit: ee4ef64da49b697d767bae8a47b490be52a373c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4ef64da49b69… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 16:10:46 2014 +0100 Updated formatting of Werk #1425, yet again --- .werks/1425 | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.werks/1425 b/.werks/1425 index 901afa2..ad812c8 100644 --- a/.werks/1425 +++ b/.werks/1425 @@ -1,6 +1,6 @@ -Title: New section header option "encoding" +Title: New section header option "encoding" for agent output Level: 1 -Component: checks +Component: core Compatible: compat Version: 1.2.5i6 Date: 1414421080 @@ -10,15 +10,17 @@ If you write your own check plugins you might know that a section header can contain additional options separated by a colon. For example: +For section headers of agent outputs an additional option <tt>encoding</tt> +has been introduced. Generally all check plugins should output valid UTF-8 +encoded text. In some instances this is not possible, because the plugin +itself has its own hardcoded encoding. With the encoding option you can +specify the encoding for this entire section. Check_MK will then decode the +given section output and recode it into UTF-8 for further processing. +Example: + F+: -<<<lnx_distro:sep(124):persist(141442125)>>> +<<<win_foobar:encoding(cp1252)>>> F-: -An additional option <tt>encoding</tt> has been introduced. -Generally all check plugins should output valid utf-8 encoded text. -In some instances this is not possible, because the plugin itself -has its own hardcoded encoding. With the encoding option you can specify -the encoding for this entire section. - -Check_MK will decode the given section output and recode it into utf-8 for -further processing. +You find a list of all available encoding +<a href="https://docs.python.org/2.4/lib/standard-encodings.html">here</a>.

9 years, 11 months

Check_MK Git: check_mk: Updated formatting of several werks

by Mathias Kettner

Module: check_mk Branch: master Commit: 86e8a3bdfc99ea625a222e2635ddba4ed3c85a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86e8a3bdfc99ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 16:23:39 2014 +0100 Updated formatting of several werks --- .werks/1085 | 8 ++++---- .werks/1122 | 12 ++++++------ .werks/1125 | 7 ++++--- .werks/1424 | 10 +++++----- .werks/266 | 8 ++++++-- ChangeLog | 6 +++--- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.werks/1085 b/.werks/1085 index c64a3b6..30e0148 100644 --- a/.werks/1085 +++ b/.werks/1085 @@ -5,13 +5,13 @@ Version: 1.2.5i5 Date: 1405937822 Class: feature -When a quicksearch pattern matched multiple hosts the view <tt>hosts</tt> was shown. +When a Quicksearch pattern matched multiple hosts the view All hosts was shown. This view displayed all services for these hosts, which could lead to plenty of (unwanted) output in the view. -The quicksearch feature has been changed in the following way +The quicksearch feature has been changed in the following way: <ul> -<li>If there are multiple host matches the <tt>searchhost</tt> view is displayed</li> -<li>If there is a single match the <tt>hosts</tt> view is displayed (this view also contains the services)</li> +<li>If there are multiple host matches the Search Host view is displayed</li> +<li>If there is a single match the Host view is displayed (this view also contains the services)</li> </ul> Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt> diff --git a/.werks/1122 b/.werks/1122 index 6af8f38..6bb4c7d 100644 --- a/.werks/1122 +++ b/.werks/1122 @@ -6,18 +6,18 @@ Version: 1.2.5i6 Date: 1412178359 Class: fix -There were instances where a logline was not fully written to a unicode file. +There were instances where a logline was not fully written to a UTF-16 (unicode) encoded file. +For example: -For example -C+: +F+:C:\some\log\file.log This is the first line This is the sec -C-: +F-: In this scenario the agent is not allowed to parse the second line, because it has not been fully written to disk yet. A complete line is considered to -be finished with a carriage return followed by a newline. +be finished with a carriage return followed by a newline. With this update the agent now stops parsing after the first line and continues at the start of the second line on the following agent query. -Note: This only applies to utf-8 files +Note: This only applies to UTF-16 encoded files. diff --git a/.werks/1125 b/.werks/1125 index 05e6dc2..eb68da9 100644 --- a/.werks/1125 +++ b/.werks/1125 @@ -1,4 +1,4 @@ -Title: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set +Title: EC actions are now saved when an EC rule has "Send monitoring notification" set Level: 1 Component: ec Compatible: compat @@ -6,5 +6,6 @@ Version: 1.2.5i6 Date: 1412933594 Class: fix -This lead to the warning -<tt>You are missing the action with the ID @NOTIFY which is still used in some rules</tt> +This fixes a bug where actions where not saved. This lead to the warning +You are missing the action with the ID @NOTIFY which is still used in +some rules. diff --git a/.werks/1424 b/.werks/1424 index 210763e..c1ccde2 100644 --- a/.werks/1424 +++ b/.werks/1424 @@ -1,12 +1,12 @@ Title: mknotifyd: now able to check if its still listening for telegrams Level: 1 -Component: checks +Component: notifications Compatible: compat Version: 1.2.5i6 Date: 1414413785 Class: feature -The mknotifyd server is now able to handle heartbeat telegrams. -Just send an empty pickled python object to the server, like "N." (a pickled None) -The mknotifyd will answer with an "OK". -You can monitor this behaviour with the active check "Check connecting to a TCP port". +The mknotifyd server is now able to handle heartbeat telegrams. +Just send an empty pickled python object to the server, like "N." (a pickled <tt>None</tt>) +The mknotifyd will answer with an "OK". +You can monitor this behaviour with the active check Check connecting to a TCP port. diff --git a/.werks/266 b/.werks/266 index 61deff5..aa9fe51 100644 --- a/.werks/266 +++ b/.werks/266 @@ -1,4 +1,4 @@ -Title: windows_agent: now supports mrpe include files +Title: windows_agent: now supports MRPE include files Level: 1 Component: checks Version: 1.2.5i1 @@ -17,10 +17,12 @@ F+:check_mk.ini check = Dummy mrpe\check_crit check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 check = Whatever c:\myplugins\check_whatever -w 10 -c 20 + # Additional mrpe configs # The include files can be changed during the runtime include \\ab = C:\includes\ab_mrpe.cfg include \\NT-AUTORITÄT\SYSTEM = C:\includes\system_mrpe.cfg + # If you omit the user the file is executed with the current user include = C:\includes\default.cfg F-: @@ -28,13 +30,15 @@ F-: The syntax in the mrpe include file is the same as in the mrpe section, with the exception that you cannot add further includes in a include file. There is also no need to define a <tt>[mrpe]</tt> section in an included file. You just need to define the <tt>check</tt> lines here. + F+:ab_mrpe.cfg check = Dummy mrpe\check_crit check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 F-: + Important: Keep in mind that the agent needs the permission to run scripts as other user. Internally it uses the windows command <tt>runas /User:</tt> -which prompts for a password if agent has no permission to change to this user. +which prompts for a password if agent has no permission to change to this user. In this case the check_mk agent will get stuck! diff --git a/ChangeLog b/ChangeLog index ac6c6e9..af93fea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 1008 Overall check timeout for Check_MK checks now defaults to CRIT state... * 1373 SEC: Do not ouput complete command line when datasource programs fail... + * 1425 New section header option "encoding" for agent output... * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files... Checks & Agents: @@ -79,9 +80,7 @@ * 1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers * 1190 statgrab_cpu: Check can now handle parameters * 1191 Linux agent now also sends information about tmpfs... - * 1424 mknotifyd: now able to check if its still listening for telegrams... * 1193 ps: Manual Checks can now use RegEx for user matching... - * 1425 New section header option "encoding"... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -174,6 +173,7 @@ * 1123 Rule based notifications: New condition "Match Service Groups" * 1186 RBN: It's now possible to Filter for contactgroups... * 1189 sms notification: also send information about Downtimes, Acknowledgments and Fallping now + * 1424 mknotifyd: now able to check if its still listening for telegrams... * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message @@ -189,7 +189,7 @@ * 1399 FIX: Fix left-over tac processes when showing Event Console history... * 1402 FIX: Fixed cased where counting events did not reach required count... * 1124 FIX: WATO EC configuration: no longer raises an exception when user has restricted WATO access... - * 1125 FIX: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set... + * 1125 FIX: EC actions are now saved when an EC rule has "Send monitoring notification" set... HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path...

9 years, 11 months

Check_MK Git: check_mk: Updated formatting of Werk #1425, again

by Mathias Kettner

Module: check_mk Branch: master Commit: 81e6db5d81984091255cadbc21cc7e6daa7eb386 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81e6db5d819840… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 16:02:54 2014 +0100 Updated formatting of Werk #1425, again --- .werks/1425 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.werks/1425 b/.werks/1425 index 968aec1..901afa2 100644 --- a/.werks/1425 +++ b/.werks/1425 @@ -8,7 +8,11 @@ Class: feature If you write your own check plugins you might know that a section header can contain additional options separated by a colon. -For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> +For example: + +F+: +<<<lnx_distro:sep(124):persist(141442125)>>> +F-: An additional option <tt>encoding</tt> has been introduced. Generally all check plugins should output valid utf-8 encoded text.

9 years, 11 months

Check_MK Git: check_mk: Updated formatting of Werk #1425, again

by Mathias Kettner

Module: check_mk Branch: master Commit: 320953193899551cf915a508aa1e4042177e087a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32095319389955… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 16:02:18 2014 +0100 Updated formatting of Werk #1425, again --- .werks/1425 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1425 b/.werks/1425 index 9b91d34..968aec1 100644 --- a/.werks/1425 +++ b/.werks/1425 @@ -8,7 +8,7 @@ Class: feature If you write your own check plugins you might know that a section header can contain additional options separated by a colon. -For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> +For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> An additional option <tt>encoding</tt> has been introduced. Generally all check plugins should output valid utf-8 encoded text.

9 years, 11 months

Check_MK Git: check_mk: Updated formatting of Werk #1425

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e6d75afd0c557199521ae3a68c6df27792a1e4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e6d75afd0c557… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 27 16:01:29 2014 +0100 Updated formatting of Werk #1425 --- .werks/1425 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.werks/1425 b/.werks/1425 index 0a91837..9b91d34 100644 --- a/.werks/1425 +++ b/.werks/1425 @@ -7,13 +7,14 @@ Date: 1414421080 Class: feature If you write your own check plugins you might know that a section -header can contain additional options separated by a colon. -For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> +header can contain additional options separated by a colon. +For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> An additional option <tt>encoding</tt> has been introduced. Generally all check plugins should output valid utf-8 encoded text. In some instances this is not possible, because the plugin itself has its own hardcoded encoding. With the encoding option you can specify -the encoding for this entire section. +the encoding for this entire section. + Check_MK will decode the given section output and recode it into utf-8 for further processing.

9 years, 11 months

Check_MK Git: check_mk: #1425 New section header option "encoding"

by Andreas Boesl

Module: check_mk Branch: master Commit: 77b01ae1809e9fd40a709796eaa21f0151e284e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b01ae1809e9f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 27 15:53:59 2014 +0100 #1425 New section header option "encoding" If you write your own check plugins you might know that a section header can contain additional options separated by a colon. For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> An additional option <tt>encoding</tt> has been introduced. Generally all check plugins should output valid utf-8 encoded text. In some instances this is not possible, because the plugin itself has its own hardcoded encoding. With the encoding option you can specify the encoding for this entire section. Check_MK will decode the given section output and recode it into utf-8 for further processing. --- .werks/1425 | 19 +++++++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/.werks/1425 b/.werks/1425 new file mode 100644 index 0000000..0a91837 --- /dev/null +++ b/.werks/1425 @@ -0,0 +1,19 @@ +Title: New section header option "encoding" +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414421080 +Class: feature + +If you write your own check plugins you might know that a section +header can contain additional options separated by a colon. +For example <tt><<<lnx_distro:sep(124):persist(141442125)>>></tt> + +An additional option <tt>encoding</tt> has been introduced. +Generally all check plugins should output valid utf-8 encoded text. +In some instances this is not possible, because the plugin itself +has its own hardcoded encoding. With the encoding option you can specify +the encoding for this entire section. +Check_MK will decode the given section output and recode it into utf-8 for +further processing. diff --git a/ChangeLog b/ChangeLog index ff01a77..ac6c6e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 1191 Linux agent now also sends information about tmpfs... * 1424 mknotifyd: now able to check if its still listening for telegrams... * 1193 ps: Manual Checks can now use RegEx for user matching... + * 1425 New section header option "encoding"... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 795c989..750349f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -757,6 +757,7 @@ def parse_info(lines, hostname): section = [] section_options = {} separator = None + encoding = None for line in lines: if line[:4] == '<<<<' and line[-4:] == '>>>>': host = line[4:-4] @@ -799,7 +800,16 @@ def parse_info(lines, hostname): until = int(section_options["persist"]) persist[section_name] = ( until, section ) + # The section data might have a different encoding + encoding = section_options.get("encoding") + elif line != '': + if encoding: + try: + decoded_line = line.decode(encoding) + line = decoded_line.encode('utf-8') + except: + pass section.append(line.split(separator)) return info, piggybacked, persist

9 years, 11 months

Check_MK Git: check_mk: sms: fixed exception in script

by Bastian Kuhn

Module: check_mk Branch: master Commit: b05b8d093dc72228ace6bbc0bfb5d7557b4c0ff2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b05b8d093dc722… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 27 15:40:41 2014 +0100 sms: fixed exception in script --- notifications/sms | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/notifications/sms b/notifications/sms index 89e2119..7e749a2 100755 --- a/notifications/sms +++ b/notifications/sms @@ -49,7 +49,7 @@ if not send_path and not spool_dir: max_len = 160 message = os.environ['NOTIFY_HOSTNAME'] + " " -notification_type = os.environ["NOTIFICATIONTYPE"] +notification_type = os.environ["NOTIFY_NOTIFICATIONTYPE"] # Prepare Default information and Type PROBLEM, RECOVERY if os.environ['NOTIFY_WHAT'] == 'SERVICE': @@ -76,12 +76,15 @@ if notification_type.startswith("FLAP"): elif notification_type.startswith("DOWNTIME"): what = notification_type[8:].title() message += " Downtime " + what + message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] elif notification_type == "ACKNOWLEDGEMENT": message += " Acknowledged" + message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] elif notification_type == "CUSTOM": message += " Custom Notification" + message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] recipient = os.environ['NOTIFY_CONTACTPAGER'].replace(" ", "")

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits