Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: #1245 FIX printer_output: Now correctly detect a bin with unknown as name

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0be1a3233404bf9856f0e053e8b6dbdfde92c503 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0be1a3233404bf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 5 09:06:27 2015 +0200 #1245 FIX printer_output: Now correctly detect a bin with unknown as name --- .werks/1245 | 10 ++++++++++ ChangeLog | 1 + checks/printer_io.include | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1245 b/.werks/1245 new file mode 100644 index 0000000..f37c7a1 --- /dev/null +++ b/.werks/1245 @@ -0,0 +1,10 @@ +Title: printer_output: Now correctly detect a bin with unknown as name +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430809514 + + diff --git a/ChangeLog b/ChangeLog index 854b854..21913de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -353,6 +353,7 @@ * 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters... * 2077 FIX: Windows MSI Installer: fixed automatical install of agent plugins... * 1244 FIX: windows_tasks: Fixed handling of tasks manually stopped by admin... + * 1245 FIX: printer_output: Now correctly detect a bin with unknown as name Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/printer_io.include b/checks/printer_io.include index 79599f1..af349a6 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -84,7 +84,7 @@ def inventory_printer_io(info): # When no name is set # a) try to use the description # b) try to use the type otherwise use the index - if not name: + if name == "unknown" or not name: name = descr and descr or index.split('.')[-1] yield (name, {})

9 years, 5 months

Check_MK Git: check_mk: #2225 Restructured Event Console rules into packs

by Mathias Kettner

Module: check_mk Branch: master Commit: 5d525d729975ba93aeb07202ad5d844da685a98d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d525d729975ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 4 18:09:03 2015 +0200 #2225 Restructured Event Console rules into packs The Event Console now groups event rules into Packs. If you update to the new version you will find all your existing rules to be contained in the pack Default rule pack. The execution of the rules within a pack is just as it was in the global list of rules before. But now you can have several packs. The execution of the rules is done in the order of the packs and within each pack in the order there. This helps you to keep on overview - especially if you have a lot of rules. But there are a couple of more advantages from the packs: <ul> <li>You can easily reorder packs as a whole</li> <li>Packs can be disabled as a whole</li> <li>Event simulation can show matching rules on the level of the packs</li> <li>Rules can be moved from one pack to another</li> <li>A new rule option in Actions and Outcome can be used to have a rule skip all other rules in the same pack and continue with the next one. That way you can for example create a pack Oracle. As a first rule you match for <tt>(?!ORA-)</tt> and set the rule type to Skip this rule pack. That way if a message arrives that does not contain <tt>ORA-</tt> all of the following rules in that pack will not by tried out. This can make your configuration easier and also will speed up the Event Console since the number of rule tries is being reduced.</li> </ul> --- .werks/2225 | 34 ++ ChangeLog | 1 + mkeventd/bin/mkeventd | 175 +++--- .../web/htdocs/images/button_mkeventd_rules_hi.png | Bin 0 -> 1685 bytes .../web/htdocs/images/button_mkeventd_rules_lo.png | Bin 0 -> 2203 bytes mkeventd/web/htdocs/images/icon_mkeventd_rules.png | Bin 0 -> 2203 bytes mkeventd/web/htdocs/mkeventd.py | 1 + mkeventd/web/plugins/wato/mkeventd.py | 596 +++++++++++++++----- 8 files changed, 607 insertions(+), 200 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5d525d7299…

9 years, 5 months

Check_MK Git: check_mk: #1244 FIX windows_tasks: Fixed handling of tasks manually stopped by admin

by Bastian Kuhn

