Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: windows agent: now also available as msi installer

by Andreas Boesl

Module: check_mk Branch: master Commit: ae877c5a469a4a25e205a95ddf15da6bd580049d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae877c5a469a4a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 12:48:45 2014 +0200 windows agent: now also available as msi installer The new msi install check_mk_agent.msi packages contains the 32 and 64 bit version of the check_mk_agent.exe. Upon install the msi package will determine the os architecture and install the matching agent accordingly. The installed 32/64 Bit Agent is always named check_mk_agent.exe. Note: The msi installer always installs into the 32 bit program files folder. This is by design. --- .werks/1082 | 12 ++ ChangeLog | 1 + Makefile | 2 + agents/windows/Makefile | 6 +- agents/windows/check_mk_agent-64.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent.exe | Bin 176640 -> 176640 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 176640 -> 176640 bytes agents/windows/install_agent-64.exe | Bin 159344 -> 159343 bytes agents/windows/install_agent.exe | Bin 156401 -> 156400 bytes agents/windows/msibuild/Makefile | 47 ++++++++ agents/windows/msibuild/msi_container.msi | Bin 0 -> 612864 bytes agents/windows/msibuild/msibuild | 1 + agents/windows/msibuild/msiinfo | 1 + agents/windows/msibuild/msitools-0.93.tar.xz | Bin 0 -> 613856 bytes .../windows/msibuild/patches/msibuild_argc_fix.dif | 11 ++ agents/windows/msibuild/update_msi_file.py | 118 ++++++++++++++++++++ 17 files changed, 197 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae877c5a46…

10 years, 2 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 834b08dd5ed462d66b2f25ad7a1e63525a3b14a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=834b08dd5ed462… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 12:40:05 2014 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6d5177e..4880c9f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1082 +1132

10 years, 2 months

Check_MK Git: check_mk: if: Fix header of PNP template, again

by Mathias Kettner

Module: check_mk Branch: master Commit: eca7c06f014154f72bd72df9ef4ae900a58bbb4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca7c06f014154… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:31:43 2014 +0200 if: Fix header of PNP template, again --- pnp-templates/check_mk-if.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3f5280d..71a869d 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -90,10 +90,10 @@ $range = min(10, $bandwidth); $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . "${bwuom}${unit}/s $range"; + $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . " ${bwuom}${unit}/s"; } $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" "; +$opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc$bandwidthInfo\" "; $def[1] = "HRULE:0#c0c0c0 "; if ($bandwidth)

10 years, 2 months

Check_MK Git: check_mk: if: Fix header of PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 28b89e726696847ebd6aeb0ce54a6609878099fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b89e72669684… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:30:02 2014 +0200 if: Fix header of PNP template --- pnp-templates/check_mk-if.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index bbf4043..3f5280d 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -90,7 +90,7 @@ $range = min(10, $bandwidth); $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at $bandwidth ${bwuom}${unit}/s $range"; + $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . "${bwuom}${unit}/s $range"; } $ds_name[1] = 'Used bandwidth'; $opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" ";

10 years, 2 months

Check_MK Git: check_mk: FIX if, if64: Fixed PNP template in order to correctly scale Y axis

by Mathias Kettner

