Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: check_http: Fix: also support old configuration style now

by Bastian Kuhn

Module: check_mk Branch: master Commit: 895649cd52521030fe68da8a4d749a3fd2f50569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895649cd525210… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Mar 11 15:35:21 2015 +0100 check_http: Fix: also support old configuration style now --- checks/check_http | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/check_http b/checks/check_http index f335ea4..bc1b130 100644 --- a/checks/check_http +++ b/checks/check_http @@ -55,8 +55,12 @@ def check_http_arguments(params): args += ' -I %s' % quote_shell_string(settings['cert_host']) if "cert_days" in settings: - warn, crit = settings["cert_days"] - args += ' -C %d,%d' % (warn, crit) + # legacy behavior + if type(settings["cert_days"]) == int: + args += ' -C %d' % settings["cert_days"] + else: + warn, crit = settings["cert_days"] + args += ' -C %d,%d' % (warn, crit) if settings.get("sni"): args += ' --sni'

9 years, 6 months

Check_MK Git: check_mk: windows_tasks.ps1: New Version who supports German

by Bastian Kuhn

Module: check_mk Branch: master Commit: b128ec503dac32ceb7782bedc19f94cc7927e471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b128ec503dac32… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Mar 11 14:30:35 2015 +0100 windows_tasks.ps1: New Version who supports German --- agents/windows/plugins/windows_tasks.ps1 | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/agents/windows/plugins/windows_tasks.ps1 b/agents/windows/plugins/windows_tasks.ps1 index 16dacbe..d03cf66 100644 --- a/agents/windows/plugins/windows_tasks.ps1 +++ b/agents/windows/plugins/windows_tasks.ps1 @@ -1,2 +1,28 @@ -echo "<<<windows_tasks:sep(58)>>>" -schtasks /query /fo csv -v | ConvertFrom-Csv | ? {$_.HostName -match "^$($Env:Computername)$" -and $_.TaskName -notlike '\Microsoft*' -and $_.TaskName -notlike '*zachteHRM*'} | fl taskname,"last run time","next run time","last result","scheduled task state" \ No newline at end of file +# +# Get Windows tasks for check_mk +# +# Changelog: v0.02 German servers will now write their output in English +# v0.03 Fixed a bug with German language output +# + +Write-Host "<<<windows_tasks:sep(58)>>>" +$lang = Get-UICulture | select -expand LCID +if ($lang -eq 1031){ + $tasks = schtasks /query /fo csv -v | ConvertFrom-Csv + foreach ($task in $tasks){ + if (($task.HostName -match "^$($Env:Computername)$") -and ($task.AufgabenName -notlike '\Microsoft*') -and ($task.AufgabenName -notlike '*zachteHRM*')){ + Write-Host "TaskName `t: "$task.AufgabenName + Write-Host "Last Run Time `t: "$task.'Letzte Laufzeit' + Write-Host "Next Run Time `t: "$task.'Nächste Laufzeit' + Write-Host "Last Result `t: "$task.'Letztes Ergebnis' + if ($task.'Status der geplanten Aufgabe' -eq 'Aktiviert'){ + Write-Host "Scheduled Task State `t: Enabled" + } else { + Write-Host "Scheduled Task State `t: "$task.'Status der geplanten Aufgabe' + } + Write-Host "" + } + } +} elseif ($lang -eq 1033){ + schtasks /query /fo csv -v | ConvertFrom-Csv | ? {$_.HostName -match "^$($Env:Computername)$" -and $_.TaskName -notlike '\Microsoft*' -and $_.TaskName -notlike '*zachteHRM*'} | fl taskname,"last run time","next run time","last result","scheduled task state" +} \ No newline at end of file

9 years, 6 months

Check_MK Git: check_mk: #1228 Linux Agent: Now supports systemd

by Bastian Kuhn

Module: check_mk Branch: master Commit: 467d4b81c73199d60d990b0364e3b383fa82cad4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=467d4b81c73199… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Mar 11 14:03:25 2015 +0100 #1228 Linux Agent: Now supports systemd The Check_MK Linux Agent installation packet now supports systemd based systems. --- .werks/1228 | 11 +++++++++++ ChangeLog | 3 ++- agents/check-mk-agent-1.2.7i1-1.noarch.rpm | Bin 20344 -> 21626 bytes agents/check-mk-agent.spec | 17 +++++++++++++++-- agents/check-mk-agent_1.2.7i1-1_all.deb | Bin 17382 -> 17978 bytes agents/systemd/check_mk.socket | 9 +++++++++ agents/systemd/check_mk@.service | 10 ++++++++++ 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.werks/1228 b/.werks/1228 new file mode 100644 index 0000000..75fe586 --- /dev/null +++ b/.werks/1228 @@ -0,0 +1,11 @@ +Title: Linux Agent: Now supports systemd +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i1 +Date: 1426078879 +Class: feature + +The Check_MK Linux Agent installation packet now supports systemd based systems. + + diff --git a/ChangeLog b/ChangeLog index 401285e..1ce4763 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.7i1: Core & Setup: * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... + * 1228 Linux Agent: Now supports systemd... * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created... * 1792 FIX: Fix path to special agents in case of manual installation * 1797 FIX: Fix incomplete configuration during checking when using CMC... @@ -119,8 +120,8 @@ * 1226 mysql: New check to show the version of the mysql deamon * 2100 if64: check can now impose limits on the number of outgoing and incoming non-unicast packets per second * 1227 mysql_ping: New Check to detect misconfiguration of the mk_mysql plugin - * 2102 mbg_lantime_ng_fan, mbg_lantime_ng_state, mbg_lantime_state: new checks for Meinberg LANTIME Clocks supporting the new MBG-LANTIME-NG-MIB * 2134 winperf_phydisk: allow device to appear more than one time in agent output... + * 2102 mbg_lantime_ng_fan, mbg_lantime_ng_state, mbg_lantime_state: new checks for Meinberg LANTIME Clocks supporting the new MBG-LANTIME-NG-MIB * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/check-mk-agent-1.2.7i1-1.noarch.rpm b/agents/check-mk-agent-1.2.7i1-1.noarch.rpm index ad6c56d..7817919 100644 Binary files a/agents/check-mk-agent-1.2.7i1-1.noarch.rpm and b/agents/check-mk-agent-1.2.7i1-1.noarch.rpm differ diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 82639f4..1f0a810 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -49,8 +49,13 @@ R=$RPM_BUILD_ROOT rm -rf $R # install agent +# xinitd mkdir -p $R/etc/xinetd.d install -m 644 xinetd.conf $R/etc/xinetd.d/check_mk +# Systemd +mkdir -p $R/etc/systemd/system +install -m 644 systemd/check_mk\@.service $R/etc/systemd/system +install -m 644 systemd/check_mk.socket $R/etc/systemd/system mkdir -p $R/etc/check_mk mkdir -p $R/usr/bin install -m 755 check_mk_agent.linux $R/usr/bin/check_mk_agent @@ -67,6 +72,8 @@ rm -rf $RPM_BUILD_ROOT %files %config(noreplace) /etc/xinetd.d/check_mk +%config(noreplace) /etc/systemd/system/check_mk@.service +%config(noreplace) /etc/systemd/system/check_mk.socket /etc/check_mk /usr/bin/* /usr/lib/check_mk_agent @@ -74,11 +81,15 @@ rm -rf $RPM_BUILD_ROOT %define reload_xinetd if [ -x /etc/init.d/xinetd ] ; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; /etc/init.d/xinetd reload ; else echo "Starting xinetd..." ; /etc/init.d/xinetd start ; fi ; fi -%define activate_xinetd if which chkconfig >/dev/null 2>&1 ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi +%define reload_xinetd_systemd if [ ! -x /etc/init.d/xinetd ] && [ -x /usr/sbin/xinetd ]; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; service xinetd reload ; else echo "Starting xinetd..." ; service init.d/xinetd start ; fi ; fi + +%define activate_xinetd if [ -x /usr/bin/xinted ] && [ which chkconfig >/dev/null 2>&1 ] ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi %define cleanup_rpmnew if [ -f /etc/xinetd.d/check_mk.rpmnew ] ; then rm /etc/xinetd.d/check_mk.rpmnew ; fi +%define systemd_enable if [ -x /usr/bin/systemctl ] && [ ! -x /usr/sbin/xinetd ] ; then echo "Enable Check_MK_Agent in systemd..." ; systemctl enable check_mk.socket ; systemctl restart sockets.target ; fi + %pre -if [ ! -x /etc/init.d/xinetd ] ; then +if [ ! -x /usr/sbin/xinetd ] && [ ! -x /usr/bin/systemctl ] ; then echo echo "---------------------------------------------" echo "WARNING" @@ -98,6 +109,8 @@ fi %cleanup_rpmnew %activate_xinetd %reload_xinetd +%reload_xinetd_systemd +%systemd_enable %postun %reload_xinetd diff --git a/agents/check-mk-agent_1.2.7i1-1_all.deb b/agents/check-mk-agent_1.2.7i1-1_all.deb index ca12830..8472be6 100644 Binary files a/agents/check-mk-agent_1.2.7i1-1_all.deb and b/agents/check-mk-agent_1.2.7i1-1_all.deb differ diff --git a/agents/systemd/check_mk.socket b/agents/systemd/check_mk.socket new file mode 100644 index 0000000..93d45d1 --- /dev/null +++ b/agents/systemd/check_mk.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Check_MK Agent Socket + +[Socket] +ListenStream=6556 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/agents/systemd/check_mk@.service b/agents/systemd/check_mk@.service new file mode 100644 index 0000000..a15fd47 --- /dev/null +++ b/agents/systemd/check_mk@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Check_MK + +[Service] +ExecStart=/usr/bin/check_mk_agent + +User=root +Group=root + +StandardInput=socket