Module: check_mk Branch: master Commit: cb576da7f098b93ad4a5702c7f7d0543ad24840b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb576da7f098b9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon May 4 16:24:00 2015 +0200 #1244 FIX windows_tasks: Fixed handling of tasks manually stopped by admin If a Windows Administrator manually stops a task it will be ignored now and not longer results in an error now. --- .werks/1244 | 11 +++++++++++ ChangeLog | 1 + checks/windows_tasks | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1244 b/.werks/1244 new file mode 100644 index 0000000..e7c954b --- /dev/null +++ b/.werks/1244 @@ -0,0 +1,11 @@ +Title: windows_tasks: Fixed handling of tasks manually stopped by admin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430749274 + +If a Windows Administrator manually stops a task it will be ignored now and not +longer results in an error now. diff --git a/ChangeLog b/ChangeLog index c16bbc3..854b854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -352,6 +352,7 @@ * 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output... * 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters... * 2077 FIX: Windows MSI Installer: fixed automatical install of agent plugins... + * 1244 FIX: windows_tasks: Fixed handling of tasks manually stopped by admin... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/windows_tasks b/checks/windows_tasks index 2c520b2..f9ef25d 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -67,7 +67,7 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301, 0x00041325 ]: # SCHED_S_TASK_RUNNING, SCHED_S_TASK_QUEUED + if last_result not in [ 0, 0x00041301, 0x00041325, 0x00041306 ]: # RUNNING, QUEUED, CANCELD state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) )

9 years, 5 months

Check_MK Git: check_mk: Corrected help text

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0330601f2a0e1dec016cb674539567985725691f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0330601f2a0e1d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon May 4 13:27:40 2015 +0200 Corrected help text --- doc/treasures/wato_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/wato_import.py b/doc/treasures/wato_import.py index 9534428..5d8f17b 100644 --- a/doc/treasures/wato_import.py +++ b/doc/treasures/wato_import.py @@ -37,7 +37,7 @@ except: print """Run this script inside a OMD site Usage: ./wato_import.py csvfile.csv CSV Example: - wato_foldername;hostname|tags;host_alias;(ipaddress|None)""" + wato_foldername,hostname|tags,host_alias,(ipaddress|None)""" sys.exit() folders = {}

9 years, 5 months

Check_MK Git: check_mk: #2077 FIX Windows MSI Installer: fixed automatical install of agent plugins

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c0e15f9f7a6a61923bc6eea2b870c97c3c58d55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c0e15f9f7a6a6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 12:33:38 2015 +0200 #2077 FIX Windows MSI Installer: fixed automatical install of agent plugins Upon install, the MSI installer did not unpack any plugins provided by the plugins.cap file. You had to manually unpack these plugins with the command "check_mk_agent.exe unpack plugins.cap". This has been fixed. --- .werks/2077 | 15 +++++++++++++++ ChangeLog | 1 + 2 files changed, 16 insertions(+) diff --git a/.werks/2077 b/.werks/2077 new file mode 100644 index 0000000..64b324a --- /dev/null +++ b/.werks/2077 @@ -0,0 +1,15 @@ +Title: Windows MSI Installer: fixed automatical install of agent plugins +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430735433 + +Upon install, the MSI installer did not unpack any plugins provided +by the plugins.cap file. You had to manually unpack these plugins +with the command "check_mk_agent.exe unpack plugins.cap". + +This has been fixed. + diff --git a/ChangeLog b/ChangeLog index bc69311..c16bbc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -351,6 +351,7 @@ * 2071 FIX: windows agent: fileinfo check now correctly reports empty directories... * 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output... * 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters... + * 2077 FIX: Windows MSI Installer: fixed automatical install of agent plugins... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 5 months

Check_MK Git: check_mk: updated msi templates for vanilla and baked msi agents

by Andreas Boesl

Module: check_mk Branch: master Commit: 2861bf459d47728d4d75c5d89078fa0673ec595f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2861bf459d4772… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 12:10:50 2015 +0200 updated msi templates for vanilla and baked msi agents --- doc/treasures/windows_msi/check_mk_agent_baked.wxs | 55 +++++++++++--------- .../windows_msi/check_mk_agent_vanilla.wxs | 49 +++++++++-------- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/doc/treasures/windows_msi/check_mk_agent_baked.wxs b/doc/treasures/windows_msi/check_mk_agent_baked.wxs index bb11169..c903fa7 100644 --- a/doc/treasures/windows_msi/check_mk_agent_baked.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_baked.wxs @@ -61,38 +61,43 @@ <UIRef Id="CmkWixUI_InstallDir"/> <CustomAction Id="install_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe install' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]check_mk_agent.exe install' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="uninstall_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe remove' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]check_mk_agent.exe remove' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="uninstall_plugins" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]uninstall_plugins.bat' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="start_service" - Directory ="INSTALLDIR" - ExeCommand='net start check_mk_agent' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='net start check_mk_agent' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="stop_service" - Directory ="INSTALLDIR" - ExeCommand='net stop check_mk_agent' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='net stop check_mk_agent' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="install_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence> @@ -112,8 +117,8 @@ Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> <Condition>VersionNT64</Condition> </Component> - <Component Id="plugins.cmkp" Guid="0e9229ec-373b-11e4-824b-002713b4a9ec"> - <File Id="plugins.cmkp" Source="sources\plugins.cmkp"/> + <Component Id="plugins.cap" Guid="0e9229ec-373b-11e4-824b-002713b4a9ec"> + <File Id="plugins.cap" Source="sources\plugins.cap"/> </Component> <Component Id="check_mk.ini" Guid="fa07238c-373b-11e4-961a-002713b4a9ec"> <File Id="check_mk.ini" Source="sources\check_mk.ini"/> @@ -139,7 +144,7 @@ <ComponentRef Id="agent32"/> <ComponentRef Id="agent64"/> <ComponentRef Id="check_mk.ini"/> - <ComponentRef Id="plugins.cmkp"/> + <ComponentRef Id="plugins.cap"/> <ComponentRef Id="localFolder"/> <ComponentRef Id="pluginFolder"/> <ComponentRef Id="RegistryEntries"/> diff --git a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs index 0bfcfae..f67971f 100644 --- a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs @@ -61,38 +61,43 @@ <UIRef Id="CmkWixUI_InstallDir"/> <CustomAction Id="install_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe install' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]check_mk_agent.exe install' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="uninstall_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe remove' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]check_mk_agent.exe remove' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="uninstall_plugins" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]uninstall_plugins.bat' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="start_service" - Directory ="INSTALLDIR" - ExeCommand='net start check_mk_agent' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='net start check_mk_agent' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <CustomAction Id="stop_service" - Directory ="INSTALLDIR" - ExeCommand='net stop check_mk_agent' - Execute ="immediate" - Return ="ignore"/> + Directory ="INSTALLDIR" + ExeCommand ='net stop check_mk_agent' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="install_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence>

9 years, 5 months

Check_MK Git: check_mk: remove obsolete msi installer file

by Andreas Boesl

Module: check_mk Branch: master Commit: bc773a64ef24509b5b0f96f89fc72fff47ab7752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc773a64ef2450… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 12:08:18 2015 +0200 remove obsolete msi installer file --- doc/treasures/windows_msi/check_mk_agent.wxs | 137 -------------------------- 1 file changed, 137 deletions(-) diff --git a/doc/treasures/windows_msi/check_mk_agent.wxs b/doc/treasures/windows_msi/check_mk_agent.wxs deleted file mode 100644 index 2f3b7f2..0000000 --- a/doc/treasures/windows_msi/check_mk_agent.wxs +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0"?> -<?define CompanyName = "Mathias Kettner GmbH"?> -<?define ProductVersion = "1.2.5"?> -<?define ProductUpgradeCode = "854bb2c1-f4aa-4c5c-89e4-8fb0bdfb9ee4"?> - - -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" - xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'> - <Product Id="*" UpgradeCode="$(var.ProductUpgradeCode)" - Name="Check_MK Agent MSI" Version="$(var.ProductVersion)" Manufacturer="Mathias Kettner GmbH" Language="1033"> - <Package InstallerVersion="200" Platform="x86" Compressed="yes" Description="Check_MK 32/64 bit MSI installer"/> - <Media Id="1" Cabinet="product.cab" CompressionLevel="none" EmbedCab="yes"/> - <Upgrade Id="$(var.ProductUpgradeCode)"> - <UpgradeVersion Minimum="$(var.ProductVersion)" - Property="NEWERVERSIONDETECTED"/> - <UpgradeVersion Minimum="0.0.0" - Maximum="$(var.ProductVersion)" - IncludeMinimum="yes" - IncludeMaximum="no" - Property="OLDERVERSIONBEINGUPGRADED"/> - </Upgrade> - - - <Directory Id="TARGETDIR" Name="SourceDir"> - <Directory Id="ProgramFilesFolder"> - <Directory Id="APPLICATIONROOTDIRECTORY" Name="check_mk"> - <Directory Id="INSTALLDIR"/> - </Directory> - </Directory> - </Directory> - - -  - <Property Id="EXISTINGINSTALLDIR" Secure="yes"> - <RegistrySearch Id="Locate_EXISTINGINSTALLDIR" Root="HKLM" - Key="Software\check_mk_agent" Name="Install_Dir" Type="directory" /> - </Property> - -  - <CustomAction Id="Set_INSTALLDIR" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" /> - - - <InstallExecuteSequence> - <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> - </InstallExecuteSequence> - - <InstallUISequence> - <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> - </InstallUISequence> - - <Property Id="INSTALLSERVICE" Value="1" /> - - <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> - <WixVariable Id="WixUILicenseRtf" Value="sources\GPL-V2.rtf" /> - <UIRef Id="CmkWixUI_InstallDir"/> - - <CustomAction Id="install_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe install' - Execute ="immediate" - Return ="ignore"/> - - <CustomAction Id="uninstall_service" - Directory ="INSTALLDIR" - ExeCommand='[INSTALLDIR]check_mk_agent.exe remove' - Execute ="immediate" - Return ="ignore"/> - - - <CustomAction Id="start_service" - Directory ="INSTALLDIR" - ExeCommand='net start check_mk_agent' - Execute ="immediate" - Return ="ignore"/> - - <CustomAction Id="stop_service" - Directory ="INSTALLDIR" - ExeCommand='net stop check_mk_agent' - Execute ="immediate" - Return ="ignore"/> - - <InstallExecuteSequence> - <Custom Action="install_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - </InstallExecuteSequence> - - <InstallExecuteSequence> - <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> - <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> - </InstallExecuteSequence> - - <DirectoryRef Id="INSTALLDIR"> - <Component Id="agent32" Guid="60d6ba87-1f56-4d24-817f-a5966eb8b116"> - <File Id="check_mk_agent.exe" Source="sources\check_mk_agent.exe" - Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> - <Condition>NOT VersionNT64</Condition> - </Component> - <Component Id="agent64" Guid="7c2e82ec-c80e-436e-9a29-fe7d0e8f3589"> - <File Id="check_mk_agent64.exe" Source="sources\check_mk_agent-64.exe" - Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> - <Condition>VersionNT64</Condition> - </Component> - <Component Id="check_mk.example.ini" Guid="1383472d-d59e-4c7d-beca-02574758212a"> - <File Id="check_mk.example.ini" Source="sources\check_mk.example.ini"/> - </Component> - <Directory Id="LocalName" Name="local"> - <Component Id="localFolder" Guid="f0cdd975-2dad-45c5-b089-d566d7418ae7"> - <CreateFolder Directory="LocalName"/> - </Component> - </Directory> - <Directory Id="PluginName" Name="plugins"> - <Component Id="pluginFolder" Guid="2384da34-a212-4eda-ac1b-365d2f2686ab"> - <CreateFolder Directory="PluginName"/> - </Component> - </Directory> - <Component Id="RegistryEntries" Guid="c1feaa52-851d-4c68-bd3e-6725bbdf6370"> - <RegistryKey Root="HKLM" Key="Software\check_mk_agent"> - <RegistryValue Type="string" Name="Install_Dir" Value="[INSTALLDIR]"/> - </RegistryKey> - </Component> - </DirectoryRef> - - - <InstallExecuteSequence> - <RemoveExistingProducts Before="InstallInitialize"/> - </InstallExecuteSequence> - - <Feature Id="Agent" Level="1"> - <ComponentRef Id="agent32"/> - <ComponentRef Id="agent64"/> - <ComponentRef Id="check_mk.example.ini"/> - <ComponentRef Id="localFolder"/> - <ComponentRef Id="pluginFolder"/> - <ComponentRef Id="RegistryEntries"/> - </Feature> - </Product> -</Wix>

9 years, 5 months

Check_MK Git: check_mk: switch port intentory: fix computation of status age

by Mathias Kettner

Module: check_mk Branch: master Commit: e6954f1e0a1f15afab1b3d43cf31b282109e8e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6954f1e0a1f15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 4 11:23:46 2015 +0200 switch port intentory: fix computation of status age --- inventory/if | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/inventory/if b/inventory/if index 3c68cf9..30ea0bc 100644 --- a/inventory/if +++ b/inventory/if @@ -25,6 +25,9 @@ # Boston, MA 02110-1301 USA. def inv_if(info, params): + port_info, uptime_info = info + uptime = parse_snmp_uptime(uptime_info[0][0]) + usage_port_types = params.get("usage_port_types", [ '6', '32', '62', '117', '127', '128', '129', '180', '181', '182', '205', '229' ]) unused_duration = params.get("unused_duration", 30 * 86400) @@ -37,7 +40,7 @@ def inv_if(info, params): node = inv_tree("networking.interfaces:") for if_index, if_descr, if_alias, if_type, if_speed, if_high_speed, \ - if_oper_status, if_admin_status, if_phys_address, if_last_change in info: + if_oper_status, if_admin_status, if_phys_address, if_last_change in port_info: if if_type in ( "231", "232" ): continue # Useless entries for "TenGigabitEthernet2/1/21--Uncontrolled" @@ -63,6 +66,12 @@ def inv_if(info, params): else: speed = int(if_speed) + if last_change > 0: + state_age = uptime - last_change + else: + # Assume point of time of boot as last state change. + state_age = uptime + node.append({ "index" : int(if_index), "description" : if_descr, @@ -71,12 +80,13 @@ def inv_if(info, params): "phys_address" : render_mac_address(if_phys_address), "oper_status" : int(if_oper_status), "admin_status" : int(if_admin_status), # 1(up) or 2(down) - "state_age" : last_change, "port_type" : int(if_type), + "state_age" : state_age, }) + if if_type in usage_port_types: - if_available = if_oper_status == '2' and last_change > unused_duration + if_available = if_oper_status == '2' and state_age > unused_duration total_ethernet_ports += 1 if if_available: available_ethernet_ports += 1 @@ -91,17 +101,20 @@ def inv_if(info, params): inv_info['inv_if'] = { "inv_function" : inv_if, - 'snmp_info': ( ".1.3.6.1.2.1", [ - "2.2.1.1", # ifIndex - "2.2.1.2", # ifDescr - "31.1.1.1.18", # ifAlias - "2.2.1.3", # ifType - "2.2.1.5", # ifSpeed - "31.1.1.1.15", # ifHighSpeed .. 1000 means 1Gbit - "2.2.1.8", # ifOperStatus - "2.2.1.7", # ifAdminStatus - "2.2.1.6", # ifPhysAddress - "2.2.1.9", # ifLastChange - ]), + 'snmp_info': [ + ( ".1.3.6.1.2.1", [ + "2.2.1.1", # ifIndex + "2.2.1.2", # ifDescr + "31.1.1.1.18", # ifAlias + "2.2.1.3", # ifType + "2.2.1.5", # ifSpeed + "31.1.1.1.15", # ifHighSpeed .. 1000 means 1Gbit + "2.2.1.8", # ifOperStatus + "2.2.1.7", # ifAdminStatus + "2.2.1.6", # ifPhysAddress + "2.2.1.9", # ifLastChange + ]), + ( ".1.3.6.1.2.1.1", [ "3.0" ] ), # uptime + ], 'snmp_scan_function': lambda oid: int(oid(".1.3.6.1.2.1.2.1.0")) >= 2, }

9 years, 5 months

Check_MK Git: check_mk: #2076 fortigate_cpu_base, fortigate_sessions_base: supports wider range of models

by Andreas Boesl

Module: check_mk Branch: master Commit: 529a09479d4a39ca3f5063685ff1674445e201fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=529a09479d4a39… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 11:10:13 2015 +0200 #2076 fortigate_cpu_base, fortigate_sessions_base: supports wider range of models These two new checks aquire their data through the MIB FORTINET-FORTIGATE-MIB. --- .werks/2076 | 9 ++++++ ChangeLog | 1 + checks/fortigate_cpu_base | 60 ++++++++++++++++++++++++++++++++++++++++ checks/fortigate_sessions_base | 57 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+) diff --git a/.werks/2076 b/.werks/2076 new file mode 100644 index 0000000..a49895f --- /dev/null +++ b/.werks/2076 @@ -0,0 +1,9 @@ +Title: fortigate_cpu_base, fortigate_sessions_base: supports wider range of models +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1430730391 +Class: feature + +These two new checks aquire their data through the MIB FORTINET-FORTIGATE-MIB. diff --git a/ChangeLog b/ChangeLog index 3845898..bc69311 100644 --- a/ChangeLog +++ b/ChangeLog @@ -171,6 +171,7 @@ * 1242 enterasys_powersupply: It's now possible to choice which redundancy state treated as OK... * 2214 icom_repeater: New set of checks for Icom repeaters... * 2245 AIX-Agent: Added support for the uptime check + * 2076 fortigate_cpu_base, fortigate_sessions_base: supports wider range of models... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/fortigate_cpu_base b/checks/fortigate_cpu_base new file mode 100644 index 0000000..13301f3 --- /dev/null +++ b/checks/fortigate_cpu_base @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +fortigate_cpu_base_default_levels = (80.0, 90.0) + +def inventory_fortigate_cpu_base(info): + return [(None, "fortigate_cpu_base_default_levels")] + +def check_fortigate_cpu_base(item, params, info): + num_cpus = 0 + util = 0 + for line in info: + util += int(line[0]) + num_cpus += 1 + if num_cpus == 0: + return + + util = float(util) / num_cpus + + state, infotext, perfdata = check_cpu_util(util, params) + infotext += " at %d CPUs" % num_cpus + + return state, infotext, perfdata + +check_info["fortigate_cpu_base"] = { + "inventory_function" : inventory_fortigate_cpu_base, + "check_function" : check_fortigate_cpu_base, + "service_description" : "CPU utilization", + "has_perfdata" : True, + "group" : "cpu_utilization", + # uses mib FORTINET-FORTIGATE-MIB + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + oid(".1.3.6.1.4.1.12356.101.4.1.3.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 3 ]), + "include" : [ "cpu_util.include" ], +} + diff --git a/checks/fortigate_sessions_base b/checks/fortigate_sessions_base new file mode 100644 index 0000000..3786a5f --- /dev/null +++ b/checks/fortigate_sessions_base @@ -0,0 +1,57 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +fortigate_sessions_base_default_levels = (100000, 150000) + +def inventory_fortigate_sessions_base(info): + return [(None, "fortigate_sessions_base_default_levels")] + +def check_fortigate_sessions_base(item, params, info): + warn, crit = params + current = saveint(info[0][0]) + state = 0 + icon = '' + if current >= warn: + state = 1 + icon = "(!)" + if current >= crit: + state = 2 + icon = "(!!)" + + perf = [("session", current, warn, crit)] + return state, "%d Session%s (levels at %d/%d)" % (current, icon, warn, crit), perf + +check_info["fortigate_sessions_base"] = { + "inventory_function" : inventory_fortigate_sessions_base, + "check_function" : check_fortigate_sessions_base, + "service_description" : "Sessions", + "has_perfdata" : True, + # uses mib FORTINET-FORTIGATE-MIB + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 8 ]), +} +

9 years, 5 months

Check_MK Git: check_mk: fortigate checks: code reformatted

by Andreas Boesl

Module: check_mk Branch: master Commit: f84d1ecacd0d6c4a8a1942c793bc6bce88c9b59e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f84d1ecacd0d6c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 4 11:06:12 2015 +0200 fortigate checks: code reformatted --- checks/fortigate_cpu | 29 ++++++++++++++++------------- checks/fortigate_sessions | 11 ++++++++--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu index 7b51888..3265a93 100644 --- a/checks/fortigate_cpu +++ b/checks/fortigate_cpu @@ -26,6 +26,9 @@ fortigate_cpu_default_levels = (80.0, 90.0) +def inventory_fortigate_cpu(info): + return [(None, "fortigate_cpu_default_levels")] + def check_fortigate_cpu(item, params, info): num_cpus = 0 util = 0 @@ -33,25 +36,25 @@ def check_fortigate_cpu(item, params, info): util += int(line[0]) num_cpus += 1 if num_cpus == 0: - return (3, "no data found in SNMP output") + return + util = float(util) / num_cpus - infotext = "%2.1f%% utilization at %d CPUs" % (util, num_cpus) - warn, crit = params - perfdata = [("util", util, warn, crit, 0, 100)] - if util >= crit: - return (2, infotext + " (critical at %d%%)" % crit, perfdata) - elif util >= warn: - return (1, infotext + " (warning at %d%%)" % warn, perfdata) - else: - return (0, infotext, perfdata) + + state, infotext, perfdata = check_cpu_util(util, params) + infotext += " at %d CPUs" % num_cpus + + return state, infotext, perfdata check_info["fortigate_cpu"] = { + "inventory_function" : inventory_fortigate_cpu, "check_function" : check_fortigate_cpu, - "inventory_function" : lambda info: [(None, "fortigate_cpu_default_levels")], "service_description" : "CPU utilization", "has_perfdata" : True, "group" : "cpu_utilization", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.12356.1.8.0"), - "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), + # uses mib FORTINET-MIB-280 + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + oid(".1.3.6.1.4.1.12356.1.8.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), + "include" : [ "cpu_util.include" ], } diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 2bcdee6..f84025e 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -26,6 +26,9 @@ fortigate_sessions_default_levels = (100000, 150000) +def inventory_fortigate_sessions(info): + return [(None, "fortigate_sessions_default_levels")] + def check_fortigate_sessions(item, params, info): warn, crit = params current = saveint(info[0][0]) @@ -39,14 +42,16 @@ def check_fortigate_sessions(item, params, info): icon = "(!!)" perf = [("session", current, warn, crit)] - return(state, "%d Session%s (levels at %d/%d)" % (current, icon, warn, crit), perf) + return state, "%d Session%s (levels at %d/%d)" % (current, icon, warn, crit), perf check_info["fortigate_sessions"] = { + "inventory_function" : inventory_fortigate_sessions, "check_function" : check_fortigate_sessions, - "inventory_function" : lambda info: [(None, "fortigate_sessions_default_levels")], "service_description" : "Sessions", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.12356.1.10.0"), + # uses mib FORTINET-MIB-280 + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + oid(".1.3.6.1.4.1.12356.1.10.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), }

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015