Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

Check_MK Git: check_mk: Added Manpage for esx_vsphere_objects

by Mathias Kettner

Module: check_mk Branch: master Commit: 051de2a8a65176e1d1a390c38fe14419f1c5254e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=051de2a8a65176… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 13:55:21 2013 +0100 Added Manpage for esx_vsphere_objects --- checkman/esx_vsphere_objects | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/checkman/esx_vsphere_objects b/checkman/esx_vsphere_objects new file mode 100644 index 0000000..46db1d8 --- /dev/null +++ b/checkman/esx_vsphere_objects @@ -0,0 +1,20 @@ +title: Check completeness of output of ESX special agent +agents: vsphere +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check makes sure that items sent by the ESX special agent (hostsystems + and VMs) are stil present later on. The information about this data can also + be used for determining the architecture of a VMWare farm out of the monitoring + data. + + The check will get critical if a host system or virtual machine, that was once + present, is now missing. + +inventory: + One service per hostsystem and per VM will be created. + +item: + The text {HostSystem} or {VM} followed by a space followed by the name of the host system + or VM.

11 years, 6 months

Check_MK Git: check_mk: ESX: Try to fix problem where no VM is present

by Mathias Kettner

Module: check_mk Branch: master Commit: aa90bd0f534b149b8d698ac9313250efd1578338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa90bd0f534b14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 13:50:32 2013 +0100 ESX: Try to fix problem where no VM is present --- agents/special/agent_vsphere | 26 ++++++++-------- checks/esx_vsphere_objects | 67 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5713cbd..a9a80ba 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -65,8 +65,7 @@ except: host = VIServer() -object_collection = {} - +object_collection = [] try: host.connect(params['HOST'], params['user'], params['secret']) except: @@ -112,7 +111,11 @@ def output_mors(what, properties, direct=False): count = 0 sections = [] - for mor in host._retrieve_properties_traversal(property_names=properties.keys(), obj_type=obj_type): + mors = host._retrieve_properties_traversal(property_names=properties.keys(), obj_type=obj_type) + if not mors: + return + + for mor in mors: count += 1 # Parse result into a dictionary. Key is the property name, # value is the value (some custom Python classes) @@ -121,13 +124,10 @@ def output_mors(what, properties, direct=False): # Convert property value using specified conversion function data[p.Name] = properties[p.Name](p.Val) - # Get the name of this Host/VirtualMachine - # May there a comments in the field, so split at whitespace - try: - name = data["name"].split()[0] - object_collection[name] = (what, data['name']) - except: - pass + # Remember the total list of output objects. We will put this into + # a special section + object_collection.append((what, data["name"])) + name = data["name"].split()[0] # get rid of comment # Output multiplexed Check_MK Agent output (new in version 1.2.3i1) if direct: @@ -277,7 +277,7 @@ if "virtualmachine" in mortypes: print "<<<<>>>>" -print "<<<local>>>" -for name, data in object_collection.items(): - print "0 %s-%s - OK: collecting piggyback data for %s" % (data[0], name, data[1]) +print "<<<esx_vsphere_objects:sep(9)>>>" +for what, name in object_collection: + print "%s\t%s" % (what, name) host.disconnect() diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects new file mode 100644 index 0000000..61d8db5 --- /dev/null +++ b/checks/esx_vsphere_objects @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# <<<esx_vsphere_objects:sep(9)>>> +# hostsystem esx.wacker.corp +# virtualmachine LinuxI +# virtualmachine OpenSUSE_II +# virtualmachine OpenSUSE_III +# virtualmachine OpenSUSE_IV +# virtualmachine OpenSUSE_V +# virtualmachine WindowsXP I +# virtualmachine LinuxII +# virtualmachine LinuxIII +# virtualmachine LinuxIV +# virtualmachine LinuxV +# virtualmachine OpenSUSE_I + +vsphere_object_names = { + "hostsystem" : "HostSystem", + "virtualmachine" : "VM", +} + +def inventory_esx_vsphere_objects(info): + return [ (vsphere_object_names[line[0]] + " " + line[1], None) for line in info ] + +def check_esx_vsphere_objects(item, _no_params, info): + for line in info: + if vsphere_object_names[line[0]] + " " + line[1] == item: + return 0, "information about this object present" + + what = item.split()[0] + name = item.split()[1] + if what == "VM": + return 3, "Virtual machine %s is missing" % name + else: + return 3, "No data about host system %s" % name + + +check_info['esx_vsphere_objects'] = { + "inventory_function" : inventory_esx_vsphere_objects, + "check_function" : check_esx_vsphere_objects, + "service_description" : "%s", +}

11 years, 6 months

Check_MK Git: check_mk: esx_vsphere_sensors: handle unknown sensor as warning

by Mathias Kettner

Module: check_mk Branch: master Commit: 36f7918ce9df98a38b4683082d644926b07eb222 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f7918ce9df98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 13:27:00 2013 +0100 esx_vsphere_sensors: handle unknown sensor as warning --- checks/esx_vsphere_sensors | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/checks/esx_vsphere_sensors b/checks/esx_vsphere_sensors index 4947b9e..1f96016 100644 --- a/checks/esx_vsphere_sensors +++ b/checks/esx_vsphere_sensors @@ -43,6 +43,9 @@ def check_esx_vsphere_sensors(_no_item, _no_params, info): if health_key == "yellow": state = max(state, 1) infos[-1] += "(!)" + elif health_key == "unknown": + state = max(state, 1) + infos[-1] += "(!)" else: state = 2 infos[-1] += "(!!)"

11 years, 6 months

Check_MK Git: check_mk: esx_vsphere_datastores: New check for ESX datastores

by Mathias Kettner

Module: check_mk Branch: master Commit: 489f8c3cc3bfe78bf7488985c7da08101f27f773 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=489f8c3cc3bfe7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 13:12:37 2013 +0100 esx_vsphere_datastores: New check for ESX datastores --- ChangeLog | 5 +- agents/special/agent_vsphere | 39 ++++++++- checkman/esx_vsphere_datastores | 26 ++++++ checks/esx_vsphere_datastores | 92 +++++++++++++++++++++ pnp-templates/check_mk-esx_vsphere_datastores.php | 1 + web/htdocs/valuespec.py | 6 +- web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/datasource_programs.py | 23 +++-- 8 files changed, 175 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=489f8c3cc3…

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 4ee4a9fa57c1dbf507cda777fa8d1c07683eee09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ee4a9fa57c1db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 13:12:40 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: resolved merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: f41e62f82263bbc67f24bbd95638395cef1f1c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f41e62f82263bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 27 12:57:35 2013 +0100 resolved merge conflict --- ChangeLog | 3 +- agents/windows/plugins/mssql.vbs | 39 +++++++++++++++++++++++++++---------- checks/mssql_versions | 6 ++++- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9751c3..d8ea486 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,7 +90,8 @@ * ADD: wmic_processs: cpucores now being considered when calculating user/kernel percentages. (thanks to William Baum) * FIX: UPS checks support Eaton Evolution - + * FIX: windows agent plugin: mssql now exits after 10 seconds + Notifications: * FIX: fixed crash on host notification when contact had explicit services set diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index f515f14..80ffd7d 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -21,11 +21,24 @@ Option Explicit -Dim WMI, prop, instId, instVersion, instIds, instName +Dim WMI, prop, instId, instVersion, instIds, instName, output + +WScript.Timeout = 10 ' Directory of all database instance names Set instIds = CreateObject("Scripting.Dictionary") + +output = "" +Sub addOutput(text) + output = output & text & vbLf +End Sub + + +' Dummy empty output. +' Contains timeout error if this scripts runtime exceeds the timeout +WScript.echo "<<<mssql_versions>>>" + ' Loop all found local MSSQL server instances ' Try different trees to handle different versions of MSSQL On Error Resume Next @@ -43,7 +56,7 @@ If Err.Number <> 0 Then ' try MSSQL < 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") If Err.Number <> 0 Then - wscript.echo "Error: " & Err.Number & " " & Err.Description + addOutput( "Error: " & Err.Number & " " & Err.Description ) Err.Clear() wscript.quit() End If @@ -57,8 +70,8 @@ For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " instId = Replace(prop.ServiceName, "$", "_") instVersion = prop.PropertyStrValue - WScript.echo "<<<mssql_versions>>>" - WScript.echo instId & " " & instVersion + addOutput( "<<<mssql_versions>>>" ) + addOutput( instId & " " & instVersion ) ' Now query the server instance for the databases ' Use name as key and always empty value for the moment @@ -103,7 +116,7 @@ For Each instId In instIds.Keys RS.Open "SELECT counter_name, object_name, instance_name, cntr_value " & _ "FROM sys.dm_os_performance_counters " & _ "WHERE object_name NOT LIKE '%Deprecated%'", CONN - wscript.echo "<<<mssql_counters>>>" + addOutput( "<<<mssql_counters>>>" ) Dim objectName, counterName, instanceName, value Do While NOT RS.Eof objectName = Replace(Replace(Trim(RS("object_name")), " ", "_"), "$", "_") @@ -113,7 +126,7 @@ For Each instId In instIds.Keys instanceName = "None" End If value = Trim(RS("cntr_value")) - wscript.echo objectName & " " & counterName & " " & instanceName & " " & value + addOutput( objectName & " " & counterName & " " & instanceName & " " & value ) RS.MoveNext Loop RS.Close @@ -130,7 +143,7 @@ For Each instId In instIds.Keys RS.Close ' Now gather the db size and unallocated space - wscript.echo "<<<mssql_tablespaces>>>" + addOutput( "<<<mssql_tablespaces>>>" ) Dim i, dbSize, unallocated, reserved, data, indexSize, unused For Each dbName in dbNames.Keys ' Switch to other database and then ask for stats @@ -164,15 +177,15 @@ For Each instId In instIds.Keys Set RS = RS.NextRecordset i = i + 1 Loop - wscript.echo instId & " " & Replace(dbName, " ", "_") & " " & dbSize & " " & unallocated & " " & reserved & " " & _ - data & " " & indexSize & " " & unused + addOutput( instId & " " & Replace(dbName, " ", "_") & " " & dbSize & " " & unallocated & " " & reserved & " " & _ + data & " " & indexSize & " " & unused ) Set RS = CreateObject("ADODB.Recordset") Next ' Loop all databases to get the date of the last backup. Only show databases ' which have at least one backup Dim lastBackupDate - wscript.echo "<<<mssql_backup>>>" + addOutput( "<<<mssql_backup>>>" ) For Each dbName in dbNames.Keys RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date " & _ "FROM msdb.dbo.backupset " & _ @@ -180,7 +193,7 @@ For Each instId In instIds.Keys Do While Not RS.Eof lastBackupDate = Trim(RS("last_backup_date")) If lastBackupDate <> "" Then - wscript.echo instId & " " & Replace(dbName, " ", "_") & " " & lastBackupDate + addOutput( instId & " " & Replace(dbName, " ", "_") & " " & lastBackupDate ) End If RS.MoveNext Loop @@ -192,3 +205,7 @@ Next Set RS = nothing Set CONN = nothing + +' finally output collected data +WScript.echo output + diff --git a/checks/mssql_versions b/checks/mssql_versions index c4c76be..a6116df 100644 --- a/checks/mssql_versions +++ b/checks/mssql_versions @@ -28,7 +28,11 @@ # MSSQL_SQLEXPRESS 10.50.1600.1 def inventory_mssql_versions(info): - return [ (line[0], None) for line in info if len(line) >= 2 ] + inventory = [] + for line in info: + if len(line) == 2 and line[0] != "Error:": + inventory.append((line[0], None)) + return inventory def check_mssql_versions(item, _unused, info): for line in info:

11 years, 6 months

Check_MK Git: check_mk: Add logentry class filter to view '

by Mathias Kettner

Host- and Service events' Message-ID: <5152c1eb.y85OvZTQ+MlMZC5S%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 915f364eda57ff2f56a072ee077402b462c8b82f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=915f364eda57ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:54:35 2013 +0100 Add logentry class filter to view 'Host- and Service events' --- ChangeLog | 1 + web/plugins/views/builtin.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 953d7f2..f9751c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * New filter for IP address of a host * Quicksearch: allow searching for complete IP addresses and IP address prefixes + * Add logentry class filter to view 'Host- and Service events' BI: * FIX: fix exception with expansion level being 'None' diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1812b20..80b0daa 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1641,7 +1641,8 @@ multisite_builtin_views.update({ 'serviceregex', 'logtime', 'log_plugin_output', - 'log_state',], + 'log_state', + 'log_class'], 'sorters': [('log_time', False), ('log_lineno', False)], 'title': _('Host- and Service events'), 'topic': _('Other')},

11 years, 6 months

Check_MK Git: check_mk: Fixed % label in WATO filesystem rule

by Mathias Kettner

Module: check_mk Branch: master Commit: b021b968327e43e4b9861c235ea35293149eff1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b021b968327e43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:40:48 2013 +0100 Fixed % label in WATO filesystem rule --- web/plugins/wato/check_parameters.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0a75123..ad9caad 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1112,8 +1112,8 @@ register_check_parameters( Tuple( title = _("Levels for the used space"), elements = [ - Percentage(title = _("Warning at"), label = _("% usage"), allow_int = True, default_value=80), - Percentage(title = _("Critical at"), label = _("% usage"), allow_int = True, default_value=90)])), + Percentage(title = _("Warning at"), unit = _("% usage"), allow_int = True, default_value=80), + Percentage(title = _("Critical at"), unit = _("% usage"), allow_int = True, default_value=90)])), ( "magic", Float( title = _("Magic factor (automatic level adaptation for large filesystems)"),

11 years, 6 months

Check_MK Git: check_mk: Fix text color in messages

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fcd60334f26ed009999993c21b1160a3627a9cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fcd60334f26ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:37:28 2013 +0100 Fix text color in messages --- web/htdocs/pages.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 4ed2496..8486ecf 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -717,6 +717,10 @@ div.really, div.success, div.error, div.message, div.warning { border-style: solid;*/ } +div.message { + color: black; +} + div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { font-size: 12pt; font-weight: bold;

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: ea4e51f33dcb1270838f0b9ddb10d8e1aac5532e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea4e51f33dcb12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 10:37:30 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits