Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Create new helper lib forms.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f68a922c18d4cc32b19b63d6f441372cc7232a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f68a922c18d4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 13:33:03 2011 +0100 Create new helper lib forms.py --- web/htdocs/forms.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 8 +++--- web/htdocs/pages.css | 5 +++ web/htdocs/wato.css | 5 --- 4 files changed, 79 insertions(+), 9 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py new file mode 100644 index 0000000..7ad903e --- /dev/null +++ b/web/htdocs/forms.py @@ -0,0 +1,70 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from lib import * + + +def edit_dictionary(entries, value): + new_value = {} + if html.check_transaction(): + messages = [] + for name, vs in entries: + try: + v = vs.from_html_vars(name) + vs.validate_value(v, name) + new_value[name] = v + except MKUserError, e: + messages.append(vs.title() + ": " + e.message) + html.add_user_error(e.varname, e.message) + if messages: + html.show_error("".join(["%s<br>\n" % m for m in messages])) + else: + return new_value + + html.begin_form("form") + html.write("<table class=form>\n") + first = True + for name, vs in entries: + html.write("<tr><td class=legend>%s" % vs.title()) + if vs.help(): + html.write("<br><i>%s</i>" % vs.help()) + html.write("</td><td class=content>") + if name in value: + v = value[name] + else: + v = vs.default_value() + vs.render_input(name, v) + if first: + vs.set_focus(name) + first = False + html.write("<tr><td class=buttons colspan=2>") + html.button("save", _("Save")) + html.write("</td></tr>\n") + html.write("</table>\n") + html.hidden_fields() + html.end_form() + + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0cbbc74..80d47d8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -322,15 +322,15 @@ class html: (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) - def icon_button(url, help, icon): - html.write('<a href="%s">' + def icon_button(self, url, help, icon): + self.write('<a href="%s">' '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' '</a>\n' % (url, help, icon)) - def empty_icon_button(): - html.write('<img class=trans src="images/trans.png">') + def empty_icon_button(self): + self.write('<img class=trans src="images/trans.png">') def jsbutton(self, varname, text, onclick, style=''): if style: diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 124d389..f0cb41f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -321,6 +321,11 @@ tr.groupheader a:hover { border: 1px solid #fff; } +img.iconbutton { + width: 20px; + height: 20px; +} + /*-------------------------------------------------------------------------. | _____ | | | ___|__ _ __ _ __ ___ ___ | diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index d249448..4021bac 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -290,11 +290,6 @@ Boston, MA 02110-1301 USA. top: 3px; } -.wato img.iconbutton { - width: 20px; - height: 20px; -} - .wato img.trans { width: 24px; }

12 years, 8 months

Check_MK Git: check_mk: WATO: put ValueSpecs into valuespec.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d5c9fad7d01dd55c5932a3fc64d6cf3df97a526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5c9fad7d01dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 12:16:25 2011 +0100 WATO: put ValueSpecs into valuespec.py --- web/htdocs/valuespec.py | 853 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 826 +--------------------------------------------- 2 files changed, 854 insertions(+), 825 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d5c9fad7d…

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0131

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a07fa42afe297a9f1e50750db4b525115cf9d33e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a07fa42afe297a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 09:29:45 2011 +0100 Updated bug entries #0131 --- .bugs/131 | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.bugs/131 b/.bugs/131 index 80999ee..cd10ed2 100644 --- a/.bugs/131 +++ b/.bugs/131 @@ -17,6 +17,14 @@ When monitoring switches the services are ordered as follows: 2 20 -It would be good to cleanup such interface names by adding a leading zero to the numbers to -have a proper sorting of the elements. We can make it like in the brocade checks: As we -know the total number of ports we can decide whether to use 2, 3 or 4 digits. +It would be good to cleanup such interface names by adding a leading zero to +the numbers to have a proper sorting of the elements. We can make it like +in the brocade checks: As we know the total number of ports we can decide +whether to use 2, 3 or 4 digits. + +Because there are switches with more than 100 ports we could first +get the number of ports and then use even more zeroes if neccessary. +Look at brocade_fcport for details. + +Also we could make this configurable in order not to break existing +checks.

12 years, 8 months

Check_MK Git: check_mk: ibm_imm_health: added last missing scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f41dcea52e941a0569c7155dba40e6bc408a90a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f41dcea52e941a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 29 09:25:54 2011 +0100 ibm_imm_health: added last missing scan function --- .bugs/105 | 7 +++++-- ChangeLog | 1 + checks/ibm_imm_health | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/105 b/.bugs/105 index 25a3dfb..04b6e75 100644 --- a/.bugs/105 +++ b/.bugs/105 @@ -1,10 +1,10 @@ Title: SNMP scan: implement missing scan functions Component: core +State: done +Class: cleanup Benefit: 3 -State: open Cost: 5 Date: 2011-01-24 16:22:26 -Class: cleanup Targetversion: 1.2.0 All SNMP checks must define scan functions. Otherwise the scan @@ -14,3 +14,6 @@ There is just one scan function missing: $ doc/helpers/validate_checks -a | grep scan ibm_imm_health snmp_scan manpage + +2011-12-29 09:25:41: changed state open -> done +Should work now. diff --git a/ChangeLog b/ChangeLog index a54e183..01e4823 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ been converted from counters to rates. You might need to delete your existing RRDs of these checks. Sorry, but these have been that last checks still using counters... + * ibm_imm_health: added last missing scan function 1.1.13i2: diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 52f63b8..8783498 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -54,3 +54,6 @@ def check_ibm_imm_health(_no_item, _no_params, info): check_info['ibm_imm_health'] = ( check_ibm_imm_health, "System health", 0, inventory_ibm_imm_health ) snmp_info['ibm_imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) + +snmp_scan_functions['ibm_imm_health'] = lambda oid: \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips")

12 years, 8 months

Check_MK Git: check_mk: Removed old comment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c84b5e7a9725fd1d8462deeed6ddddac27c5cd50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84b5e7a9725fd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 16:57:13 2011 +0100 Removed old comment --- livestatus/src/Query.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 3c514dc..31a9640 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -488,7 +488,6 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - // Can be re-enabled from 1.2i1 logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. " "Please use Columns instead."); parseColumnsLine(line);

12 years, 8 months

Check_MK Git: check_mk: cmk -R/O: use omd re{start, load} core

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5732ae04f10fa2dbaeee0b0f95cec49f42249f2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5732ae04f10fa2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 17:03:50 2011 +0100 cmk -R/O: use omd re{start,load} core --- .bugs/89 | 7 +++++-- .bugs/97 | 7 +++++-- ChangeLog | 1 + modules/check_mk.py | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/89 b/.bugs/89 index 624b6d4..20580d0 100644 --- a/.bugs/89 +++ b/.bugs/89 @@ -1,12 +1,15 @@ Title: Re-Enable StatsGroupBy deprecated warning (1.2i1) Component: livestatus +State: done +Class: cleanup Benefit: 1 -State: open Cost: 1 Date: 2011-01-05 10:33:21 -Class: cleanup Targetversion: 1.2.0 StatsGroupBy ist deprecated. Die Warnung dazu erst ab 1.2i1 aktivieren: src/Query.cc:442 + +2011-12-28 16:57:33: changed state open -> done +Is already enabled sind a couple of versions. diff --git a/.bugs/97 b/.bugs/97 index 1fab09d..7182df8 100644 --- a/.bugs/97 +++ b/.bugs/97 @@ -1,10 +1,10 @@ Title: Restart nagios on OMD - use OMD method Component: core +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-01-22 13:53:40 -Class: cleanup Targetversion: 1.2.0 When doing a restart of Nagios or a config check while running @@ -19,3 +19,6 @@ makes 'omd restart core' work in the first place. --> better wait a time until all Check_MK users surely use OMD versions that have that fix. + +2011-12-28 17:03:08: changed state open -> done +Check_MK now uses omd re{start,load} core if OMD is used. diff --git a/ChangeLog b/ChangeLog index 42f327c..a54e183 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.13i3: Core, Setup, etc.: * cmk -d does now honor --cache and --no-tcp + * cmk -O/-R now uses omd re{start,load} core if using OMD Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/modules/check_mk.py b/modules/check_mk.py index e90115a..d90ea9e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3635,12 +3635,16 @@ def do_restart_nagios(only_reload): action = only_reload and "load" or "start" sys.stdout.write("Re%sing Nagios..." % action) sys.stdout.flush() - command = nagios_startscript + " re%s 2>&1" % action + if omd_root: + command = "omd re%s core 2>&1" % action + else: + command = nagios_startscript + " re%s 2>&1" % action + process = os.popen(command, "r") output = process.read() if process.close(): sys.stdout.write("ERROR: %s\n" % output) - raise MKGeneralException("Cannot re%s Nagios: %s" % (action, output)) + raise MKGeneralException("Cannot re%s the monitoring core: %s" % (action, output)) else: sys.stdout.write(tty_ok + "\n")

12 years, 8 months

Check_MK Git: check_mk: setup: fixed help texts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09fd729b78751febf974041a45afc96a1cda515d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09fd729b78751f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:31:56 2011 +0100 setup: fixed help texts --- scripts/setup.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index b0155c3..cae47b3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -233,13 +233,13 @@ always have to specify the installation path when calling check_mk" ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configuration" \ "Directory where check_mk looks for its main configuration file main.mk. An example configuration file will be installed there if no main.mk is -present from a previous version." +present from a previous version" ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ "The base directory for the software installation of Check_MK. This -directory will get the subdirectories checks, modules, web, locale, -agents and pnp-templates. Note: in previous versions it was possible -to specify each of those directories separately. This is no longer possible." +directory will get the subdirectories checks, modules, web, locale and +agents. Note: in previous versions it was possible to specify each of +those directories separately. This is no longer possible" ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note,

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0088

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da16d4b4df9517b39aff093dbc01bb290227dbbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da16d4b4df9517… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:24:26 2011 +0100 Updated bug entries #0088 --- .bugs/88 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/88 b/.bugs/88 index 84b5611..ba70af7 100644 --- a/.bugs/88 +++ b/.bugs/88 @@ -1,12 +1,16 @@ Title: Move check_mk_templates.cfg to /usr/share/check_mk Component: core +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-01-04 13:51:15 -Class: cleanup Targetversion: 1.2.0 The directory /usr/share/doc is not optimal since the templates are no longer an example but a vital part - usually never changed by the admin. + +2011-12-28 12:05:26: changed state open -> done +This is now implemented. Positive tests are still being waited +for.

12 years, 8 months

Check_MK Git: check_mk: Moved check_mk_templates.cfg to share/check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45b1c1d52133cbda0e343b434d983fc6f739893f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b1c1d52133cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:03:46 2011 +0100 Moved check_mk_templates.cfg to share/check_mk Currently that file was living in doc/, which does not make sense. In order for that the setup process was slightly changed. Instead of five separate directories for agents, checks, etc. there is now one share_dir. --- Makefile | 1 + check_mk.spec | 1 + ...heck_mk_templates.cfg => check_mk_templates.cfg | 0 scripts/setup.sh | 49 ++++++++------------ 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 71eb3b6..569484d 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ dist: mk-livestatus @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) + tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins diff --git a/check_mk.spec b/check_mk.spec index 989884d..6ea088e 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -145,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/check_mk/checks /usr/share/check_mk/modules /usr/share/check_mk/pnp-templates/* +/usr/share/check_mk/check_mk_templates.cfg /usr/share/doc/check_mk %dir /var/lib/check_mk %dir %attr(-,nagios,root) /var/lib/check_mk/counters diff --git a/doc/check_mk_templates.cfg b/check_mk_templates.cfg similarity index 100% rename from doc/check_mk_templates.cfg rename to check_mk_templates.cfg diff --git a/scripts/setup.sh b/scripts/setup.sh index 60d9667..b0155c3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -235,26 +235,11 @@ ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configu An example configuration file will be installed there if no main.mk is present from a previous version." -ask_dir checksdir /usr/share/$NAME/checks $HOMEBASEDIR/checks $OMD_ROOT/local/share/check_mk/checks "check_mk checks" \ - "check_mk's different checks are implemented as small Python scriptlets -that parse and interpret the various output sections of the agents. Where -shall those be installed" - -ask_dir modulesdir /usr/share/$NAME/modules $HOMEBASEDIR/modules $OMD_ROOT/local/share/check_mk/modules "check_mk modules" \ - "Directory for main componentents of check_mk itself. The setup will -also create a file 'defaults' in that directory that reflects all settings -you are doing right now" - -ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web $OMD_ROOT/local/share/check_mk/web "Check_MK Multisite GUI" \ - "Directory where Check_mk's Multisite GUI should be installed. Multisite is -an optional replacement for the Nagios GUI, but is also needed for the -logwatch extension. That directory should [4;1mnot[0m be -in your WWW document root. A separate apache configuration file will be -installed that maps the directory into your URL schema" - -ask_dir localedir /usr/share/$NAME/locale $HOMEBASEDIR/locale $OMD_ROOT/local/share/check_mk/locale "Localization dir" \ - "Base directory for gettext localization files. Multisite comes prepared for localzation -but does not ship any language per default." +ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ + "The base directory for the software installation of Check_MK. This +directory will get the subdirectories checks, modules, web, locale, +agents and pnp-templates. Note: in previous versions it was possible +to specify each of those directories separately. This is no longer possible." ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note, @@ -270,10 +255,6 @@ ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working d other files into this directory. The setup will create several subdirectories and makes them writable by the Nagios process" -ask_dir agentsdir /usr/share/$NAME/agents $HOMEBASEDIR/agents $OMD_ROOT/local/share/check_mk/agents "agents for operating systems" \ - "Agents for various operating systems will be installed here for your -conveniance. Take them and install them onto your target hosts" - ask_title "Configuration of Linux/UNIX Agents" @@ -433,6 +414,11 @@ other systems. Currently this is only Nagvis, but other might follow later." fi +checksdir=$sharedir/checks +modulesdir=$sharedir/modules +web_dir=$sharedir/web +localedir=$sharedir/locale +agentsdir=$sharedir/agents create_defaults () { @@ -450,6 +436,7 @@ cat <<EOF check_mk_version = '$VERSION' default_config_dir = '$confdir' check_mk_configdir = '$confdir/conf.d' +share_dir = '$sharedir' checks_dir = '$checksdir' check_manpages_dir = '$checkmandir' modules_dir = '$modulesdir' @@ -615,6 +602,8 @@ do fi if [ -z "$YES" ] ; then echo ")" ; fi fi && + mkdir -p $DESTDIR$sharedir && + tar xzf $SRCDIR/share.tar.gz -C $DESTDIR$sharedir && mkdir -p $DESTDIR$modulesdir && create_defaults > $DESTDIR$modulesdir/defaults && mkdir -p $DESTDIR$localedir && @@ -676,14 +665,14 @@ do ln -snf check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && - sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$docdir/check_mk_templates.cfg && + sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$sharedir/check_mk_templates.cfg && mkdir -p "$DESTDIR$nagconfdir" if [ ! -e $DESTDIR$nagconfdir/check_mk_templates.cfg ] ; then - ln -s $docdir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null + ln -s $sharedir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null fi if [ -n "$nagiosaddconf" -a -n "$DESTDIR$nagios_config_file" ] ; then echo "# added by setup.sh of check_mk " >> $DESTDIR$nagios_config_file

12 years, 8 months

Check_MK Git: check_mk: Cleaned up comments in check_mk_templates.cfg

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b028040348d584fdf3e32bdeebbdb4ccf583b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b028040348d58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 11:05:03 2011 +0100 Cleaned up comments in check_mk_templates.cfg --- doc/check_mk_templates.cfg | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg index 4b8fb15..47fd36d 100644 --- a/doc/check_mk_templates.cfg +++ b/doc/check_mk_templates.cfg @@ -1,15 +1,25 @@ -# This is an example configuration file for integrating -# check_mk into Nagios. It defines several templates for -# hosts and services that are referred to by the Nagios- -# configuration output by check_mk. It also defines -# commands called by active check_mk-checks. +# These file contains templates for monitoring objects. The +# configuration that Check_MK creates uses these templates. +# You *can* modify this file, but if you want to change parameters +# for hosts and services a better idea is using extra_host_conf +# and extra_service_conf. +# +# OMD users: your modifications to this file are handled +# by 'omd update' so no problems should arise during an +# update as long as your modifications to not collide +# with modifications due to new versions of the file. OMD +# will let you interactively resolve such a conflict. +# +# Non-OMD users: Usually this file is created as a symlink +# in nagios/etc/conf.d (or objects or whatever directory +# you are using) pointing to the shipped file. If you want +# to modify this file, then replace the symlink with a true +# copy of the file. Note, however, that a software update +# of Check_MK will not update your check_mk_templates.cfg +# anymore and you might get incompatible as time goes by. # ------------------------------------------------------------------ -# In most cases it should be sufficient to copy or -# symlink this file into your nagios object-directory -# without changing it. - # ____ _ _ # / ___|___ _ __ | |_ __ _ ___| |_ ___ # | | / _ \| '_ \| __/ _` |/ __| __/ __| @@ -18,11 +28,12 @@ # # This contact is only needed while you have not configured contacts -# for your hosts and services with the varibables +# for your hosts and services with the variables # service_contactgroups and host_contactgroups. This is, because # Nagios does not allow a host or service to not have a contact. # And we want this default configuration file to be complete # and work. + define contact { contact_name check_mk alias check_mk dummy contact @@ -234,7 +245,7 @@ define service { # the configuration variable service_dependencies. Since we # only deal with passive checks the dependencies are not # used to suppress service checks. But they are very useful -# for suppression notifications. If you set inherits_parent +# for suppressing notifications. If you set inherits_parent # to 1, then if A depends on B and B depends on C, A will # automatically depend on C. This is usually what you want. # If A depends on B and B is in WARNING state, the notification

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits