Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: runas: new plugin script to include and execute mrpe, local and plugin scripts as different user

by Andreas Boesl

Module: check_mk Branch: master Commit: dde6e566e3c12e1a79b4cc399d99235c056c59b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dde6e566e3c12e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 30 11:44:03 2014 +0200 runas: new plugin script to include and execute mrpe, local and plugin scripts as different user With the new plugin <tt>runas</tt> you can configure additional include files and directories for mrpe, local and plugin scripts. You can also change the user context of each of these scripts. It allows non-root users to add additional scripts which might get executed with reduced permission. --- .werks/928 | 39 +++++++++++++++++++++++++++ ChangeLog | 3 ++- agents/plugins/mrpe_include | 4 +++ agents/plugins/runas | 61 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 1 deletion(-) diff --git a/.werks/928 b/.werks/928 new file mode 100644 index 0000000..76d7e0f --- /dev/null +++ b/.werks/928 @@ -0,0 +1,39 @@ +Title: runas: new plugin script to include and execute mrpe, local and plugin scripts as different user +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1401442173 +Class: feature + +With the new plugin <tt>runas</tt> you can configure additional include files and +directories for mrpe, local and plugin scripts. You can also change the user context +of each of these scripts. It allows non-root users to add additional scripts which might +get executed with reduced permission. + +This check is configured with the configuration file <tt>runas.cfg</tt>. +In a default installation this file is located within the Check_MK config directory under <tt>/etc/check_mk/runas.cfg</tt>. + +The <tt>runas.cfg</tt> configuration syntax is as follow +[Script type] [User context] [File / Directory ] + +The <tt>Script type</tt> can be set to <tt>mrpe</tt>, <tt>local</tt> and <tt>plugin</tt>. +The <tt>User context</tt> represents the user. If you do not want to change the context set this field to <tt>-</tt> +Depending on the script type the third value points to a file or directory. +The mrpe type requires a target file which contains the mrpe commands. +Local and plugins types require are target folder, which contains the executable local and plugin scripts.<br> + +Here is an example configuration: + +F+:/etc/check_mk/runas.cfg +mrpe ab /home/ab/mrpe_commands.cfg +mrpe lm /home/lm/mrpe_commands.cfg +mrpe - /root/mrpe/extra_commands.cfg +plugin ab /var/ab/plugins +local ab /var/ab/local +F-: + +<b>Note:</b>You need to set up the local and plugin scripts in different folders, because the line +<tt>plugin ab /var/ab/plugins</tt> indicates that all executable files within this folder are treated as plugins. + + + diff --git a/ChangeLog b/ChangeLog index ab94946..0bcc9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,8 +64,9 @@ * 0926 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable * 0163 kaspersky_av_quarantine,kaspersky_av_tasks,kaspersky_av_updates: New checks for kaspersky anti virus on linux * 0164 symantec_av_progstate,symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux - * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... * 0927 windows agent: now able to evaluate logfiles written in unicode (2 bytes per character)... + * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... + * 0928 runas: new plugin script to include and execute mrpe, local and plugin scripts as different user... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/agents/plugins/mrpe_include b/agents/plugins/mrpe_include index 3fcfb64..4691548 100755 --- a/agents/plugins/mrpe_include +++ b/agents/plugins/mrpe_include @@ -1,4 +1,8 @@ #!/bin/bash + +# Note: This script is deprecated and has been replaced by the script runas +# which is able to handle mrpe, local and plugin scripts + echo '<<<mrpe>>>' grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe_include.cfg" | \ while read user include diff --git a/agents/plugins/runas b/agents/plugins/runas new file mode 100755 index 0000000..ed514d6 --- /dev/null +++ b/agents/plugins/runas @@ -0,0 +1,61 @@ +#!/bin/bash + +# This plugin allows to execute mrpe, local and plugin skripts with a different user context +# It is configured with in the file $MK_CONFDIR/runas.cfg +# +# Syntax: +# [Script type] [User context] [File / Directory] +# +# Example configuration +# # Execute mrpe commands in given files under specific user +# # A '-' means no user context switch +# mrpe ab /home/ab/mrpe_commands.cfg +# mrpe lm /home/lm/mrpe_commands.cfg +# mrpe - /root/mrpe/extra_commands.cfg +# +# Excecute -executable- files in the target directories under specific user context +# plugin ab /var/ab/plugins +# local ab /var/ab/local +# + +grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/runas.cfg" | \ +while read type user include +do + if [ -d $include -o $ "$type" == "mrpe" -a -f $include $ ] ; then + PREFIX="" + if [ "$user" != "-" ] ; then + PREFIX="su $user -c " + fi + + # mrpe includes + if [ "$type" == "mrpe" ] ; then + echo "<<<mrpe>>>" + grep -Ev '^[[:space:]]*($|#)' "$include" | \ + while read descr cmdline + do + PLUGIN=${cmdline%% *} + if [ -n "$PREFIX" ] ; then + cmdline="$PREFIX\"$cmdline\"" + fi + OUTPUT=$(eval "$cmdline") + echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1 + echo + done + # local and plugin includes + elif [ "$type" == "local" -o "$type" == "plugin" ] ; then + if [ "$type" == "local" ] ; then + echo "<<<local>>>" + fi + find $include -executable -type f | \ + while read filename + do + if [ -n "$PREFIX" ] ; then + cmdline="$PREFIX\"$filename\"" + else + cmdline=$filename + fi + $cmdline + done + fi + fi +done

10 years

Check_MK Git: check_mk: ups checks now supports also GE devices ( Thanks to Andy Taylor)

by Bastian Kuhn

Module: check_mk Branch: master Commit: d5303f7e6ce0ea2b60dfe115036713df8ee57f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5303f7e6ce0ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 28 16:01:18 2014 +0200 ups checks now supports also GE devices (Thanks to Andy Taylor) Thanks to a patch from Andy Taylor, our ups checks now supporting devcies from GE. --- .werks/165 | 9 +++++++++ ChangeLog | 1 + checks/ups_bat_temp | 2 +- checks/ups_capacity | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- checks/ups_test | 2 +- 10 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.werks/165 b/.werks/165 new file mode 100644 index 0000000..1902754 --- /dev/null +++ b/.werks/165 @@ -0,0 +1,9 @@ +Title: ups checks now supports also GE devices (Thanks to Andy Taylor) +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401285562 +Class: feature + +Thanks to a patch from Andy Taylor, our ups checks now supporting devcies from GE. + diff --git a/ChangeLog b/ChangeLog index 8e4e1b2..6cde871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 0926 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable * 0163 kaspersky_av_quarantine,kaspersky_av_tasks,kaspersky_av_updates: New checks for kaspersky anti virus on linux * 0164 symantec_av_progstate,symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux + * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 589b665..068c320 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -57,7 +57,7 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33",".1.3.6.1.2.1.33.2"] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), } diff --git a/checks/ups_capacity b/checks/ups_capacity index 9fee589..edb63e1 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -60,5 +60,5 @@ check_info["ups_capacity"] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 4aca826..ae7d0d0 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,5 +60,5 @@ check_info['ups_in_freq'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] \ + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 6fc089e..2971c14 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -42,5 +42,5 @@ check_info['ups_in_voltage'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 04395ef..6da165d 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -58,5 +58,5 @@ check_info['ups_out_load'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 0b5c731..4257c41 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -42,5 +42,5 @@ check_info['ups_out_voltage'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_power b/checks/ups_power index 68876e1..29bb49a 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -62,5 +62,5 @@ check_info['ups_power'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_test b/checks/ups_test index f08c89b..0a8249f 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -132,6 +132,6 @@ check_info['ups_test'] = { "has_perfdata" : False, "group" : "ups_test", "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [3,5,6,4 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.534.1"] + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.2" ] }

10 years, 1 month

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6bf40ba79d29bb38271ea7262e04c418c07d1966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bf40ba79d29bb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 28 16:01:48 2014 +0200 merge conflict ---

10 years, 1 month

Check_MK Git: check_mk: windows agent: now able to evaluate logfiles written in unicode (2 bytes per character)

by Andreas Boesl

Module: check_mk Branch: master Commit: b404925175153d71ec5757a0497dca8bf5406315 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b404925175153d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 28 15:45:43 2014 +0200 windows agent: now able to evaluate logfiles written in unicode (2 bytes per character) The windows agent was unable to process logfiles which were written as unicode. Those files had binary zeros every other byte, rendering the normal "readline" logfile processing useless.<br> The agent can now read unicode files correctly, convert each line to a multibyte representation (most of the time it is only a single byte) and apply the configured logfile patterns accordingly. --- .werks/927 | 12 +++ ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 205312 -> 206848 bytes agents/windows/check_mk_agent.cc | 152 +++++++++++++++++++++++++++++++--- agents/windows/check_mk_agent.exe | Bin 175104 -> 176640 bytes agents/windows/install_agent-64.exe | Bin 158331 -> 159073 bytes agents/windows/install_agent.exe | Bin 155451 -> 156101 bytes 7 files changed, 154 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b404925175…

10 years, 1 month

Check_MK Git: check_mk: agent_ibmsvc: improved error handling

by Bastian Kuhn

Module: check_mk Branch: master Commit: bfe2a311e50c5c65d7f9f916f53bd8652fc53b60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfe2a311e50c5c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 28 15:36:18 2014 +0200 agent_ibmsvc: improved error handling --- agents/special/agent_ibmsvc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index ba51bba..d536d9d 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -27,7 +27,7 @@ # needs to issue a command like # ssh USER@HOSTNAME 'echo \<\<\<ibm_svc_host:sep$58$\>\>\>; lshost -nohdr -delim :; echo \<\<\<ibm_svc_license:sep$58$\>\>\>; lslicense -delim :; echo \<\<\<ibm_svc_mdisk:sep$58$\>\>\>; lsmdisk -nohdr -delim :; echo \<\<\<ibm_svc_mdiskgrp:sep$58$\>\>\>; lsmdiskgrp -nohdr -delim :; echo \<\<\<ibm_svc_node:sep$58$\>\>\>; lsnode -nohdr -delim :; echo \<\<\<ibm_svc_nodestats:sep$58$\>\>\>; lsnodestats -nohdr -delim :; echo \<\<\<ibm_svc_system:sep$58$\>\>\>; lssystem -delim :; echo \<\<\<ibm_svc_systemstats:sep$58$\>\>\>; lssystemstats -nohdr -delim :' -import sys, os, getopt, re +import sys, os, getopt, re, subprocess import inspect, pprint # FOR DEBUGGING @@ -182,8 +182,12 @@ cmd += "'" if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) -for line in os.popen(cmd).readlines(): - print line, +try: + for line in subprocess.check_output(cmd, shell=True).split('\n'): + print line, +except subprocess.CalledProcessError: + print "Error connecting via ssh" + sys.exit(1) #############################################################################

10 years, 1 month

Check_MK Git: check_mk: treasures: wato_include_hosts.mk: merge hosts of an existing hosts.mk with hosts from an include folder

by Andreas Boesl

Module: check_mk Branch: master Commit: 7c8410b9f2c7436c4bc880cfa0c28d26ec484fc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8410b9f2c743… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 28 15:34:02 2014 +0200 treasures: wato_include_hosts.mk: merge hosts of an existing hosts.mk with hosts from an include folder --- doc/treasures/wato_include_hosts.mk | 68 +++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/doc/treasures/wato_include_hosts.mk b/doc/treasures/wato_include_hosts.mk new file mode 100644 index 0000000..9ae3fcb --- /dev/null +++ b/doc/treasures/wato_include_hosts.mk @@ -0,0 +1,68 @@ + +# This file needs to be appended to the existing hosts.mk file +# Upon parsing the hosts.mk file the include dir is evaluated. +# Within the include dir there are host definition files with the format +# +# ipaddress:1.2.3.4 +# tag_agent:cmk-agent +# tag_criticality:critical +# tag_networking:lan +# alias:Alias of Host A +# +# If the WATO folder is saved the already existing hosts are merged with +# the hosts of the included files. After the hosts.mk is newly written this +# script appendix is removed, too. + +_include_dir = ".devops" + +import os, inspect +def add_host_data(_filename): + global all_hosts, host_attributes, ipaddresses, extra_host_conf + + try: + _host_ip = None + _tags_plain = [] + _host_attributes = {} + _alias = None + + _lines = file(_filename).readlines() + _hostname = os.path.basename(_filename) + for _line in _lines: + _what, _data = _line.split(":",1) + _data = _data[:-1] + if _what.startswith("tag_"): + _tags_plain.append(_data) + elif _what == "ipaddress": + _host_ip = _data + elif _what == "alias": + _alias = _data + _host_attributes.update({_what: _data}) + + + all_hosts += [ _hostname + "|" + "|".join(_tags_plain) + "|/" + FOLDER_PATH + "/" ] + if _host_ip: + ipaddresses.update({_hostname: _host_ip}) + + if _alias: + extra_host_conf.setdefault('alias', []).extend([(_alias, [_hostname])]) + + host_attributes.update({_hostname: _host_attributes}) + except Exception, e: + pass + +_hosts_mk_path = os.path.dirname(inspect.getsourcefile(lambda _: None)) +for _dirpath, _dirname, _filenames in os.walk(_hosts_mk_path + "/" + _include_dir): + for _filename in _filenames: + if _filename.startswith("."): + continue + # Host ist bereits im Montoring -> nichts weiter tun + for _hh in all_hosts: + if _hh.startswith(_filename + "|"): + continue + + # Host ins monitoring aufnehmen + add_host_data("%s/%s" % (_dirpath, _filename)) + + +# TODO: remove hosts where no include file pendant is available +# This can be done by evaluating the host tag for the wato folder

10 years, 1 month

Check_MK Git: check_mk: Fixed bug in if.include

by Bastian Kuhn

Module: check_mk Branch: master Commit: 94e79204261b3999826d4dcfafae1f3b02fcacdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94e79204261b39… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 28 13:15:09 2014 +0200 Fixed bug in if.include --- checks/if.include | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checks/if.include b/checks/if.include index 9b6dd34..dec76cd 100644 --- a/checks/if.include +++ b/checks/if.include @@ -144,6 +144,10 @@ def inventory_if_common(info, has_nodeinfo = False): ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) + # Fix bug in brocade switches + if ifIndex == '': + continue + # Fix bug in TP Link switches ifSpeed = saveint(ifSpeed) if ifSpeed > 9000000 * 100 * 1000:

10 years, 1 month

Check_MK Git: check_mk: notify_multitech.py: added documentation for the iSMS Gateway

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 505743f5778b40f4c8a1ab953ebc39d3bab1c705 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505743f5778b40… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed May 28 12:19:04 2014 +0200 notify_multitech.py: added documentation for the iSMS Gateway --- doc/treasures/notify_multitech.py | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/doc/treasures/notify_multitech.py b/doc/treasures/notify_multitech.py index 8c9c2c0..ba3f949 100755 --- a/doc/treasures/notify_multitech.py +++ b/doc/treasures/notify_multitech.py @@ -2,9 +2,53 @@ # Send SMS via MultiTech SMS-Gateway # encoding: utf-8 # # This notification script can be put below share/check_mk/notifications. It sends -# SMS via a MultiTech SMS-Gateway. Please add your personal configuration directly in this +# SMS via a MultiTech SMS-Gateway +# (http://www.multitech.com/en_US/PRODUCTS/Families/MultiModemiSMS/) +# Please add your personal configuration directly in this # script. The target phone number is take from the contact's pager address. # You can override this by specifying it as a parameter +# +# Some hints for setup of the MultiTech SMS-Gateway: +# +# * Please use at least Firmware Version 1.51.9 earlier versions did cause much +# trouble. The devices are not yet delivered with this version, so an upgrade is +# required. You get SF100-u-v1.51.9-16Jan2013.bin.zip e. g. at +# https://shop.netways.de/attachment.php?id_attachment=64 +# +# * Deactivate the PIN of the SIM card. This can be done most easy by inserting +# the SIM into a mobile phone. +# +# * By default, the device has IP 192.168.2.1, user admin, password admin. +# You can change these in the admin interface by browser (http). +# +# * Look into the status information in the web interface to make sure, the +# SIM card is displayed as enabled there. +# If not: Make sure you did insert the SIM card with contacts to the bottom, +# and the cut off corner to the front right. +# +# * Under +# Administration > Admin Access > Allowed Networks +# you can restrict access to the device. Make sure, the IPs of the sending +# Check_MK machines are included there. +# +# * Under +# SMS Services > Send API +# enable HTTP Status, set port to 80 +# +# * Under +# SMS Services > International Number +# clear the check box "Disable International Number" +# +# * Under +# SMS Services > Send SMS Users +# create a user for Check_MK. This one needs to be entered below. +# +# * Do not forget to go to the "Save & Restart" tab and click "save" there. +# This writes your changes into the flash memory of the device. Otherwise +# they will be lost on next reboot. +# + + import sys, os, urllib # This does not need to be changed

10 years, 1 month

Check_MK Git: check_mk: ValueSpec Age: make days field 3 numbers width

by Mathias Kettner

Module: check_mk Branch: master Commit: afa4a7bfb06c83585038f9fee1a87df51b7824f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa4a7bfb06c83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 28 11:08:47 2014 +0200 ValueSpec Age: make days field 3 numbers width --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4d2246e..477ed21 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -176,7 +176,7 @@ class Age(ValueSpec): html.write("<div>") if self._label: html.write(self._label + " ") - html.number_input(varprefix+'_days', days, 2) + html.number_input(varprefix+'_days', days, 3) html.write(" %s " % _("days")) html.number_input(varprefix+'_hours', hours, 2) html.write(" %s " % _("hours"))

10 years, 1 month

Check_MK Git: check_mk: Fix computation of number of cores and cpus

by Mathias Kettner

Module: check_mk Branch: master Commit: 78969d9ec8fe9d2b5bf090edc5bee120007791f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78969d9ec8fe9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 27 17:30:22 2014 +0200 Fix computation of number of cores and cpus --- inventory/lnx_cpuinfo | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/inventory/lnx_cpuinfo b/inventory/lnx_cpuinfo index 4f6f904..8a94858 100644 --- a/inventory/lnx_cpuinfo +++ b/inventory/lnx_cpuinfo @@ -57,7 +57,8 @@ # Note: This node is also being filled by dmidecode def inv_lnx_cpuinfo(info): node = inv_tree("hardware.cpu.") - num_cpus = 0 + num_threads_total = 0 + num_sockets = 0 for varname, value in info: if varname == "cpu cores": node["cores_per_cpu"] = int(value) @@ -74,15 +75,19 @@ def inv_lnx_cpuinfo(info): node["cache_size"] = int(value.split()[0]) * 1024 # everything is normalized to bytes! elif varname == "model name": node["model"] = value + # For the following two entries we assume that all + # entries are numbered in increasing order in /proc/cpuinfo. elif varname == "processor": - num_cpus = int(value) + 1 + num_threads_total = int(value) + 1 + elif varname == "physical id": + num_sockets = int(value) + 1 - if num_cpus: + if num_threads_total: node.setdefault("cores_per_cpu", 1) node.setdefault("threads_per_cpu", 1) - node["cores"] = num_cpus * node["cores_per_cpu"] - node["threads"] = num_cpus * node["threads_per_cpu"] - node["cpus"] = num_cpus + node["cores"] = num_sockets * node["cores_per_cpu"] + node["threads"] = num_sockets * node["threads_per_cpu"] + node["cpus"] = num_sockets inv_info['lnx_cpuinfo'] = { "inv_function" : inv_lnx_cpuinfo,

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014