Module: check_mk Branch: master Commit: 91622e3f87bc11ba66cd584b5096c3eccd5d8ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91622e3f87bc11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:24:14 2014 +0200 FIX if, if64: Fixed PNP template in order to correctly scale Y axis --- .werks/1075 | 8 ++++ ChangeLog | 1 + pnp-templates/check_mk-if.php | 95 +++++++++++++++++++++-------------------- 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/.werks/1075 b/.werks/1075 new file mode 100644 index 0000000..eb0af23 --- /dev/null +++ b/.werks/1075 @@ -0,0 +1,8 @@ +Title: if, if64: Fixed PNP template in order to correctly scale Y axis +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405067034 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 19ba4a8..aa60a23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... * 0177 FIX: esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby... * 1054 FIX: mysql_slave: Only monitor the age of the slave when it is running + * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index c48245a..bbf4043 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -40,74 +40,77 @@ setlocale(LC_ALL, 'C'); # Graph 1: used bandwidth -# Determine if Bit or Byte. -# Change multiplier and labels -$unit = "B"; -$unit_multiplier = 1; -$vertical_label_name = "MByte/sec"; -if (strcmp($MIN[11], "0.0") == 0) { +# Determine if Bit or Byte. Bit is signalled via a min value of 0.0 +# in the 11th performance value. +if (!strcmp($MIN[11], "0.0")) { $unit = "Bit"; $unit_multiplier = 8; - $vertical_label_name = "MBit/sec"; + $base = 1000; // Megabit is 1000 * 1000 } +else { + $unit = "B"; + $unit_multiplier = 1; + $base = 1024; // Megabyte is 1024 * 1024 +} + +# Convert bytes to bits if neccessary $bandwidth = $MAX[1] * $unit_multiplier; $warn = $WARN[1] * $unit_multiplier; $crit = $CRIT[1] * $unit_multiplier; -# Horizontal lines -$mega = 1024.0 * 1024.0; -$mBandwidthH = $bandwidth / $mega; -$mWarnH = $warn / $mega; -$mCritH = $crit / $mega; - -# Break down bandwidth, warn and crit +# Now choose a conveniant scale, based on the known bandwith of +# the interface, and break down bandwidth, warn and crit by that +# scale. $bwuom = ' '; -$base = 1000; -if($bandwidth > $base * $base * $base) { - $warn /= $base * $base * $base; - $crit /= $base * $base * $base; - $bandwidth /= $base * $base * $base; - $bwuom = 'G'; -} elseif ($bandwidth > $base * $base) { - $warn /= $base * $base; - $crit /= $base * $base; - $bandwidth /= $base * $base; - $bwuom = 'M'; -} elseif ($bandwidth > $base) { - $warn /= $base; - $crit /= $base; - $bandwidth /= $base; - $bwuom = 'k'; +if ($bandwidth > $base * $base * $base) { + $scale = $base * $base * $base; + $bwuom = 'G'; +} +elseif ($bandwidth > $base * $base) { + $scale = $base * $base; + $bwuom = 'M'; +} +elseif ($bandwidth > $base) { + $scale = $base; + $bwuom = 'k'; +} +else { + $scale = 1; + $bwuom = ' '; } -if ($mBandwidthH < 10) - $range = $mBandwidthH; -else - $range = 10.0; +$warn /= $scale; +$crit /= $scale; +$bandwidth /= $scale; + +$vertical_label_name = $bwuom . $unit . "/sec"; + +$range = min(10, $bandwidth); + $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at bandwidth ${bwuom}${unit}/s"; + $bandwidthInfo = " at $bandwidth ${bwuom}${unit}/s $range"; } $ds_name[1] = 'Used bandwidth'; $opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" "; $def[1] = "HRULE:0#c0c0c0 "; - if ($mBandwidthH) - $def[1] .= "HRULE:$mBandwidthH#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mBandwidthH#808080: "; - if ($warn) - $def[1] .= "HRULE:$mWarnH#ffff00:\"Warning\: " . sprintf("%6.1f", $warn) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mWarnH#ffff00: "; - if ($crit) - $def[1] .= "HRULE:$mCritH#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mCritH#ff0000: "; +if ($bandwidth) + $def[1] .= "HRULE:$bandwidth#808080:\"Port speed\: " . sprintf("%10.1f", $bandwidth) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$bandwidth#808080: "; +if ($warn) + $def[1] .= "HRULE:$warn#ffff00:\"Warning\: " . sprintf("%13.1f", $warn) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$warn#ffff00: "; +if ($crit) + $def[1] .= "HRULE:$crit#ff0000:\"Critical\: " . sprintf("%13.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$crit#ff0000: "; $def[1] .= "". # incoming "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "CDEF:intraffic=inbytes,$unit_multiplier,* ". - "CDEF:inmb=intraffic,1048576,/ ". + "CDEF:inmb=intraffic,$scale,/ ". "AREA:inmb#00e060:\"in \" ". "GPRINT:intraffic:LAST:\"%7.1lf %s$unit/s last\" ". "GPRINT:intraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". @@ -121,7 +124,7 @@ $def[1] = "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". "CDEF:outtraffic=outbytes,$unit_multiplier,* ". "CDEF:minusouttraffic=outtraffic,-1,* ". - "CDEF:outmb=outtraffic,1048576,/ ". + "CDEF:outmb=outtraffic,$scale,/ ". "CDEF:minusoutmb=0,outmb,- ". "AREA:minusoutmb#0080e0:\"out \" ". "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ".

10 years, 2 months

Check_MK Git: check_mk: treasures: added tools for creating an initial windows msi installer package

by Andreas Boesl

Module: check_mk Branch: master Commit: 1093f573013f134b14bc6d0de4713e9feb4a1484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1093f573013f13… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 10:13:37 2014 +0200 treasures: added tools for creating an initial windows msi installer package --- doc/treasures/windows_msi/README | 35 + doc/treasures/windows_msi/build_msi.bat | 5 + doc/treasures/windows_msi/check_mk_agent.wixobj | 1 + doc/treasures/windows_msi/check_mk_agent.wixpdb | Bin 0 -> 350958 bytes doc/treasures/windows_msi/check_mk_agent.wxs | 137 ++++ doc/treasures/windows_msi/cmk_InstallDirDlg.wixobj | 1 + doc/treasures/windows_msi/cmk_InstallDirDlg.wxs | 33 + .../windows_msi/cmk_WixUI_InstallDir.wixobj | 1 + doc/treasures/windows_msi/cmk_WixUI_InstallDir.wxs | 86 ++ doc/treasures/windows_msi/sources/GPL-V2.rtf | 342 ++++++++ .../windows_msi/sources/check_mk.example.ini | 92 +++ .../windows_msi/sources/check_mk_agent-64.exe | Bin 0 -> 204800 bytes .../windows_msi/sources/check_mk_agent.exe | Bin 0 -> 175104 bytes doc/treasures/windows_msi/sources/gpl_v2.rtf | 848 ++++++++++++++++++++ 14 files changed, 1581 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1093f57301…

10 years, 2 months

Check_MK Git: check_mk: win_exefiles: removed debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: f8c18005b1c6c30bc466cbe3a9f5231498399d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c18005b1c6c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 10 16:44:22 2014 +0200 win_exefiles: removed debug output --- inventory/win_exefiles | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 508576f..a04d61c 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -42,7 +42,6 @@ def inv_win_exefiles(info): "install_date" : write_time, "size" : int(size), } - print entry paclist.append(entry)

10 years, 2 months

Check_MK Git: check_mk: Added AIX support for HW/SW-Inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: f4c6bcca424c52d889e2c0dc9e4f276ee7843325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4c6bcca424c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 10 16:56:39 2014 +0200 Added AIX support for HW/SW-Inventory Check_MK now ships the new agent plugin <tt>mk_inventory.aix</tt>, which retrieves inventory data on AIX hosts. This includes the list of software packages and service packs, information about the system and cpu. --- .werks/1046 | 10 ++++ ChangeLog | 3 +- agents/plugins/mk_inventory.aix | 46 +++++++++++++++++ inventory/aix_baselevel | 38 ++++++++++++++ inventory/aix_packages | 72 ++++++++++++++++++++++++++ inventory/aix_service_packs | 34 +++++++++++++ inventory/prtconf | 106 +++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 6 +++ 8 files changed, 314 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f4c6bcca42…

10 years, 2 months

Check_MK Git: check_mk: fixed broken filter: FilterHostgroupVisibility

by Andreas Boesl

Module: check_mk Branch: master Commit: 0ead548f1be46a9b2993f9976a7e509c9ce86b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ead548f1be46a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 10 15:09:20 2014 +0200 fixed broken filter: FilterHostgroupVisibility --- web/plugins/views/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 3d46a99..ddcb967 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -65,7 +65,7 @@ class FilterHostgroupVisibility(Filter): if html.var("hostgroupshowempty"): return "" else: - return "Filter: num_hosts > 0" + return "Filter: num_hosts > 0\n" # filter title info column htmlvar declare_filter(100, FilterText("hostregex", _("Hostname"), "host", "host_name", "host", "~~"),

10 years, 2 months

Check_MK Git: check_mk: FIX table servicegroups: fixed service visibility when using group_authorization AUTH_STRICT

by Andreas Boesl

Module: check_mk Branch: master Commit: 76b29d95d0f4899f29796bbb7a468ffdec822302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76b29d95d0f489… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 10 14:11:48 2014 +0200 FIX table servicegroups: fixed service visibility when using group_authorization AUTH_STRICT This only applies with the setting group_authorization = AUTH_STRICT When an auth user was given the livestatus table servicegroups did not check if the auth user had permissions to all objects of the servicegroup. As a result the user was able to view servicegroups, even if he was not a contact for every object in it. However, the "forbidden" object itself was not returned, just a subset of the group. This was incorrect. The user needs to be contact of every element in this group. Otherwise he should not see the group at all.. --- .werks/951 | 16 ++++++++++++++++ ChangeLog | 1 + livestatus/src/TableServices.cc | 30 +++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/.werks/951 b/.werks/951 new file mode 100644 index 0000000..413602e --- /dev/null +++ b/.werks/951 @@ -0,0 +1,16 @@ +Title: table servicegroups: fixed service visibility when using group_authorization AUTH_STRICT +Level: 1 +Component: livestatus +Version: 1.2.5i5 +Date: 1404994147 +Class: fix + +This only applies with the setting group_authorization = AUTH_STRICT + +When an auth user was given the livestatus table servicegroups did not check if the auth +user had permissions to all objects of the servicegroup. +As a result the user was able to view servicegroups, even if he was not a contact for every object in it. +However, the "forbidden" object itself was not returned, just a subset of the group. +This was incorrect. The user needs to be contact of every element in this group. +Otherwise he should not see the group at all.. + diff --git a/ChangeLog b/ChangeLog index e7312ec..bd991b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ Livestatus: * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service + * 0951 FIX: table servicegroups: fixed service visibility when using AUTH_STRICT... HW/SW-Inventory: * 0625 hw/sw inventory now reads the kernel version and architecture for linux and windows diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index a21a8ac..781e30b 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -68,14 +68,34 @@ void TableServices::answerQuery(Query *query) if (_by_group) { servicegroup *sgroup = servicegroup_list; servicebygroup sg; + bool show_sgroup; + + // When g_group_authorization is set to AUTH_STRICT we need to pre-check + // if every service of this group is visible to the _auth_user + bool requires_precheck = query->authUser() && g_group_authorization == AUTH_STRICT; + while (sgroup) { + show_sgroup = true; sg._servicegroup = sgroup; servicesmember *mem = sgroup->members; - while (mem) { - memcpy(&sg._service, mem->service_ptr, sizeof(service)); - if (!query->processDataset(&sg)) - break; - mem = mem->next; + if (requires_precheck) { + while (mem) { + if (!is_authorized_for(query->authUser(), mem->service_ptr->host_ptr, mem->service_ptr)) { + show_sgroup = false; + break; + } + mem = mem->next; + } + } + + if (show_sgroup) { + mem = sgroup->members; + while (mem) { + memcpy(&sg._service, mem->service_ptr, sizeof(service)); + if (!query->processDataset(&sg)) + break; + mem = mem->next; + } } sgroup = sgroup->next; }

10 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014