Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fix Automation bake-agent: read configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 72a0018945e8d817d6a7e5bf97d7df46c080dc43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72a0018945e8d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 17:38:30 2015 +0100 Fix Automation bake-agent: read configuration --- modules/automation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 95491e8..96217f2 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -46,8 +46,6 @@ def do_automation(cmd, args): elif cmd == "update-dns-cache": read_config_files(with_autochecks=False) result = automation_update_dns_cache() - elif cmd == "bake-agents": - result = automation_bake_agents() else: read_config_files() if cmd == "try-inventory": @@ -78,6 +76,8 @@ def do_automation(cmd, args): result = automation_notification_replay(args) elif cmd == "notification-analyse": result = automation_notification_analyse(args) + elif cmd == "bake-agents": + result = automation_bake_agents() else: raise MKAutomationError("Automation command '%s' is not implemented." % cmd)

9 years, 7 months

Check_MK Git: check_mk: mk_inventory.ps1" minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e0b0f4e90ad4390e774f6b2427afb857b4b3bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e0b0f4e90ad43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 17:39:55 2015 +0100 mk_inventory.ps1" minor code cleanup --- agents/windows/plugins/mk_inventory.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 03299ca..0a11313 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -1,3 +1,7 @@ +# Configuration +$delay = 14400 # execute agent only every $delay seconds +$exe_paths = @("c:\Program Files (x86)") + [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 write-output "" # workaround to prevent the byte order mark to be at the beginning of the first section $name = (Get-Item env:\Computername).Value @@ -13,8 +17,6 @@ if (!$agent_dir) { $timestamp = $agent_dir + "\timestamp."+ $remote_host -# execute agent only every $delay seconds -$delay = 14400 # does $timestamp exist? If (Test-Path $timestamp){ @@ -87,8 +89,7 @@ foreach ($path in $paths) { # Search exes write-host "<<<win_exefiles:sep(124):persist($until)>>>" -$paths = @("c:\Program Files (x86)") -foreach ($item in $paths) +foreach ($item in $exe_paths) { if ((Test-Path $item -pathType container)) {

9 years, 7 months

Check_MK Git: check_mk: citrix_xenapp.ps1: One plugin to replace citrix_serverload.ps1 and citrix_sessions.ps1

by Konstantin Büttner

Module: check_mk Branch: master Commit: c9783d8dce66c87cd286abdff09d0b31632a7466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9783d8dce66c8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 23 17:29:33 2015 +0100 citrix_xenapp.ps1: One plugin to replace citrix_serverload.ps1 and citrix_sessions.ps1 --- agents/windows/plugins/citrix_xenapp.ps1 | 14 ++++++++++++++ .../plugins/{ => deprecated}/citrix_serverload.ps1 | 0 .../windows/plugins/{ => deprecated}/citrix_sessions.ps1 | 0 3 files changed, 14 insertions(+) diff --git a/agents/windows/plugins/citrix_xenapp.ps1 b/agents/windows/plugins/citrix_xenapp.ps1 new file mode 100644 index 0000000..8084244 --- /dev/null +++ b/agents/windows/plugins/citrix_xenapp.ps1 @@ -0,0 +1,14 @@ +$computer = "localhost" + +### Citrix XenApp Serverload +$loadObject = Get-WmiObject -Namespace 'Root\Citrix' -class 'MetaFrame_Server_LoadLevel' -ComputerName $computer -ErrorAction Stop +"<<<citrix_serverload>>>" +$loadObject.LoadLevel +$computer = "localhost" + +### Citrix XenApp Sessions +$serverObject = Get-WmiObject -Namespace root\citrix -Class Metaframe_Server -ComputerName $computer +"<<<citrix_sessions>>>" +"sessions {0}" -f $serverObject.NumberOfSessions +"active_sessions {0}" -f $serverObject.NumberOfActiveSessions +"inactive_sessions {0}" -f $serverObject.NumberOfDisconnectedSessions diff --git a/agents/windows/plugins/citrix_serverload.ps1 b/agents/windows/plugins/deprecated/citrix_serverload.ps1 similarity index 100% rename from agents/windows/plugins/citrix_serverload.ps1 rename to agents/windows/plugins/deprecated/citrix_serverload.ps1 diff --git a/agents/windows/plugins/citrix_sessions.ps1 b/agents/windows/plugins/deprecated/citrix_sessions.ps1 similarity index 100% rename from agents/windows/plugins/citrix_sessions.ps1 rename to agents/windows/plugins/deprecated/citrix_sessions.ps1

9 years, 7 months

Check_MK Git: check_mk: cisco_temperature: New check to replace cisco_temp_perf and cisco_temp_sensor. Will not yet inventorize.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4c4933dea31970f05d9c55d0bf3045a2c9bd63ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c4933dea31970… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 23 17:12:33 2015 +0100 cisco_temperature: New check to replace cisco_temp_perf and cisco_temp_sensor. Will not yet inventorize. --- checks/cisco_temperature | 165 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/checks/cisco_temperature b/checks/cisco_temperature new file mode 100644 index 0000000..a2d838d --- /dev/null +++ b/checks/cisco_temperature @@ -0,0 +1,165 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + +def parse_cisco_temp_temperature(info): + description_info, state_info, levels_info, perfstuff = info + + # Parse OIDs described by CISCO-ENTITY-SENSOR-MIB + entity_parsed = {} + + # Create dict of sensor descriptions + descriptions = dict(description_info) + + # Create dict with thresholds + thresholds = {} + for sensor_id, sensortype, scalecode, magnitude, value, sensorstate in state_info: + thresholds.setdefault(sensor_id, []) + + for endoid, level in levels_info: + level = float(level) / (10 ** int(magnitude)) + # endoid is e.g. 21549.9 or 21459.10 + sensor_id, subid = endoid.split('.') + thresholds.setdefault(sensor_id, []).append(level) + + for sensor_id, sensortype, scalecode, magnitude, value, sensorstate in state_info: + descr = descriptions[sensor_id] + if descr and sensortype == '8': + entity_parsed[descr] = {} + scale = 10**int(magnitude) + if scalecode == '8': + scale *= 1000 + entity_parsed[descr]['temp'] = float(value) / scale + + if len(thresholds[sensor_id]) in [ 2, 4 ]: + warnraw, critraw = thresholds[sensor_id][0:2] + dev_levels = (float(warnraw)/scale, float(critraw)/scale) + else: + dev_levels = None + entity_parsed[descr]['dev_levels'] = dev_levels + + if sensorstate == '2': + entity_parsed[descr]['unknown'] = (3, "Data from sensor currently not available") + elif sensorstate == '3': + entity_parsed[descr]['unknown'] = (3, "Sensor is broken") + entity_parsed[descr]['dev_status'] = None + + # Now parse OIDs described by CISCO-ENVMON-MIB + envmon_states = { + '1': "normal", + '2': "warning", + '3': "critical", + '4': "shutdown", + '5': "not present", + '6': "not functioning" + } + + parsed = {} + for statustext, temp, max_temp, state, oid_end in perfstuff: + item = cisco_sensor_item(statustext, oid_end) + parsed[item] = {} + parsed[item]['temp'] = int(temp) + if state in ['5', '6']: + parsed[item]['unknown'] = (3, "Sensor %s" % envmon_states[state]) + elif max_temp and int(max_temp): + parsed[item]['dev_status'] = None + parsed[item]['dev_levels'] = (int(max_temp), int(max_temp)) + else: + parsed[item]['dev_levels'] = None + if state == '1': + parsed[item]['dev_status'] = 0 + elif state == '2': + parsed[item]['dev_status'] = 1 + elif state in '34': + parsed[item]['dev_status'] = 2 + else: + parsed[item]['unknown'] = (3, "Sensor reports unknown status code") + + # Merge the two dicts, preferring keys generated from ENTITY data + parsed.update(entity_parsed) + + return parsed + + +def inventory_cisco_temp_temperature(parsed): + for item in parsed.keys(): + yield item, None + + +def check_cisco_temp_temperature(item, params, parsed): + if item in parsed: + if parsed[item].get('unknown', None): + return parsed[item]['unknown'] + else: + return check_temperature(parsed[item]['temp'], params, + dev_levels = parsed[item]['dev_levels'], + dev_status = parsed[item]['dev_status']) + + +check_info['cisco_temp_temperature'] = { + "parse_function" : parse_cisco_temp_temperature, + "inventory_function" : inventory_cisco_temp_temperature, + "check_function" : check_cisco_temp_temperature, + "service_description": "Temperature %s", + "group" : "temperature", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: False, +# "snmp_scan_function" : lambda oid: True, #lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ +# # ( oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") != None or +# # oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None ), + "snmp_info" : [ + # cisco_temp_sensor data + ( ".1.3.6.1.2.1.47.1.1.1.1", [ + OID_END, + 2, # Description of the sensor + ]), + + # Type and current state + ( ".1.3.6.1.4.1.9.9.91.1.1.1.1", [ + OID_END, + 1, # Type (see above), 8 = Celsius, 12 = truth value + 2, # scalecode, 8 == milli + 3, # Precision + 4, # Most recent measurement + 5, # Status of the sensor 1 == ok, 2 == cannot report, 3 == broken + ]), + + # Threshold + ( ".1.3.6.1.4.1.9.9.91.1.2.1.1", [ + OID_END, + 4, # Thresholds + ]), + + # cisco_temp_perf data + ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ # CISCO-SMI + 2, # ciscoEnvMonTemperatureStatusDescr + 3, # ciscoEnvMonTemperatureStatusValue + 4, # ciscoEnvMonTemperatureThreshold + 6, # ciscoEnvMonTemperatureState + OID_END + ]), + ], + "includes" : [ "temperature.include", 'cisco_sensor_item.include' ], +}

9 years, 7 months

Check_MK Git: check_mk: Fix comment in windows plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: 36bd86b7313ef549d1700d8ef965e8ddffd7fdc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36bd86b7313ef5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 16:57:42 2015 +0100 Fix comment in windows plugin --- agents/windows/plugins/ad_replication.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/ad_replication.bat b/agents/windows/plugins/ad_replication.bat index af04d5f..acc8a73 100644 --- a/agents/windows/plugins/ad_replication.bat +++ b/agents/windows/plugins/ad_replication.bat @@ -1,7 +1,7 @@ @echo off REM *** -REM * To be able to run this check you need apprpriate credentials +REM * To be able to run this check you need appropriate credentials REM * in the target domain. REM * REM * Normally the Check_MK agent runs as sevice with local system

9 years, 7 months

Check_MK Git: check_mk: Internal cleanup of two windows plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c23fd5cdbb5b6e07e4ae0357636a2c0ea5630d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c23fd5cdbb5b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 16:06:17 2015 +0100 Internal cleanup of two windows plugins --- agents/windows/plugins/.f12 | 4 + agents/windows/plugins/arcserve_backup.ps1 | 292 ++++++++++++++-------------- agents/windows/plugins/megaraid.bat | 12 +- 3 files changed, 157 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c23fd5cdb…

9 years, 7 months

Check_MK Git: check_mk: New helper function for outputting % in defined precision

by Mathias Kettner

Module: check_mk Branch: master Commit: 5894921ccdaf5857dc354d62fa2069c7858e2ce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5894921ccdaf58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 15:06:46 2015 +0100 New helper function for outputting % in defined precision --- checks/df.include | 7 ++----- modules/check_mk_base.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/checks/df.include b/checks/df.include index fa8f36d..dd667f9 100644 --- a/checks/df.include +++ b/checks/df.include @@ -319,11 +319,8 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved # Show enough decimal digits so that very small percentages are still # visible! - if used_perc > 0: - perc_precision = max(1, 2 - int(round(math.log(used_perc, 10)))) - else: - perc_precision = 1 - infotext = "%%.%df%%%% used (%%s of %%s), %%s" % perc_precision % (used_perc, used_hr, size_hr, levels["levels_text"]) + infotext = "%s used (%s of %s), %s" % ( + get_percent_human_readable(used_perc), used_hr, size_hr, levels["levels_text"]) status = 0 if warn_mb <= -1: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 33eb289..1051e85 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1904,6 +1904,17 @@ def get_age_human_readable(secs): return "%d days %d hours" % (days, hours) return "%d days" % days +# Format perc (0 <= perc <= 100 + x) so that precision +# digits are being displayed. This avoids a "0.00%" for +# very small numbers +def get_percent_human_readable(perc, precision=2): + if perc > 0: + perc_precision = max(1, 2 - int(round(math.log(perc, 10)))) + else: + perc_precision = 1 + return "%%.%df%%%%" % perc_precision % perc + + # Quote string for use as arguments on the shell def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'"

9 years, 7 months

Check_MK Git: check_mk: Fix .f12 helper for pnp-templates,

by Mathias Kettner

delete vanished templates Message-ID: <54eb3483.A2lIcxRGH+hLnZXM%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: cdfb714c4e7c93d487922c55e7da54db3c18b11b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdfb714c4e7c93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 15:07:05 2015 +0100 Fix .f12 helper for pnp-templates, delete vanished templates --- pnp-templates/.f12 | 2 -- 1 file changed, 2 deletions(-) diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index d997ff7..b8f7795 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -9,5 +9,3 @@ if [ $(nmap -PN -p 32000 localhost | egrep "32000.*open" | wc -l) -gt 0 ] then echo 'location.reload();' | nc -w 0 localhost 32000 fi - -

9 years, 7 months

Check_MK Git: check_mk: Fix crash when working with stored SNMP walks and agent simulator

by Mathias Kettner

Module: check_mk Branch: master Commit: ef89374829d49451e440c2d389b9cfd6b4927002 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef89374829d494… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 15:07:41 2015 +0100 Fix crash when working with stored SNMP walks and agent simulator --- modules/check_mk.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d6810d7..abe2248 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -254,7 +254,7 @@ config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] + modules = [ 'check_mk_base', 'discovery', 'snmp', 'agent_simulator', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -5322,9 +5322,6 @@ def read_config_files(with_autochecks=True, with_conf_d=True): ('logwatch_dir', logwatch_dir, "", "Logwatch", True, True, True ), ] - # Load agent simulator if enabled in configuration - execfile(modules_dir + "/agent_simulator.py", globals(), globals()) - # Compute parameters for a check honoring factory settings, # default settings of user in main.mk, check_parameters[] and

9 years, 7 months

Check_MK Git: check_mk: Added internal comment for future get_rate

by Mathias Kettner

Module: check_mk Branch: master Commit: 833cf55c0835aac3350440c430218b0ed0fb244c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=833cf55c0835aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 15:08:08 2015 +0100 Added internal comment for future get_rate --- modules/check_mk_base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1051e85..f97061e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -938,6 +938,11 @@ def clear_counters(pattern, older_than): del g_counters[name] +# Idea (1): We could keep global variables for the name of the checktype and item +# during a check and that way "countername" would need to be unique only +# within one checked item. So e.g. you could use "bcast" as name and not "if.%s.bcast" % item +# Idea (2): Check_MK should fetch a time stamp for each info. This should also be +# available as a global variable, so that this_time would be an optional argument. def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP): try: timedif, rate = get_counter(countername, this_time, this_val, allow_negative)

9 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015