9 years, 6 months

Check_MK Git: check_mk: #2136 Unify headers of Host/Service rules, EC rules and notification rules

by Mathias Kettner

Module: check_mk Branch: master Commit: c0efa25a7f3263bee11fad15cc30de25e3c1ea9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0efa25a7f3263… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 11 13:55:11 2015 +0100 #2136 Unify headers of Host/Service rules, EC rules and notification rules All three types of rules now have a common header with description, command and documentation URL. The section has been renamed from General Properties or Additional options to Rule Properties. In the host and service rules the existing comment information is being used as description if the description is empty. This is in order to be compatible with the existing configuration where no description field existed. --- .werks/2136 | 14 ++ ChangeLog | 3 +- mkeventd/web/plugins/wato/mkeventd.py | 31 ++-- web/htdocs/htmllib.py | 4 +- web/htdocs/js/checkmk.js | 2 +- web/htdocs/valuespec.py | 22 ++- web/htdocs/wato.py | 316 ++++++++++++++------------------- 7 files changed, 182 insertions(+), 210 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c0efa25a7f…

9 years, 6 months

Check_MK Git: check_mk: fixed text alignment in rrdgraph legend

by Andreas Boesl

Module: check_mk Branch: master Commit: dcd86a58b7f7d227ac78a1f6c403e4bac92a622c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcd86a58b7f7d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 11 12:42:56 2015 +0100 fixed text alignment in rrdgraph legend --- web/htdocs/metrics.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 86545fa..fd38d055 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -71,12 +71,12 @@ P = T * 1000 scale_symbols = { 1 : "", - KB : "K", + KB : "k", MB : "M", GB : "G", TB : "T", PB : "P", - K : "K", + K : "k", M : "M", G : "G", T : "T", @@ -769,15 +769,21 @@ def render_pnp_graph(graph, translated_metrics): if what == "command": rrdgraph_commands += commands else: + legend_symbol = unit_symbol + if unit_symbol and unit_symbol[0] == " ": + legend_symbol = " %s%s" % (legend_scale_symbol, unit_symbol[1:]) rrdgraph_commands += "GPRINT:%%s_LEGSCALED:%%s:\"%%%%%d.%dlf%%s\" " % (column_width - len(legend_scale_symbol), legend_precision) \ - % (metric_name, what, legend_scale_symbol + unit_symbol) + % (metric_name, what, legend_symbol) rrdgraph_commands += "COMMENT:\"\\n\" " else: for metric_name, unit_symbol, commands in graph_metrics: rrdgraph_commands += commands + legend_symbol = unit_symbol + if unit_symbol and unit_symbol[0] == " ": + legend_symbol = " %s%s" % (legend_scale_symbol, unit_symbol[1:]) for what, what_title in [ ("AVERAGE", _("average")), ("MAX", _("max")), ("LAST", _("last")) ]: rrdgraph_commands += "GPRINT:%%s_LEGSCALED:%%s:\"%%%%8.%dlf%%s %%s\" " % legend_precision % \ - (metric_name, what, legend_scale_symbol + unit_symbol, what_title) + (metric_name, what, legend_symbol, what_title) # Now compute the arguments for the command line of rrdgraph

9 years, 6 months

Check_MK Git: check_mk: Logwatch option maxfilesize now produces periodic errors

by Mathias Kettner

Module: check_mk Branch: master Commit: 06197fe358a79210c8ee9bbc73d817b3e50f7c66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06197fe358a792… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 11 10:12:33 2015 +0100 Logwatch option maxfilesize now produces periodic errors Every time that the files has again grown, a new message will be output --- agents/plugins/mk_logwatch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index ff77b5a..bf6f745 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -312,8 +312,9 @@ def process_logfile(logfile, patterns): sys.stdout.flush() # Handle option maxfilesize, regardless of warning or errors that have happened - if opt_maxfilesize != None and offset <= opt_maxfilesize and new_offset > opt_maxfilesize: - sys.stdout.write("%sW Maximum allowed logfile size (%d bytes) exceeded.%s\n" % (tty_yellow, opt_maxfilesize, tty_normal)) + if opt_maxfilesize != None and (offset / opt_maxfilesize) < (new_offset / opt_maxfilesize): + sys.stdout.write("%sW Maximum allowed logfile size (%d bytes) exceeded for the %dth time.%s\n" % + (tty_yellow, opt_maxfilesize, new_offset / opt_maxfilesize, tty_normal)) try:

9 years, 6 months

Check_MK Git: check_mk: Metrics: allow scaling of legend in PNP graph

by Mathias Kettner

Module: check_mk Branch: master Commit: 045351665256c8c1fe018f3ffff99c07b0d56f05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=045351665256c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 11 09:43:10 2015 +0100 Metrics: allow scaling of legend in PNP graph --- web/htdocs/metrics.py | 52 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index c200f02..86545fa 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -58,10 +58,30 @@ def load_plugins(): # Definitions to be used in the actual metric declarations KB = 1024 -MB = 1024 * 1024 -GB = 1024 * 1024 * 1024 -TB = 1024 * 1024 * 1024 * 1024 -PB = 1024 * 1024 * 1024 * 1024 * 1024 +MB = KB * 1024 +GB = MB * 1024 +TB = GB * 1024 +PB = TB * 1024 + +K = 1000 +M = K * 1000 +G = M * 1000 +T = G * 1000 +P = T * 1000 + +scale_symbols = { + 1 : "", + KB : "K", + MB : "M", + GB : "G", + TB : "T", + PB : "P", + K : "K", + M : "M", + G : "G", + T : "T", + P : "P", +} # Convert perf_data_string into perf_data, extract check_command @@ -637,6 +657,10 @@ def render_pnp_graph(graph, translated_metrics): rrdgraph_commands = "" + legend_precision = graph.get("legend_precision", 2) + legend_scale = graph.get("legend_scale", 1) + legend_scale_symbol = scale_symbols[legend_scale] + # Define one RRD variable for each of the available metrics. # Note: We need to use the original name, not the translated one. for var_name, metrics in translated_metrics.items(): @@ -649,6 +673,9 @@ def render_pnp_graph(graph, translated_metrics): else: rrdgraph_commands += "DEF:%s=%s:1:MAX " % (var_name, rrd) + # Scaling for legend + rrdgraph_commands += "CDEF:%s_LEGSCALED=%s,%f,/ " % (var_name, var_name, legend_scale) + # Compute width of columns in case of mirrored legend mirror_legend = graph.get("mirror_legend") @@ -695,6 +722,8 @@ def render_pnp_graph(graph, translated_metrics): # Choose a unique name for the derived variable and compute it commands += "CDEF:DERIVED%d=%s " % (nr , metric_name) metric_name = "DERIVED%d" % nr + # Scaling for legend + commands += "CDEF:%s_LEGSCALED=%s,%f,/ " % (metric_name, metric_name, legend_scale) else: mi = metric_info[metric_name] @@ -732,7 +761,6 @@ def render_pnp_graph(graph, translated_metrics): if not vertical_label: vertical_label = unit["title"] - # Now create the rrdgraph commands for all metrics - according to the choosen layout if mirror_legend: for what, what_title in [ ("command", ""), ("AVERAGE", _("Average") + "\\:"), ("MAX", _("Maximum") + "\\:"), ("LAST", _("Last") + "\\:") ]: @@ -741,16 +769,15 @@ def render_pnp_graph(graph, translated_metrics): if what == "command": rrdgraph_commands += commands else: - rrdgraph_commands += "GPRINT:%%s:%%s:\"%%%%%d.2lf%%s\" " % column_width % (metric_name, what, unit_symbol) + rrdgraph_commands += "GPRINT:%%s_LEGSCALED:%%s:\"%%%%%d.%dlf%%s\" " % (column_width - len(legend_scale_symbol), legend_precision) \ + % (metric_name, what, legend_scale_symbol + unit_symbol) rrdgraph_commands += "COMMENT:\"\\n\" " else: for metric_name, unit_symbol, commands in graph_metrics: rrdgraph_commands += commands - rrdgraph_commands += "GPRINT:%s:AVERAGE:\"%%8.2lf%s %s\" " % (metric_name, unit_symbol, _("average")) - rrdgraph_commands += "GPRINT:%s:MAX:\"%%8.2lf%s %s\" " % (metric_name, unit_symbol, _("max")) - rrdgraph_commands += "GPRINT:%s:LAST:\"%%8.2lf%s %s\\n\" " % (metric_name, unit_symbol, _("last")) - - + for what, what_title in [ ("AVERAGE", _("average")), ("MAX", _("max")), ("LAST", _("last")) ]: + rrdgraph_commands += "GPRINT:%%s_LEGSCALED:%%s:\"%%%%8.%dlf%%s %%s\" " % legend_precision % \ + (metric_name, what, legend_scale_symbol + unit_symbol, what_title) # Now compute the arguments for the command line of rrdgraph @@ -765,6 +792,9 @@ def render_pnp_graph(graph, translated_metrics): if "range" in graph: rrdgraph_arguments += " -l %f -u %f" % graph["range"] + else: + rrdgraph_arguments += " -l 0" + # Some styling options, currently hardcoded rrdgraph_arguments += " --color MGRID\"#cccccc\" --color GRID\"#dddddd\" --width=600";

9 years, 6 months

Check_MK Git: check_mk: mknotifyd: fix agent output in case of unused spooler

by Mathias Kettner

Module: check_mk Branch: master Commit: 29b5fd29e108c0a25e0dbdf6b1f3c7b3048896ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29b5fd29e108c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 10 18:25:23 2015 +0100 mknotifyd: fix agent output in case of unused spooler --- agents/check_mk_agent.linux | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 6b2b316..2903421 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -517,10 +517,12 @@ then run_cached -s omd_status 60 "omd status --bare --auto || true" echo '<<<mknotifyd:sep(0)>>>' for statefile in /omd/sites/*/var/log/mknotifyd.state ; do - site=${statefile%/var/log*} - site=${site#/omd/sites/} - echo "[$site]" - grep -v '^#' < $statefile + if [ -e "$statefile" ] ; then + site=${statefile%/var/log*} + site=${site#/omd/sites/} + echo "[$site]" + grep -v '^#' < $statefile + fi done fi

9 years, 6 months

Check_MK Git: check_mk: #2135 Allow to filter notification contacts based on values of custom macros

by Mathias Kettner

Module: check_mk Branch: master Commit: e3adcabdddc0f1600d295c1641b073e6dfd1d42d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3adcabdddc0f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 10 18:53:10 2015 +0100 #2135 Allow to filter notification contacts based on values of custom macros You can now use custom user attributes (macros) for deciding which users should be notified. For that purpose there is a new check box in the contact selection of the rule based notifications called Restrict by custom macros. Here you can specify the name of custom macros and regular expressions for the allowed values. Users whose macros do not match are being removed from the list of contacts. Note: You first need to select contacts, the options just removes contacts, never adds ones. Custom user attributes can be defined WATO's users module. Please make sure that you add your macros to the monitoring configuration by selecting Make this variable available in notifications. --- .werks/2135 | 19 +++++++++++++++++++ ChangeLog | 1 + modules/notify.py | 23 +++++++++++++++++++---- web/htdocs/wato.py | 40 ++++++++++++++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 10 deletions(-) diff --git a/.werks/2135 b/.werks/2135 new file mode 100644 index 0000000..1c628ff --- /dev/null +++ b/.werks/2135 @@ -0,0 +1,19 @@ +Title: Allow to filter notification contacts based on values of custom macros +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i1 +Date: 1426009795 +Class: feature + +You can now use custom user attributes (macros) for deciding which users should +be notified. For that purpose there is a new check box in the contact selection +of the rule based notifications called Restrict by custom macros. +Here you can specify the name of custom macros and regular expressions for +the allowed values. Users whose macros do not match are being removed from +the list of contacts. Note: You first need to select contacts, the options +just removes contacts, never adds ones. + +Custom user attributes can be defined WATO's users module. Please make +sure that you add your macros to the monitoring configuration by selecting +Make this variable available in notifications. diff --git a/ChangeLog b/ChangeLog index 19a0c19..5d99385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -346,6 +346,7 @@ * 1662 notification plugin spectrum: finalized script. now able to handle host notications * 1213 New Notification macros $SERVICEFORURL$ and $HOSTFORURL$... * 2041 Notification Spooler can now handle incoming and outgoing persistent TCP connections... + * 2135 Allow to filter notification contacts based on values of custom macros... * 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications * 1664 FIX: mknotifyd: further performance improvements for notification forwarding * 1205 FIX: RBN: Fixed match contactgroup condition... diff --git a/modules/notify.py b/modules/notify.py index 0a5f042..1f91435 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -949,10 +949,25 @@ def rbn_rule_contacts(rule, context): all_enabled = [] for contactname in the_contacts: contact = contacts.get(contactname) - if contact and contact.get("disable_notifications", False): - notify_log(" - skipping contact %s: he/she has disabled notifications" % contactname) - else: - all_enabled.append(contactname) + if contact: + if contact.get("disable_notifications", False): + notify_log(" - skipping contact %s: he/she has disabled notifications" % contactname) + continue + + if "contact_match_macros" in rule: + match = True + for macro_name, regexp in rule["contact_match_macros"]: + value = contact.get("_" + macro_name, "") + if not regexp.endswith("$"): + regexp = regexp + "$" + if not regex(regexp).match(value): + notify_log(" - skipping contact %s: value '%s' for macro '%s' does not match '%s'" % ( + contactname, value, macro_name, regexp)) + match = False + break + if not match: + continue + all_enabled.append(contactname) return all_enabled diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 211bc0e..b19f0f3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8250,7 +8250,7 @@ def vs_notification_rule(userid = None): else: contact_headers = [ ( _("Contact Selection"), [ "contact_all", "contact_all_with_email", "contact_object", - "contact_users", "contact_groups", "contact_emails" ] ), + "contact_users", "contact_groups", "contact_emails", "contact_match_macros" ] ), ] section_contacts = [ # Contact selection @@ -8296,6 +8296,31 @@ def vs_notification_rule(userid = None): orientation = "vertical", ) ), + ( "contact_match_macros", + ListOf( + Tuple( + elements = [ + TextAscii( + title = _("Name of the macro"), + help = _("As configured in the users settings. Do not add a leading underscore."), + allow_empty = False, + ), + RegExp( + title = _("Required match (regular expression)"), + help = _("This expression must complete match the value of the variable"), + allow_empty = False, + ), + ] + ), + title = _("Restrict by custom macros"), + help = _("Here you can restrict the list of contacts that has been " + "built up by the previous options to those who have certain values " + "in certain custom macros. If you add more than one macro here then " + "all macros must match. The matches are regular expressions " + "that must fully match the value of the macro."), + add_label = _("Add condition"), + ) + ), ] section_override = [ ( "allow_disable", @@ -8667,7 +8692,7 @@ def vs_notification_rule(userid = None): "match_services", "match_servicegroups", "match_contactgroups", "match_exclude_services", "match_plugin_output", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", - "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], + "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails", "contact_match_macros" ], headers = [ ( _("General Properties"), [ "description", "comment", "disabled", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] @@ -17460,17 +17485,20 @@ def mode_edit_custom_attr(phase, what): forms.section(_('Editable by Users')) html.help(_('It is possible to let users edit their custom attributes.')) - html.checkbox('user_editable', attr.get('user_editable', True)) + html.checkbox('user_editable', attr.get('user_editable', True), + label = _("Users can change this attribute in their personal settings")) forms.section(_('Show in Table')) html.help(_('This attribute is only visibile on the detail pages by default, but ' 'you can also make it visible in the overview tables.')) - html.checkbox('show_in_table', attr.get('show_in_table', False)) + html.checkbox('show_in_table', attr.get('show_in_table', False), + label = _("Show the setting of the attribute in the user table")) - forms.section(_('Add as Custom Macro')) + forms.section(_('Add as custom macro')) html.help(_('The attribute can be added to the contact definiton in order ' 'to use it for notifications.')) - html.checkbox('add_custom_macro', attr.get('add_custom_macro', False)) + html.checkbox('add_custom_macro', attr.get('add_custom_macro', False), + label = _("Make this variable available in notifications")) forms.end() html.show_localization_hint()

9 years, 6 months

Check_MK Git: check_mk: #2102 mbg_lantime_ng_fan, mbg_lantime_ng_state, mbg_lantime_state: new checks for Meinberg LANTIME Clocks supporting the new MBG-LANTIME-NG-MIB

by Goetz Golla

Module: check_mk Branch: master Commit: cc370bc5fa61d4cd6da1925d54a66dda7ee7ea0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc370bc5fa61d4… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 10 18:37:06 2015 +0100 #2102 mbg_lantime_ng_fan, mbg_lantime_ng_state, mbg_lantime_state: new checks for Meinberg LANTIME Clocks supporting the new MBG-LANTIME-NG-MIB --- .werks/2102 | 9 +++++++ ChangeLog | 1 + checkman/mbg_lantime_mbg_fan | 17 ++++++++++++ checkman/mbg_lantime_ng_power | 17 ++++++++++++ checkman/mbg_lantime_ng_temp | 31 +++++++++++++++++++++ checks/mbg_lantime.include | 25 +++++++++-------- checks/mbg_lantime_ng_fan | 60 +++++++++++++++++++++++++++++++++++++++++ checks/mbg_lantime_ng_power | 53 ++++++++++++++++++++++++++++++++++++ checks/mbg_lantime_ng_state | 6 ++++- checks/mbg_lantime_ng_temp | 50 ++++++++++++++++++++++++++++++++++ checks/mbg_lantime_state | 6 ++++- 11 files changed, 260 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc370bc5fa…

9 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015