Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64147 discussions

Check_MK Git: check_mk: fix PNP template for if/if64

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be79fd33dd0459334cb3625e762b2cb05df86c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be79fd33dd0459… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 14:06:38 2011 +0100 fix PNP template for if/if64 --- ChangeLog | 5 ++ pnp-templates/check_mk-if.php | 145 ++++++++++++++++++++++------------------- 2 files changed, 83 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6b5ec..be45558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * Fixed clustering of SNMP hosts * Fix status output of Check_MK check in mixed cluster setups + Checks & Agents: + * PNP templates for if/if64: fix bugs: outgoing packets had been + same as incoming, errors and discards were swapped (thanks to + Paul Freeman) + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3bff161..fd82ebe 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -41,10 +41,12 @@ $bitBandwidth = $MAX[1] * 8; $warn = $WARN[1]; $crit = $CRIT[1]; +$megabyte = 1024.0 * 1024.0; + $bandwidth = $bitBandwidth; -$mByteBandwidth = $MAX[1] / 1000 / 1000; -$mByteWarn = $WARN[1] / 1000 / 1000; -$mByteCrit = $CRIT[1] / 1000 / 1000; +$mByteBandwidth = $MAX[1] / $megabyte; +$mByteWarn = $WARN[1] / $megabyte; +$mByteCrit = $CRIT[1] / $megabyte; $bwuom = ' '; $base = 1000; @@ -53,41 +55,50 @@ if($bandwidth > $base * $base * $base) { $crit /= $base * $base * $base; $bandwidth /= $base * $base * $base; $bwuom = 'G'; -} elseif($bandwidth > $base * $base) { +} elseif ($bandwidth > $base * $base) { $warn /= $base * $base; $crit /= $base * $base; $bandwidth /= $base * $base; $bwuom = 'M'; -} elseif($bandwidth > $base) { +} elseif ($bandwidth > $base) { $warn /= $base; $crit /= $base; $bandwidth /= $base; $bwuom = 'K'; } +if ($mByteBandwidth < 10) + $range = $mByteBandwidth; +else + $range = 10.0; + + $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MByte/sec\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc at $bandwidth${bwuom}Bit/s;\" "; $def[1] = "HRULE:0#c0c0c0 ". - "LINE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s \" ". - "LINE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%.1f", $warn) . " ".$bwuom."Byte/s \" ". - "LINE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%.1f", $crit) . " ".$bwuom."Byte/s\\n\" ". - "LINE:-$mByteWarn#ffff00: ". - "LINE:-$mByteCrit#ff0000: ". - "LINE:-$mByteBandwidth#808080: ". - "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". + "HRULE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". + "HRULE:-$mByteBandwidth#808080: "; + if ($warn) + $def[1] .= "HRULE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%6.1f", $warn) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteWarn#ffff00: "; + if ($crit) + $def[1] .= "HRULE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteCrit#ff0000: "; + + $def[1] .= "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". "CDEF:inmb=inbytes,1048576,/ ". "CDEF:outmb=outbytes,1048576,/ ". "CDEF:minusoutmb=0,outmb,- ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:inbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytes:MAX:\"%5.1lf %sB/s max\\n\" ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytes:MAX:\"%5.1lf %sB/s max\\n\" "; + "AREA:inmb#00e060:\"in \" ". + "GPRINT:inbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytes:MAX:\"%6.1lf %sB/s max\\n\" ". + "AREA:minusoutmb#0080e0:\"out \" ". + "GPRINT:outbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytes:MAX:\"%6.1lf %sB/s max\\n\" "; if (isset($DS[12])) { $def[1] .= @@ -96,14 +107,14 @@ if (isset($DS[12])) { "CDEF:inmba=inbytesa,1048576,/ ". "CDEF:outmba=outbytesa,1048576,/ ". "CDEF:minusoutmba=0,outmba,- ". - "LINE:inmba#007030:\"in (avg) \" ". - "GPRINT:inbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytesa:MAX:\"%5.1lf %sB/s max\\n\" ". - "LINE:minusoutmba#004070:\"out (avg) \" ". - "GPRINT:outbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytesa:MAX:\"%5.1lf %sB/s max\\n\" "; + "LINE:inmba#00a060:\"in (avg) \" ". + "GPRINT:inbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytesa:MAX:\"%6.1lf %sB/s max\\n\" ". + "LINE:minusoutmba#0060c0:\"out (avg) \" ". + "GPRINT:outbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytesa:MAX:\"%6.1lf %sB/s max\\n\" "; } # Graph 2: packets @@ -113,52 +124,52 @@ $def[2] = "HRULE:0#c0c0c0 ". "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". - "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%5.2lf/s last\" ". - "GPRINT:inu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%5.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outu=$RRDFILE[2]:$DS[2]:MAX ". - "DEF:outnu=$RRDFILE[3]:$DS[3]:MAX ". + "AREA:inu#00ffc0:\"in unicast \" ". + "GPRINT:inu:LAST:\"%7.2lf/s last \" ". + "GPRINT:inu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:inu:MAX:\"%7.2lf/s max\\n\" ". + "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". + "GPRINT:innu:LAST:\"%7.2lf/s last \" ". + "GPRINT:innu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:innu:MAX:\"%7.2lf/s max\\n\" ". + "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". + "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". - "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%5.2lf/s last\" ". - "GPRINT:outu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutnu#0080c0:\"out broadcast/multicast\":STACK ". - "GPRINT:outnu:LAST:\"%5.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%5.2lf/s max\\n\" "; + "AREA:minusoutu#00c0ff:\"out unicast \" ". + "GPRINT:outu:LAST:\"%7.2lf/s last \" ". + "GPRINT:outu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outu:MAX:\"%7.2lf/s max\\n\" ". + "AREA:minusoutnu#0080c0:\"out broadcast/multicast \":STACK ". + "GPRINT:outnu:LAST:\"%7.2lf/s last \" ". + "GPRINT:outnu:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outnu:MAX:\"%7.2lf/s max\\n\" "; # Graph 3: errors and discards $ds_name[3] = 'Errors and discards'; $opt[3] = "--vertical-label \"packets/sec\" -X0 --title \"Problems $hostname / $servicedesc\" "; $def[3] = "HRULE:0#c0c0c0 ". - "DEF:inerr=$RRDFILE[4]:$DS[4]:MAX ". - "DEF:indisc=$RRDFILE[5]:$DS[5]:MAX ". - "AREA:inerr#ff0000:\"in errors \" ". - "GPRINT:inerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:inerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:indisc#ff8000:\"in discards \":STACK ". - "GPRINT:indisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:indisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:indisc:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outerr=$RRDFILE[9]:$DS[9]:MAX ". - "DEF:outdisc=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:inerr=$RRDFILE[5]:$DS[5]:MAX ". + "DEF:indisc=$RRDFILE[4]:$DS[4]:MAX ". + "AREA:inerr#ff0000:\"in errors \" ". + "GPRINT:inerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:inerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:inerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:indisc#ff8000:\"in discards \":STACK ". + "GPRINT:indisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:indisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:indisc:MAX:\"%7.2lf/s max\\n\" ". + "DEF:outerr=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:outdisc=$RRDFILE[9]:$DS[9]:MAX ". "CDEF:minusouterr=0,outerr,- ". "CDEF:minusoutdisc=0,outdisc,- ". - "AREA:minusouterr#ff0080:\"out errors \" ". - "GPRINT:outerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:outerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutdisc#ff8080:\"out discards\":STACK ". - "GPRINT:outdisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:outdisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outdisc:MAX:\"%5.2lf/s max\\n\" "; + "AREA:minusouterr#ff0080:\"out errors \" ". + "GPRINT:outerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:outerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:minusoutdisc#ff8080:\"out discards \":STACK ". + "GPRINT:outdisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:outdisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outdisc:MAX:\"%7.2lf/s max\\n\" "; ?>

13 years, 7 months

Check_MK Git: check_mk: Multisite: fix views snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b61da1829138656caffe4443d26079298f6d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b61da1829138… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 16:17:08 2011 +0100 Multisite: fix views snapin --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index ef9a108..9f694ff 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -107,7 +107,7 @@ def render_views(): first = False html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) - if first: # at least one item rendered + if not first: # at least one item rendered html.write("</ul>") s = [ (view.get("topic", "Other"), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ]

13 years, 7 months

Check_MK Git: check_mk: Fix bug with fake_file class

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6d52651a6f070ca897c8571fa33a73c2298299f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d52651a6f070… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 09:05:15 2011 +0100 Fix bug with fake_file class --- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87033a1..d442f49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i7: + Core, Setup, etc.: + * Fix crash on Python 2.4 (e.g. RedHat) with fake_file + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/modules/check_mk.py b/modules/check_mk.py index f338a4e..c9693ae 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3662,7 +3662,7 @@ def automation_restart(): # HTTP connections. Really. os.closerange(3, 256) - class fake_file(): + class null_file: def write(self, stuff): pass def flush(self): @@ -3670,7 +3670,7 @@ def automation_restart(): # Deactivate stdout by introducing fake file without filedescriptor old_stdout = sys.stdout - sys.stdout = fake_file() + sys.stdout = null_file() try: if os.path.exists(nagios_objects_file):

13 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of 10.52.110.108:git/check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cccd9f75a858453a30ab41b82a6a881893859104 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cccd9f75a85845… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 2 09:39:34 2011 +0100 Merge branch 'master' of 10.52.110.108:git/check_mk ---

13 years, 7 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c1df6ed55ec0609f3f01039037c79f649831f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c1df6ed55ec06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 1 17:33:42 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: .bugs/110 ---

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93473e8fbf52db23172cc7f99f887ec7ee6ce5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93473e8fbf52db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 1 13:52:09 2011 +0100 Updated bug entries --- .bugs/110 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/110 b/.bugs/110 new file mode 100644 index 0000000..7edcfdc --- /dev/null +++ b/.bugs/110 @@ -0,0 +1,9 @@ +Title: bytes_readable function to format negative values +Component: core +Benefit: 7 +State: open +Cost: 1 +Date: 2011-02-01 13:47:06 +Class: nastiness + +The bytes readable formating function was not able to format negative values over here. This should really be possible.

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83434c4d3a73baa7277e360a59cf13f5837deedf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83434c4d3a73ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 31 09:22:06 2011 +0100 Updated bug entries --- .bugs/119 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/119 b/.bugs/119 new file mode 100644 index 0000000..5faadbf --- /dev/null +++ b/.bugs/119 @@ -0,0 +1,10 @@ +Title: Support host name containing spaces +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2011-01-31 09:21:15 +Class: feature + +It's reported that host names containing spaces do not work. +We do not know in which aspect they do not work. Need to try.

13 years, 7 months

Check_MK Git: check_mk: Set version to 1.1.9i7

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6565b44bb128be4e949f68aa1af2e4c1c7ea1561 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6565b44bb128be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 31 09:22:22 2011 +0100 Set version to 1.1.9i7 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 8be004f..ce50178 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i6 +VERSION = 1.1.9i7 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 042a897..61f532b 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i6 +echo Version: 1.1.9i7 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 5093770..d4b1403 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i6 +echo Version: 1.1.9i7 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 5fc955b..886ed69 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.9i5 +echo Version: 1.1.9i7 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 3792a7e..cd24268 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i6 +echo Version: 1.1.9i7 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 14afd25..1c9d4b3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i6 +echo Version: 1.1.9i7 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 70fe431..78d79fb 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i6" +#define CHECK_MK_VERSION "1.1.9i7" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 92de07e..20acbd9 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index a6d6295..6cff83e 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 1fc2609..0b19a67 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i6], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i7], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index dcc3b31..9108d55 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i6 +CHECK_MK_VERSION=1.1.9i7 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 2e66d11..4fbfdea 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i6 +VERSION=1.1.9i7 NAME=check_mk LANG= LC_ALL=

13 years, 7 months

Check_MK Git: check_mk: Fix rpm building due to mk_oracle change

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd9cba884dccff58ff24c716ba39727d5d65b4ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd9cba884dccff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 30 16:13:47 2011 +0100 Fix rpm building due to mk_oracle change --- check_mk.spec | 2 +- scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index eea4224..18a7d1a 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -84,7 +84,7 @@ Requires: check_mk-agent Summary: ORACLE-Plugin for check_mk agent AutoReq: off AutoProv: off -%description agent-logwatch +%description agent-oracle The ORACLE plugin for the check_mk agent allows you to monitor several aspects of ORACLE databases. You need to adapt the script /etc/check_mk/sqlplus.sh to your needs. diff --git a/scripts/setup.sh b/scripts/setup.sh index e8d280e..2e66d11 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -620,7 +620,7 @@ do tar xzf $SRCDIR/checkman.tar.gz -C $DESTDIR$checkmandir && mkdir -p $DESTDIR$agentsdir && tar xzf $SRCDIR/agents.tar.gz -C $DESTDIR$agentsdir && - for agent in $DESTDIR/$agentsdir/check_mk_*agent.* $DESTDIR/$agentsdir/mk_logwatch ; do + for agent in $DESTDIR/$agentsdir/check_mk_*agent.* ; do sed -ri 's@^export MK_LIBDIR="(.*)"@export MK_LIBDIR="'"$agentslibdir"'"@' $agent sed -ri 's@^export MK_CONFDIR="(.*)"@export MK_CONFDIR="'"$agentsconfdir"'"@' $agent done &&

13 years, 7 months

Check_MK Git: check_mk: Create RPM for oracle agent plugin

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1bcfb277227d7760a0250178ebcfc85346dc27b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bcfb277227d77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 30 15:59:02 2011 +0100 Create RPM for oracle agent plugin --- Makefile | 4 ++-- check_mk.spec | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7dceaf7..8be004f 100644 --- a/Makefile +++ b/Makefile @@ -149,12 +149,12 @@ deb-base: mv -v deb.bauen/*.deb . rm -rf deb.bauen -deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm $(NAME)-agent-logwatch-$(VERSION)-1.noarch.rpm +deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm $(NAME)-agent-logwatch-$(VERSION)-1.noarch.rpm $(NAME)-agent-oracle-$(VERSION)-1.noarch.rpm @echo "Sorry. Debian packages currently via alien" @for pac in $^ ; do \ fakeroot alien --scripts -d $$pac ; \ done - @for p in agent agent-logwatch ; do \ + @for p in agent agent-logwatch agent-oracle ; do \ pac="check-mk-$${p}_$(VERSION)-2_all.deb" ; \ echo "Repackaging $$pac" ; \ rm -rf deb-unpack && \ diff --git a/check_mk.spec b/check_mk.spec index 72ef3de..eea4224 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -78,6 +78,17 @@ specify patters for log messages that should raise a warning or critical state. For each logfile the current position is remembered. This way only new messages are being sent. +%package agent-oracle +Group: System/Monitoring +Requires: check_mk-agent +Summary: ORACLE-Plugin for check_mk agent +AutoReq: off +AutoProv: off +%description agent-logwatch +The ORACLE plugin for the check_mk agent allows you to monitor +several aspects of ORACLE databases. You need to adapt the +script /etc/check_mk/sqlplus.sh to your needs. + %package web Group: System/Monitoring Requires: python @@ -110,9 +121,10 @@ install -m 755 $R/usr/share/check_mk/agents/waitmax $R/usr/bin mkdir -p $R/usr/lib/check_mk_agent/plugins mkdir -p $R/usr/lib/check_mk_agent/local -# logwatch extension -install -m 755 $R/usr/share/check_mk/agents/mk_logwatch $R/usr/lib/check_mk_agent/plugins +# logwatch and oracle extension +install -m 755 $R/usr/share/check_mk/agents/plugins/mk_* $R/usr/lib/check_mk_agent/plugins install -m 755 $R/usr/share/check_mk/agents/logwatch.cfg $R/etc/check_mk +install -m 644 $R/usr/share/check_mk/agents/sqlplus.sh $R/etc/check_mk %clean rm -rf $RPM_BUILD_ROOT @@ -170,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/check_mk_agent/plugins/mk_logwatch %config(noreplace) /etc/check_mk/logwatch.cfg +%files agent-oracle +/usr/lib/check_mk_agent/plugins/mk_oracle +%config(noreplace) /etc/check_mk/sqlplus.sh + %files web /usr/share/check_mk/web %config(noreplace) /etc/apache2/conf.d/*

13 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits