Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64282 discussions

Check_MK Git: check_mk: AIX agent installation - add some readability

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6bc932f8544476bce6ef1ddd521c0731424d9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6bc932f854447… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri May 18 07:33:32 2012 +0200 AIX agent installation - add some readability --- doc/agents/README.AIX | 73 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 52 insertions(+), 21 deletions(-) diff --git a/doc/agents/README.AIX b/doc/agents/README.AIX index 7b90941..ff60248 100644 --- a/doc/agents/README.AIX +++ b/doc/agents/README.AIX @@ -1,58 +1,89 @@ # Install the Agent +To install the agent, simply copy it to a location where it can be executed. +With inetd, this should be something in the basic system search path like /usr/bin. cp /tmp/check_mk_agent.aix /usr/bin/check_mk_agent # Agent Config -Change the defaults from +Inside the Agent you'll find two config settings, which need to be changed from the +defaults to a value that is OK on your system. +Edit /usr/bin/check_mk_agent and change export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" -to +for example to these paths. export MK_CONFDIR="/etc/check_mk" export MK_LIBDIR="/usr/lib/check_mk_agent" +MK_CONFDIR can hold configuration files and MK_LIBDIR is used for the plugins. -And create the directories +Then create the directories accordingly: mkdir /etc/check_mk /usr/lib/check_mk_agent /usr/lib/check_mk_agent/local /usr/lib/check_mk_agent/plugins - # INETD SETUP -/etc/services -check_mk 6556/tcp +In most setups, the agent is called via inetd. To setup inetd for check_mk on AIX, +start by adding the TCP service name to /etc/services: +edit it and add the following entry: +check_mk 6556/tcp # Check_MK monitoring agent + + +# Access security +Besides SSH which works anywhere, on AIX you have the choices of using inetd with or +without TCPWrappers. TCPWrappers are not available on AIX by default. +In the following you find instructions for setting up with and without TCPWrappers. +Note - in our testing, tcpwrappers only delivered correct example every 2nd call, so +it's not recommended to use. +The third way is the AIX internal firewall, which is called 'genfilt'. +Inetd is configured with the file /etc/inetd.conf. Add the service to it with correct path. # WITHOUT TCPWRAPPERS -/etc/inetd.conf check_mk stream tcp nowait root /usr/bin/check_mk_agent + +Then enable the service using: +# Restart inetd +refresh -s inetd + +Alternatively, # WITH TCPWRAPPERS -or, if your system has TCPWrappers +edit /etc/inetd.conf to point to the tcpd daemon. check_mk stream tcp nowait root /path/to/tcpd /usr/bin/check_mk_agent -Note - in our testing, tcpwrappers only delivered correct example every 2nd call. -One might be able to use genfilt as an alternate firewall -and add an allow entry in /etc/hosts.allow: -check_mk: nagioshost, ip_of_nagios_host, 127.0.0.1 +and add an allow entry in /etc/hosts.allow that restricts the agent access. +check_mk: nagioshost, ip_of_nagios_host, 127.0.0.1 # Restart inetd refresh -s inetd + + + + # Extra FEATURES -If you wish to have more stats, -there's 3 ways: +If you wish to have more stats from the server, there are 3 ways. +Sort order is by ease of configuration: + a) +enable SNMP and install the correct bundles for host stats +This will probably just work[tm] so this is what we recommend you to try first. +AIX can do SNMPv3 since 5.2 so you can secure the access if needed. See: +http://pic.dhe.ibm.com/infocenter/aix/v6r1/index.jsp?topic=%2Fcom.ibm.aix.commadmn%2Fdoc%2Fcommadmndita%2Fsnmpv3_intro.htm + + +b) you need to get a hold of the utilities for perfstat from http://www.ibm.com/developerworks/wikis/display/WikiPtype/ryo Do not use the binaries since they do an eternal loop. Instead download -adapt.c, cpu.c, memory.c and net.c and remove the loops. - -This code seems to be not GPLed, so we cannot include it. - +adapt.c, cpu.c, memory.c and net.c and remove the loops. -b) -enable SNMP and install the correct bundles for host stats +This code seems to be not GPLed, so we cannot include it. In fact it seems to have no +license at all. -c) compile install libstatgrab (recommended!) +c) compile install libstatgrab +Compiling libstatgrab should be OK on 5.3, on 6.x we ran into bigger issues. +There was some changes in AIX6.1 to make it easier to code for and libstatgrab +still has an definition to do complex stuff, if the OS is AIX.

12 years, 4 months

Check_MK Git: check_mk: get rid of items where we had native checks for

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3fa34f01a43968064d330ad961ec58eac0556cc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa34f01a43968… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 15:25:52 2012 +0200 get rid of items where we had native checks for --- agents/hpux/hpux_statgrab | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/hpux/hpux_statgrab b/agents/hpux/hpux_statgrab index f87c9a8..f0a1a29 100644 --- a/agents/hpux/hpux_statgrab +++ b/agents/hpux/hpux_statgrab @@ -7,9 +7,9 @@ if which statgrab > /dev/null ; then - if statgrab const. cpu. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null + if statgrab const. cpu. general. mem. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null then - for s in proc cpu net load page + for s in proc cpu page do echo "<<<statgrab_$s>>>" cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /'

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73bac3cc1fa0a067d71d0955eb99edfdd9370a49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73bac3cc1fa0a0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri May 18 07:33:51 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Further layout fixes: in host configuration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 12727cc55e86a6f5c7b11d9e4d2b6a5bb7c2ed5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12727cc55e86a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 23:46:58 2012 +0200 Further layout fixes: in host configuration --- web/htdocs/wato.css | 25 ++++++++----------------- web/htdocs/wato.py | 18 +++++++----------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 21f5b44..280e35d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -186,27 +186,18 @@ Boston, MA 02110-1301 USA. } .wato div.inherited { - color: #000; - font-weight: bold; -} -.wato td.inherited { - color: #666; -} -.wato div.inherited h3 { - margin: 0px; - padding: 0px; - font-size: 8pt; - color: #468; + color: #444; } -.wato div.inherited h3 a { - color: #468; +.wato div.inherited a { + color: #444; } -.wato h3 { - margin-bottom: 2px; - color: white; - font-size: 13pt; +.wato div.inherited b { + color: black; font-weight: normal; } +.wato td.inherited { + color: #666; +} /* host validation error */ table.validationerror { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fab34dc..46130e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4694,37 +4694,33 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute % (attrname, active and "display: none" or "")) # in bulk mode we show inheritance only if *all* hosts inherit + explanation = "" if for_what == "bulk": if num_haveit == 0: - html.write("<h3>" + inherited_from + "</h3>") + explanation = " (" + inherited_from + ")" value = inherited_value elif not unique: - html.write(_("<i>This value differs between the selected hosts.</i>")) + explanation = _("This value differs between the selected hosts.") else: value = values[0] elif for_what in [ "host", "folder" ]: - html.write("<h3>" + inherited_from + "</h3>") + explanation = " (" + inherited_from + ")" value = inherited_value if for_what != "search" and not (for_what == "bulk" and not unique): tdclass, content = attr.paint(value, "") if not content: - content = "<i>" + _("(empty)") + "</i>" - html.write(content) + content = _("empty") + html.write("<b>" + content + "</b>") + html.write(explanation) html.write("</div>") - # html.write("</td></tr>\n") if len(topics) > 1: - # html.write("</table>") - # html.end_foldable_container() # end of topic if topic_is_volatile: volatile_topics.append((topic or _("Basic settings")).encode('utf-8')) - if topic == topics[-1]: - pass - # html.write('<table class="form">') def dump_json(obj): return repr(obj).replace('None', 'null')

12 years, 4 months

Check_MK Git: check_mk: Styling updates for new forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7d3664af550242bb819ace1c2848265a13bcdf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d3664af55024… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 22:50:02 2012 +0200 Styling updates for new forms --- web/htdocs/images/nform_background.png | Bin 0 -> 214 bytes web/htdocs/pages.css | 6 ++++-- web/htdocs/wato.py | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/images/nform_background.png b/web/htdocs/images/nform_background.png new file mode 100644 index 0000000..781f4e6 Binary files /dev/null and b/web/htdocs/images/nform_background.png differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index e31141d..f16bbda 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -496,7 +496,9 @@ table.nform { border-radius: 5px; box-shadow: 0px 0px 2px #000; margin-bottom: 10px; - background-image: url("images/white_30percent.png"); + /* background-image: url("images/white_30percent.png"); */ + background-image: url("images/nform_background.png"); + /* background-color: #7796a3; */ background-repeat: repeat; border-color: #86A9B8 #22404D #22414D #86A9B8; border-width: 1px; @@ -512,7 +514,7 @@ table.nform tr.heading > td { background-repeat: repeat; height: 20px; vertical-align: middle; - padding-left: 7px; + padding-left: 10px; } table.nform tr.heading > td:hover { background-image: url("images/white_20percent.png"); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e087343..aeea1db 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5184,14 +5184,16 @@ def mode_globalvars(phase): if varname in current_settings: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), - "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) + # "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) + "snapin_switch_" + (current_settings[varname] and "on" or "off")) else: html.write('<a href="%s">%s</a>' % (edit_url, valuespec.value_to_text(current_settings[varname]))) else: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), - "snapin_greyswitch_" + (defaultvalue and "on" or "off")) + # "snapin_greyswitch_" + (defaultvalue and "on" or "off")) + "snapin_switch_" + (defaultvalue and "on" or "off")) else: html.write('<a href="%s">%s</a>' % (edit_url, valuespec.value_to_text(defaultvalue)))

12 years, 4 months

Check_MK Git: check_mk: Finalized layout of global settings and rulesets

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd25d713a39fec3939da79eabc9f4a6ca1b2133b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd25d713a39fec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 23:29:45 2012 +0200 Finalized layout of global settings and rulesets --- web/htdocs/forms.py | 9 +++++++++ web/htdocs/htmllib.py | 1 + web/htdocs/pages.css | 4 ++-- web/htdocs/wato.css | 35 ++++++++++++++++++++++++++--------- web/htdocs/wato.py | 23 ++++++++++------------- 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 7dde43d..484c975 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -122,6 +122,15 @@ def header(title, isopen = True, table_id = ""): g_header_open = True g_section_open = False +# container without legend and content +def container(): + global g_section_open + if g_section_open: + html.write('</td></tr>') + html.write('<tr style="display: %s"><td colspan=2 class=container>' % + (not g_section_isopen and "none" or "")) + g_section_open = True + def section(title = None, checkbox = None, id = ""): global g_section_open if g_section_open: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5bd1612..bfc73eb 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -282,6 +282,7 @@ class html: def end_form(self): self.write("</form>\n") + self.form_name = None def form_submitted(self): return self.has_var("filled_in") diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f16bbda..1634f97 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -544,8 +544,8 @@ table.nform td.legend div.title.withcheckbox { max-width: 210px; margin-right: 6px; } -table.nform td.legend .dots { - color: #367; +table.nform .dots { + color: #444; margin-left: 5px; } table.nform td.legend div.checkbox { diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 4ce7e26..21f5b44 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -242,10 +242,11 @@ table.validationerror img { /* Path to current folder at top of screen */ .wato div.folderpath { + margin-top: -5px; margin-bottom: 8px; height: 30px; position: relative; - left: 3px; + left: 4px; } .wato div.folderpath ul { @@ -700,16 +701,20 @@ form#form_timeperiod td.vlof_content { } /* page "Rulesets" */ -.wato .rulesets { - background-color: #eeeeee; - padding: 3px 5px; - width: 100%; - /* box-shadow: 0px 0px 2.5px #888; */ +.wato td.rulesets { + padding-left: 0px; +} +.wato .rulesets table.nform > tbody > tr > td.container { + height: auto; +} +div.rulesets table.nform tr.bottom td { + height: 5px; } .wato .rulesets div.ruleset { float: left; - margin-right: 20px; + margin-left: 10px; + margin-right: 10px; } .wato .rulesets div.ruleset div.text { @@ -728,13 +733,11 @@ form#form_timeperiod td.vlof_content { white-space: nowrap; margin-right: 3px; } - .wato .rulesets div.ruleset a:hover { text-decoration: underline; } .wato .rulesets div.ruleset .dots { - color: #888; overflow: hidden; } @@ -744,6 +747,20 @@ form#form_timeperiod td.vlof_content { text-align: right; } +.wato .rulesets div.ruleset a.nonzero { + /* font-weight: bold; */ +} +.wato .rulesets div.ruleset a.zero { +} + +.wato .rulesets div.ruleset div.rulecount.nonzero { + /* font-weight: bold; */ +} + +.wato .rulesets div.ruleset div.rulecount.zero { + /* color: #444; */ +} + /* Page edit_ruleset */ div.varname { color: white; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aeea1db..fab34dc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9097,6 +9097,7 @@ def mode_rulesets(phase): do_folding = len(groupnames) > 1 something_shown = False + html.write('<div class=rulesets>') # Loop over all ruleset groups for groupname in groupnames: # Show information about a ruleset @@ -9129,18 +9130,12 @@ def mode_rulesets(phase): continue if not title_shown: - if something_shown: - html.write("</td></tr></table>") - # if do_folding: - # html.end_foldable_container() if '/' in groupname: subgroupname = groupname.split("/", 1)[1] else: subgroupname = title - # if do_folding: - # html.begin_foldable_container("rulesets", groupname, False, subgroupname, indent=False) - html.write("<h3>%s</h3>" % subgroupname) - html.write('<table class="rulesets"><tr><td>') + forms.header(subgroupname) + forms.container() title_shown = True something_shown = True @@ -9151,20 +9146,20 @@ def mode_rulesets(phase): view_url = make_link(url_vars) html.write('<div class=ruleset><div class=text>') - html.write('<a class=title><a href="%s">%s</a>' % (view_url, rulespec["title"])) + html.write('<a class="%s" href="%s">%s</a>' % + (num_rules and "nonzero" or "zero", view_url, rulespec["title"])) html.write('<span class=dots>%s</span></div>' % ("." * 100)) if num_local_rules: if only_host: title = _("There are %d rules explicitely listing this host." % num_local_rules) else: title = _("There are %d rules defined in the current folder." % num_local_rules) - html.write('<div class=rulecount title="%s">%d</div>' % (title, num_rules)) + html.write('<div class="rulecount %s" title="%s">%d</div>' % + (num_rules and "nonzero" or "zero", title, num_rules)) html.write('</div>') if something_shown: - html.write("</td></tr></table>") - # if do_folding: - # html.end_foldable_container() + forms.end() else: if only_host: @@ -9172,6 +9167,8 @@ def mode_rulesets(phase): else: html.write("<div class=info>" + _("There are no rules defined in this folder.") + "</div>") + html.write('</div>') + def create_new_rule_form(rulespec, hostname = None, item = None): html.begin_form("new_rule") html.write(_("Create a new rule: "))

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a4954d57798b6c511b20a8148888dced40f4e5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a4954d57798b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 22:34:38 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Converted layout of global settings to new forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d125c2e6ae47be1a928f05363be6d96a934d92fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d125c2e6ae47be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 22:34:35 2012 +0200 Converted layout of global settings to new forms --- web/htdocs/forms.py | 5 +++-- web/htdocs/wato.css | 48 +++++++++++++++++++----------------------------- web/htdocs/wato.py | 17 ++++++----------- 3 files changed, 28 insertions(+), 42 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 3674208..7dde43d 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -116,8 +116,9 @@ def header(title, isopen = True, table_id = ""): table_id = '' html.write('<table %s class=nform>' % table_id) fold_id = strip_bad_chars(title) - g_section_isopen = html.begin_foldable_container(html.form_name, fold_id, isopen, title, indent="nform") - html.write('<tr class=top style="display: %s"><td colspan=2></td></tr>' % (not isopen and "none" or "")) + g_section_isopen = html.begin_foldable_container( + html.form_name and html.form_name or "nform", fold_id, isopen, title, indent="nform") + html.write('<tr class=top style="display: %s"><td colspan=2></td></tr>' % (not g_section_isopen and "none" or "")) g_header_open = True g_section_open = False diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index ec67656..4ce7e26 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -751,45 +751,35 @@ div.varname { } /* page "global settings*/ -.wato .globalvars { - background-color: #eeeeee; - padding: 3px 5px; - width: 100%; -} - -.wato .globalvars a { - color: black; +.wato div.globalvars a { text-decoration: none; + color: black; } -.wato .globalvars a:hover { + +.wato div.globalvars a:hover { text-decoration: underline; } -.wato .globalvars div.text { - width: 335px; - padding-right: 3px; - overflow: hidden; -} -.wato .globalvars td.left { - width: 339px; - overflow: hidden; - white-space: nowrap; -} -.wato .globalvars td.right { - text-align: left; -} -.wato .globalvars div.text .dots { - color: #888; - overflow: hidden; +.wato div.globalvars td.content img.iconbutton { + width: 60px; + height: 16px; } -.wato .globalvars td.right img.iconbutton { - width: auto; - height: auto; - margin-left: -3px; + +.wato div.globalvars td.legend { + padding-top: 0px; } +.wato div.globalvars td.legend { + width: 350px; +} +.wato div.globalvars td.legend div.title { + max-width: 350px; +} +.wato div.globalvars td { + height: 20px; +} /* Table in page "Global variables" */ .wato table.data.globalvars { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 762065d..e087343 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5161,13 +5161,11 @@ def mode_globalvars(phase): groupnames = g_configvar_groups.keys() groupnames.sort() + html.write('<div class=globalvars>') for groupname in groupnames: - # html.begin_foldable_container("globalvars", groupname, False, groupname, indent=False) - html.write("<h3>%s</h3>" % groupname) - html.write('<table class=globalvars>') + forms.header(groupname, isopen=False) for domain, varname, valuespec in g_configvar_groups[groupname]: - html.write('<tr>') if domain == "check_mk" and varname not in default_values: if config.debug: raise MKGeneralException("The configuration variable <tt>%s</tt> is unknown to " @@ -5178,13 +5176,11 @@ def mode_globalvars(phase): defaultvalue = default_values.get(varname, valuespec.default_value()) edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) + title = '<a href="%s">%s</a>' % (edit_url, valuespec.title()) + forms.section(title) - html.write('<td class=left><div class=text>' - '<a href="%s">%s</a><span class=dots>%s</span></div></td>' % (edit_url, valuespec.title(), - '.' * 100)) toggle_url = make_action_link([("mode", "globalvars"), ("_action", "toggle"), ("_varname", varname)]) - html.write('<td class=right>') if varname in current_settings: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), @@ -5199,9 +5195,8 @@ def mode_globalvars(phase): else: html.write('<a href="%s">%s</a>' % (edit_url, valuespec.value_to_text(defaultvalue))) - html.write("</td>") - html.write('</tr>') - html.write("</table>") + forms.end() + html.write('</div>') def mode_edit_configvar(phase):

12 years, 4 months

Check_MK Git: check_mk: cleanup documentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 839483bf89c0889a2c54da18460044a726f661b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=839483bf89c088… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 14:27:21 2012 +0200 cleanup documentation --- checks/vmware_state | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/vmware_state b/checks/vmware_state index 04878a9..57cb9d2 100644 --- a/checks/vmware_state +++ b/checks/vmware_state @@ -29,19 +29,19 @@ # [2009-11-12 10:40:30.086 'App' 3076453184 info] Current working directory: /usr/lib/check_mk_agent/plugins # Found VM: # moref:32 -# name:ras-uss -# uuid:501e8429-18ed-3097-a521-93932203e5db -# ipaddr:193.18.239.33 +# name:name_of_vm +# uuid:xxxxxxxxxxxx +# ipaddr:192.168.1.5 # Found VM: # moref:48 -# name:zmucgw4 -# uuid:564d7c29-a5ed-8dd5-4bae-3e9177d8628d -# ipaddr:172.19.15.52 +# name:abcdef +# uuid:xxxxxxxxx +# ipaddr:12.34.56.78 # [2009-11-12 10:40:30.215 'vcbVmName' 3076453184 warning] IP address not set. # Found VM: # moref:80 -# name:zmucfi01 -# uuid:501e70b5-6aa3-25fa-1550-c1cf5f8a2025 +# name:name_of_vm +# uuid:xxxxxxxxx # ipaddr: def inventory_vmware_state(info):

12 years, 4 months

Check_MK Git: check_mk: Veritas Agent Plugins: Cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7a75e2f4feb537df33476e5f2e2764a839ac88b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a75e2f4feb53… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 12:59:17 2012 +0200 Veritas Agent Plugins: Cleanup --- agents/plugins/veritas/vxvm_multipath | 2 +- agents/plugins/veritas/vxvm_volumes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath index e76658d..281747d 100755 --- a/agents/plugins/veritas/vxvm_multipath +++ b/agents/plugins/veritas/vxvm_multipath @@ -9,7 +9,7 @@ -if type vxdmpadm ; then +if type vxdmpadm >/dev/null; then echo '<<<vxvm_multipath>>>' # dmpnode storagedevice state attribute vxdmpadm getsubpaths | grep -vw DMPNODENAME | awk '{print $4" "$5" "$2" "$3}' diff --git a/agents/plugins/veritas/vxvm_volumes b/agents/plugins/veritas/vxvm_volumes index 573c1a8..46c46fe 100755 --- a/agents/plugins/veritas/vxvm_volumes +++ b/agents/plugins/veritas/vxvm_volumes @@ -2,11 +2,11 @@ if type vxdg > /dev/null; then + echo '<<<vxvm_volumes>>>' # Get a list of the in-use disk groups. # Deported or otherwise inactive needs no performance monitoring DGS=$(vxdg list | grep enabled | awk '{print $1}') if [ "X${DGS}" != "X" ]; then - echo '<<<vxvm_volumes>>>' for DG in $DGS ; do vxprint -g $DG -v -F"%dgname %name %state" # Options: Kilobytes, per Volume

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits