Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: Removed further trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 73671cff39a71ab78fa9f965094e49113e834642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73671cff39a71a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 09:43:43 2014 +0200 Removed further trailing spaces --- Makefile | 4 ++-- agents/cfg_examples/jolokia.cfg | 2 +- agents/cfg_examples/logwatch.cfg | 2 +- agents/cfg_examples/sqlplus.sh | 4 ++-- agents/check_mk_caching_agent.linux | 2 +- agents/special/agent_emcvnx | 2 +- agents/special/agent_hivemanager | 6 +++--- agents/special/agent_innovaphone | 12 ++++++------ agents/special/agent_random | 2 +- agents/special/agent_vsphere | 2 +- agents/special/agent_vsphere.pysphere | 6 +++--- agents/waitmax.c | 8 ++++---- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 9ccd4aa..f0436eb 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,8 @@ HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ $$(find pnp-templates -type f -name "*.php") \ mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py \ mkeventd/src/*.c mkeventd/checks/* check_mk_templates.cfg \ - doc/treasures/mknotifyd agents/check_mk_agent* \ - $$(find agents/plugins -type f) + doc/treasures/mknotifyd agents/check_mk_*agent* agents/*.c agents/cfg_examples/* \ + agents/special/* $$(find agents/plugins -type f) .PHONY: help install clean diff --git a/agents/cfg_examples/jolokia.cfg b/agents/cfg_examples/jolokia.cfg index c9bfd2a..75abc26 100644 --- a/agents/cfg_examples/jolokia.cfg +++ b/agents/cfg_examples/jolokia.cfg @@ -36,7 +36,7 @@ instance = None # Configuration for multiple instances. Not-specified # values will be taken from the upper settings # instances = [ -# { +# { # "port" : 8080, # "instance" : "FOO", # }, diff --git a/agents/cfg_examples/logwatch.cfg b/agents/cfg_examples/logwatch.cfg index 238bcb8..8fec948 100644 --- a/agents/cfg_examples/logwatch.cfg +++ b/agents/cfg_examples/logwatch.cfg @@ -30,7 +30,7 @@ /var/log/messages # Patterns are indented with one space are prefixed with: # C: Critical messages -# W: Warning messages +# W: Warning messages # I: ignore these lines (OK) # R: Rewrite the output previous match. You can use \1, \2 etc. for refer to groups (.*) of this match # The first match decided. Lines that do not match any pattern diff --git a/agents/cfg_examples/sqlplus.sh b/agents/cfg_examples/sqlplus.sh index 2fd8d73..a561a1d 100755 --- a/agents/cfg_examples/sqlplus.sh +++ b/agents/cfg_examples/sqlplus.sh @@ -25,8 +25,8 @@ # EXAMPLE -# This script is called by the Check_MK ORACLE plugin in order to -# execute an SQL query. +# This script is called by the Check_MK ORACLE plugin in order to +# execute an SQL query. # It is your task to adapt this script so that the ORACLE environment # is setup and the correct user chosen to execute sqlplus. diff --git a/agents/check_mk_caching_agent.linux b/agents/check_mk_caching_agent.linux index 32e53dc..896a591 100755 --- a/agents/check_mk_caching_agent.linux +++ b/agents/check_mk_caching_agent.linux @@ -50,7 +50,7 @@ export MK_CACHEDIR="/var/cache/check_mk" # Determine the IP address of the remote Nagios server. -# xinetd sends us the IP address of the remote host via +# xinetd sends us the IP address of the remote host via # the environment variable REMOTE_HOST. SSH sets a variable # SSH_CONNECTION where the remote IP address is the first # part of a space-separated list. Of both fails, we set diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index de3b388..4dc7bdd 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -102,7 +102,7 @@ password = None mortypes = [ 'all' ] fetch_agent_info = False -naviseccli_options = { +naviseccli_options = { "disks" : {"cmd_option" : "-disk", "active" : False}, "hba" : {"cmd_option" : "-hba", "active" : False}, "hwstatus" : {"cmd_option" : "-array", "active" : False}, diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index 80bfb40..855128e 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -31,7 +31,7 @@ import urllib2, base64, json try: ip = sys.argv[1] user = sys.argv[2] - password = sys.argv[3] + password = sys.argv[3] except: print "Usage: agent_hivemanager <IP> <USERNAME> <PASSWORD>" sys.exit(2) @@ -39,7 +39,7 @@ except: def get_url(address): request = urllib2.Request(address) base64string = base64.encodestring('%s:%s' % (user, password)).replace('\n', '') - request.add_header("Authorization", "Basic %s" % base64string) + request.add_header("Authorization", "Basic %s" % base64string) request.add_header("Content-Type", "application/json") try: return urllib2.urlopen(request) @@ -48,7 +48,7 @@ def get_url(address): sys.exit(2) print "<<<check_mk>>>" -print "Version: 1.2.5" +print "Version: 1.2.5" print "AgentOs: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" diff --git a/agents/special/agent_innovaphone b/agents/special/agent_innovaphone index 7a9d773..8c8f03c 100755 --- a/agents/special/agent_innovaphone +++ b/agents/special/agent_innovaphone @@ -31,17 +31,17 @@ import urllib2, base64 server = sys.argv[1] user = sys.argv[2] -password = sys.argv[3] +password = sys.argv[3] def get_url(address): request = urllib2.Request(address) base64string = base64.encodestring('%s:%s' % (user, password)).replace('\n', '') - request.add_header("Authorization", "Basic %s" % base64string) + request.add_header("Authorization", "Basic %s" % base64string) return urllib2.urlopen(request) def get_informations(name, xml_id, org_name): data_url = "/LOG0/CNT/mod_cmd.xml?cmd=xml-count&x=" - address = "http://%s%s%s" % ( server, data_url, xml_id ) + address = "http://%s%s%s" % ( server, data_url, xml_id ) c = False for line in etree.parse(get_url(address)).getroot(): for child in line: @@ -53,7 +53,7 @@ def get_informations(name, xml_id, org_name): def get_pri_channel(channel_name): data_url = "/%s/mod_cmd.xml" % channel_name - address = "http://%s%s" % ( server, data_url) + address = "http://%s%s" % ( server, data_url) data = etree.parse(get_url(address)).getroot() link = data.get('link') physical = data.get('physical') @@ -74,8 +74,8 @@ def get_licenses(): data = etree.parse(get_url(address)).getroot() for child in data.findall('lic'): if child.get('name') == "Port": - count = child.get('count') - used = child.get('used') + count = child.get('count') + used = child.get('used') print count, used break diff --git a/agents/special/agent_random b/agents/special/agent_random index 6d84745..1350757 100755 --- a/agents/special/agent_random +++ b/agents/special/agent_random @@ -60,7 +60,7 @@ services = [ print '<<<local>>>' state_names = [ "OK", "WARN", "CRIT", "UNKNOWN" ] -state_texts = [ +state_texts = [ "Everying is OK now", "The freibl might go slisk", "Bad luck, everything is broken", diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 9f97aad..8d2410a 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # This agent version uses predefined soap inquiries which are sent -# to an esx host system. # Unlike the classic agent the reported data +# to an esx host system. # Unlike the classic agent the reported data # isn't processed through the pysphere module. # Instead a simple string process approach is used which drastically # reduces the CPU load for this agent diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 0ad82fe..9a659d5 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -532,12 +532,12 @@ def output_hostsystem_counters(all_counters = False): 131078, 131079, 131091, 131076, 131077, ] - + #needed_ids = [ # # sys.resourceMem* # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, #] - + # Seems as this is not available in ESX 5.0 but we saw it on 5.1 if esx_version_num > 5.0: # sys.resourceMemConsumed @@ -649,7 +649,7 @@ def output_mors(what, properties, direct=False): g_datastores = {} def output_datastores(): - property_names = [ + property_names = [ "name", "summary.freeSpace", "summary.capacity", diff --git a/agents/waitmax.c b/agents/waitmax.c index 78c031b..de09216 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -29,7 +29,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> -#include <errno.h> +#include <errno.h> #include <signal.h> #include <getopt.h> @@ -110,7 +110,7 @@ int main(int argc, char **argv) int maxtime = atoi(argv[optind]); if (maxtime <= 0) usage(); - + g_pid = fork(); if (g_pid == 0) { signal(SIGALRM, signalhandler); @@ -122,7 +122,7 @@ int main(int argc, char **argv) out("\n"); exit(253); } - + signal(SIGALRM, signalhandler); alarm(maxtime); int status; @@ -138,7 +138,7 @@ int main(int argc, char **argv) } else break; } - + if (WIFEXITED(status)) { int exitcode = WEXITSTATUS(status); return exitcode;

10 years

Check_MK Git: check_mk: #1113 FIX oracle_rman: fixed exception when backup was currently running

by Andreas Boesl

Module: check_mk Branch: master Commit: 366e8faed1293febefccc7fb5ef898b41836ee13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=366e8faed1293f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 15 09:40:50 2014 +0200 #1113 FIX oracle_rman: fixed exception when backup was currently running --- .werks/1113 | 9 +++++++++ ChangeLog | 1 + checks/oracle_rman | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1113 b/.werks/1113 new file mode 100644 index 0000000..fc764bb --- /dev/null +++ b/.werks/1113 @@ -0,0 +1,9 @@ +Title: oracle_rman: fixed exception when backup was currently running +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410766821 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1156af0..ced4d3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ NOTE: Please refer to the migration notes! * 1104 FIX: winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts... * 1110 FIX: windows agent: fixed missing agent section problem if a cached script ran into a timeout... + * 1113 FIX: oracle_rman: fixed exception when backup was currently running Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/oracle_rman b/checks/oracle_rman index 030c56b..b4b4caf 100644 --- a/checks/oracle_rman +++ b/checks/oracle_rman @@ -28,7 +28,7 @@ # TUX2 COMPLETED 2014-07-08_17:27:59 2014-07-08_17:29:35 DB_INCR 32 # TUX2 COMPLETED 2014-07-08_17:30:02 2014-07-08_17:30:06 ARCHIVELOG 121 -# Columns: SID STATUS START END BACKUPTYPE BACKUAGE +# Columns: SID STATUS START END BACKUPTYPE BACKUPAGE def inventory_oracle_rman(info): return [ (line[0] + "." + line[4], {}) for line in info @@ -39,6 +39,8 @@ def inventory_oracle_rman(info): def check_oracle_rman(item, params, info): for sid, status, start, end, backuptype, backupage in info: if item == sid + "." + backuptype: + if not backupage: + return 0, "Backup is currently running" backupage = int(backupage) infotext = "Last backup %s ago" % get_age_human_readable(backupage * 60)

10 years

Check_MK Git: check_mk: Removed two print statements

by Mathias Kettner

Module: check_mk Branch: master Commit: c420fc3f03d0046a05cab0d80a6456a8737f0634 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c420fc3f03d004… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 09:11:32 2014 +0200 Removed two print statements --- doc/treasures/notifications/multitech | 2 +- doc/treasures/notifications/pushover | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/notifications/multitech b/doc/treasures/notifications/multitech index 019dc68..4ce59b1 100755 --- a/doc/treasures/notifications/multitech +++ b/doc/treasures/notifications/multitech @@ -122,7 +122,7 @@ url += urllib.urlencode([ try: handle = urllib.urlopen(url) response = handle.read().strip() - print response + sys.stdout.write("%s\n" % response) if response.startswith("ID:"): sys.stdout.write("Successfully sent SMS to %s\n" % to) else: diff --git a/doc/treasures/notifications/pushover b/doc/treasures/notifications/pushover index 521704f..ea6e767 100755 --- a/doc/treasures/notifications/pushover +++ b/doc/treasures/notifications/pushover @@ -63,5 +63,5 @@ headers = dict(response.getheaders()) status = headers.get('status') code, explanation = status.split(None, 1) if code != "200": - print "Failed to notify via Pushover: %s, HTTP status is %s" % (explanation, status) + sys.stdout.write("Failed to notify via Pushover: %s, HTTP status is %s\n" % (explanation, status)) sys.exit(1)

10 years

Check_MK Git: check_mk: #1400 Added example notification script for Pushover to doc/treasures/ notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c8553ad5746428cfd8935089bedceb8de60f08e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8553ad574642… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 09:10:17 2014 +0200 #1400 Added example notification script for Pushover to doc/treasures/notifications This plugin can send notifications via pushover.net. You need to edit your keys directly in the script. There is not yet a WATO integration. --- .werks/1400 | 10 +++ ChangeLog | 1 + doc/treasures/notifications/README | 8 +++ .../{notify_mobilant.py => notifications/mobilant} | 0 .../multitech} | 0 doc/treasures/notifications/pushover | 67 ++++++++++++++++++++ .../{notify_trap => notifications/snmp_trap} | 0 7 files changed, 86 insertions(+) diff --git a/.werks/1400 b/.werks/1400 new file mode 100644 index 0000000..19314e5 --- /dev/null +++ b/.werks/1400 @@ -0,0 +1,10 @@ +Title: Added example notification script for Pushover to doc/treasures/notifications +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1410764966 +Class: feature + +This plugin can send notifications via pushover.net. You need to edit your keys +directly in the script. There is not yet a WATO integration. diff --git a/ChangeLog b/ChangeLog index dbf911a..b222317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... * 1394 HTML notifications have a new content field for debugging variables... + * 1400 Added example notification script for Pushover to doc/treasures/notifications... * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... diff --git a/doc/treasures/notifications/README b/doc/treasures/notifications/README new file mode 100644 index 0000000..103dbc9 --- /dev/null +++ b/doc/treasures/notifications/README @@ -0,0 +1,8 @@ +These are notifications plugins for Check_MK. You can put them +in the notifications/ directory of your Check_MK installations. +OMD-based users put this into their site in to. +local/share/check_mk/notifications/ + +These scripts to not yet have a WATO integration. You might +need to update keys, passwords, etc. directly within these +scripts currently. diff --git a/doc/treasures/notify_mobilant.py b/doc/treasures/notifications/mobilant similarity index 100% rename from doc/treasures/notify_mobilant.py rename to doc/treasures/notifications/mobilant diff --git a/doc/treasures/notify_multitech.py b/doc/treasures/notifications/multitech similarity index 100% rename from doc/treasures/notify_multitech.py rename to doc/treasures/notifications/multitech diff --git a/doc/treasures/notifications/pushover b/doc/treasures/notifications/pushover new file mode 100755 index 0000000..521704f --- /dev/null +++ b/doc/treasures/notifications/pushover @@ -0,0 +1,67 @@ +#!/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. + +# Send notification to Pushover +# +# This notification script can be put below share/check_mk/notifications. It sends +# notifications to Pushover. Note: this currently is just a simple test. The device +# should probably be set to a user name or similar. + +import sys, os, urllib, httplib + +# Enter your keys and tokens here. For details about what that's +# about please refer to the Pushover documentation. +user_key = "XXXXXXXXXXXXXXXXXXXXXXXXXXX" +app_token = "XXXXXXXXXXXXXXXXXXXXXXXXXXX" +device = "XXXXX" + +message = os.environ['NOTIFY_HOSTNAME'] + " " + +if os.environ['NOTIFY_WHAT'] == 'SERVICE': + message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + +else: + message += "is " + os.environ['NOTIFY_HOSTSTATE'] + + +conn = httplib.HTTPSConnection("api.pushover.net:443") +conn.request("POST", "/1/messages.json", +urllib.urlencode({ + "token" : app_token, + "user" : user_key, + "message" : message, +}), { "Content-type": "application/x-www-form-urlencoded" }) +response = conn.getresponse() +headers = dict(response.getheaders()) +status = headers.get('status') +code, explanation = status.split(None, 1) +if code != "200": + print "Failed to notify via Pushover: %s, HTTP status is %s" % (explanation, status) + sys.exit(1) diff --git a/doc/treasures/notify_trap b/doc/treasures/notifications/snmp_trap old mode 100644 new mode 100755 similarity index 100% rename from doc/treasures/notify_trap rename to doc/treasures/notifications/snmp_trap

10 years

Check_MK Git: check_mk: #1112 esx_vsphere_hostsystem.mem_usage_cluster: allows to monitor total RAM usage of all nodes in a cluster

by Andreas Boesl

Module: check_mk Branch: master Commit: a7ee01c404f83d5dc4d10d1b3b69ba9addc4bdd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7ee01c404f83d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 12 17:22:59 2014 +0200 #1112 esx_vsphere_hostsystem.mem_usage_cluster: allows to monitor total RAM usage of all nodes in a cluster This check can not be inventorized. You need to create a manual check and assign it to a cluster. The memory information of each cluster node is added to the total memory pool. You are able to set limits for the total RAM usage depending on the number of cluster nodes. --- .werks/1112 | 11 +++++ ChangeLog | 1 + checkman/esx_vsphere_hostsystem.mem_usage_cluster | 34 ++++++++++++++ checks/esx_vsphere_hostsystem | 50 +++++++++++++++++++++ web/plugins/wato/check_parameters.py | 25 +++++++++++ 5 files changed, 121 insertions(+) diff --git a/.werks/1112 b/.werks/1112 new file mode 100644 index 0000000..4fe2a01 --- /dev/null +++ b/.werks/1112 @@ -0,0 +1,11 @@ +Title: esx_vsphere_hostsystem.mem_usage_cluster: allows to monitor total RAM usage of all nodes in a cluster +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410535073 +Class: feature + +This check can not be inventorized. You need to create a manual check and assign it to a cluster. +The memory information of each cluster node is added to the total memory pool. +You are able to set limits for the total RAM usage depending on the number of cluster nodes. diff --git a/ChangeLog b/ChangeLog index dbf911a..5ff327b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1108 printer_io.include: included tray description in check output * 0657 diskstat: cluster support added for single disk modes * 1111 vCenter monitoring: greatly improved performance (at least 40 times faster)... + * 1112 esx_vsphere_hostsystem.mem_usage_cluster: allows to monitor total RAM usage of all nodes in a cluster... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/esx_vsphere_hostsystem.mem_usage_cluster b/checkman/esx_vsphere_hostsystem.mem_usage_cluster new file mode 100644 index 0000000..36e00fd --- /dev/null +++ b/checkman/esx_vsphere_hostsystem.mem_usage_cluster @@ -0,0 +1,34 @@ +title: VMware ESX vCenter: Total physical RAM usage of clustered ESX hosts +agents: vsphere +catalog: os/kernel +license: GPL +distribution: check_mk +description: + This check measures the total physical RAM usage for a cluster of hosts. + This check is only applicable for clusters and cannot be inventorized. + You need to create a manual check for it in WATO and assign it to a cluster host. + +examples: + static_checks['mem_cluster'] = [ + ( ('esx_vsphere_hostsystem.mem_usage_cluster', None, + [(2, (60.0, 70.0)), + (5, (70.0, 80.0)), + (7, (85.0, 90.0)) + ]), [], ['esx_cluster'] ), + ] + static_checks['mem_cluster'] + + + +inventory: + Not applicable + +perfdata: + One value: the current total usage in bytes. + +[parameters] +parameters (dict): A list of tuples where you can define the number of + minimum required nodes and the corresponding levels. + +OneElement Tuple: number_of_nodes(int), (WARN(float), CRIT(float)) + + Please refer example. diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index e518ea1..745e97f 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -99,6 +99,56 @@ check_info['esx_vsphere_hostsystem.cpu_usage'] = { #. +# .--Mem-Cluster---------------------------------------------------------. +# | __ __ ____ _ _ | +# | | \/ | ___ _ __ ___ / ___| |_ _ ___| |_ ___ _ __ | +# | | |\/| |/ _ \ '_ ` _ \ _____| | | | | | / __| __/ _ \ '__| | +# | | | | | __/ | | | | |_____| |___| | |_| \__ \ || __/ | | +# | |_| |_|\___|_| |_| |_| \____|_|\__,_|___/\__\___|_| | +# | | +# +----------------------------------------------------------------------+ + +def check_esx_vsphere_hostsystem_mem_cluster(item, params, info): + data = {} + for line in info: + if line[0] in ["summary.quickStats.overallMemoryUsage", "hardware.memorySize", "name"]: + data.setdefault(line[0], []).append(line[1]) + sorted_params = sorted(params, reverse = True) + + nodes_count = len(data['name']) + total_memory_usage = sum(map(lambda x: savefloat(x) * 1024 * 1024, data['summary.quickStats.overallMemoryUsage'])) + total_memory_size = sum(map(lambda x: savefloat(x), data['hardware.memorySize'])) + + level = total_memory_usage / total_memory_size * 100 + label = "" + state = 0 + for count, levels in sorted_params: + if nodes_count >= count: + warn, crit = levels + if level > crit: + state = 2 + label = " (Levels at %d%%/%d%%)" % (warn, crit) + elif level > warn: + state = 1 + label = " (Levels at %d%%/%d%%)" % (warn, crit) + break + + + perf = [("usage", total_memory_usage, warn * total_memory_size / 100, + crit * total_memory_size / 100, 0, total_memory_size)] + yield state, "%d%%%s used - %s/%s" % \ + (level, label, get_bytes_human_readable(total_memory_usage), get_bytes_human_readable(total_memory_size)), perf + + +check_info['esx_vsphere_hostsystem.mem_usage_cluster'] = { + "check_function" : check_esx_vsphere_hostsystem_mem_cluster, + "service_description" : "Memory used", + "group" : "mem_cluster", + "has_perfdata" : True, +} + + + # .--Memory--------------------------------------------------------------. # | __ __ | # | | \/ | ___ _ __ ___ ___ _ __ _ _ | diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8ef194f..3876013 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2599,6 +2599,31 @@ register_check_parameters( ) register_check_parameters( + subgroup_networking, + "mem_cluster", + _("Memory Usage of Clusters"), + ListOf( + Tuple( + elements = [ + Integer(title = _("Equal or more than"), unit = _("nodes")), + Tuple( + title = _("Specify levels in percentage of total RAM"), + elements = [ + Percentage(title = _("Warning at a RAM usage of"), default_value = 80.0), + Percentage(title = _("Critical at a RAM usage of"), default_value = 90.0), + ]) + ] + ), + help = _("Here you can specify the total memory usage levels for clustered hosts "), + title = _(""), + add_label = _("Add setting") + ), + None, + "first", + False +) + +register_check_parameters( subgroup_os, "esx_host_memory", _("Main memory usage of ESX host system"),

10 years, 1 month

Check_MK Git: check_mk: cmk-plugins-statistics: omit parameters for legacy checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b2f194fc4302b41aaf7be01b59bf98009cc47f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b2f194fc4302b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 16:25:10 2014 +0200 cmk-plugins-statistics: omit parameters for legacy checks --- doc/treasures/cmk-plugin-statistics | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/cmk-plugin-statistics b/doc/treasures/cmk-plugin-statistics index ee2171b..f993220 100755 --- a/doc/treasures/cmk-plugin-statistics +++ b/doc/treasures/cmk-plugin-statistics @@ -15,6 +15,7 @@ echo -e "GET services\nColumns: host_name check_command" \ | unixcat "$LIVE_SOCKET" \ | sort -u \ | cut -d\; -f2 \ + | cut -d\! -f1 \ | sort \ | uniq -c \ | sort -rn

10 years, 1 month

Check_MK Git: check_mk: #1111 vCenter monitoring: greatly improved performance (at least 40 times faster)

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f607efdb209ac15f3729a007e0674cee270a421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f607efdb209ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 12 16:06:05 2014 +0200 #1111 vCenter monitoring: greatly improved performance (at least 40 times faster) The pysphere API is no longer used when monitoring ESX vCenter systems. We are now using much simpler tools to evaluate the vCenter response instead, thus saving quite a lot of cpu time. Depending on the number of ESX Hosts and virtualmachines you will see a performance increase by a factor of 40-200. <br><br> Note:<br> If the "Compatibility mode" is set in WATO the old "pysphere" version is still being used. This option remains for older (<5.0) ESX versions. --- .werks/1111 | 17 + ChangeLog | 1 + agents/special/agent_vsphere | 698 +++++++++++++++++++++++++++++------------- 3 files changed, 509 insertions(+), 207 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0f607efdb2…

10 years, 1 month

Check_MK Git: check_mk: mysql.innodb_io: fix UNKNOWN, due to recent diskstat change

by Mathias Kettner

Module: check_mk Branch: master Commit: aee66f05a8d3c7c9b1552811dbbb2a6c5fbaf833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aee66f05a8d3c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:50:14 2014 +0200 mysql.innodb_io: fix UNKNOWN, due to recent diskstat change --- checks/mysql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mysql b/checks/mysql index c71a922..15de35f 100644 --- a/checks/mysql +++ b/checks/mysql @@ -142,7 +142,7 @@ def inventory_mysql_iostat(info): def check_mysql_iostat(item, params, info): values = parse_mysql(info) - line = [ None, values["Innodb_data_read"] / 512, values["Innodb_data_written"] / 512] + line = [ None, None, values["Innodb_data_read"] / 512, values["Innodb_data_written"] / 512] return check_diskstat_line(time.time(), 'innodb_io', params, line)

10 years, 1 month

Check_MK Git: check_mk: hpux_lunstats: fix UNKNOWN, due to recent diskstat change

by Mathias Kettner

Module: check_mk Branch: master Commit: 73c94a34394e3753fca1a3d0643d073de901ccc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c94a34394e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:47:56 2014 +0200 hpux_lunstats: fix UNKNOWN, due to recent diskstat change --- checks/hpux_lunstats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hpux_lunstats b/checks/hpux_lunstats index bc45337..530a358 100644 --- a/checks/hpux_lunstats +++ b/checks/hpux_lunstats @@ -62,7 +62,7 @@ def hpux_lunstats_convert(info): bytes_read = int(right) / 512 elif left == 'Bytes written': bytes_written = int(right) / 512 - luns.append((lun, bytes_read, bytes_written)) + luns.append((None, lun, bytes_read, bytes_written)) return luns def check_hpux_lunstats(item, params, info):

10 years, 1 month

Check_MK Git: check_mk: diskstat: fix summary mode, fix aix_diskiod

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f669c3222eea95b2667f1ea8c5d55a5ed431f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f669c3222eea9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:45:30 2014 +0200 diskstat: fix summary mode, fix aix_diskiod --- checks/aix_diskiod | 5 +++-- checks/diskstat.include | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/aix_diskiod b/checks/aix_diskiod index e10224c..cd250e4 100644 --- a/checks/aix_diskiod +++ b/checks/aix_diskiod @@ -46,8 +46,8 @@ def aix_diskiod_convert(info): converted = [] - for device, tm_act, kbps, tps, kb_read, kb_written in info: - converted.append((device, int(kb_read) * 1024, int(kb_written) * 1024)) + for node_info, device, tm_act, kbps, tps, kb_read, kb_written in info: + converted.append((node_info, device, int(kb_read) * 1024, int(kb_written) * 1024)) return converted @@ -63,6 +63,7 @@ check_info["aix_diskiod"] = { 'inventory_function': inventory_aix_diskiod, 'service_description': 'Disk IO %s', 'has_perfdata': True, + 'node_info': True, 'group': 'disk_io', 'includes': [ "diskstat.include" ], } diff --git a/checks/diskstat.include b/checks/diskstat.include index 015acce..6d2690e 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -224,7 +224,7 @@ def check_diskstat_generic(item, params, this_time, info, mode='sectors'): if ' ' in devname: continue summary_line = map(lambda e: e[0] + int(e[1]), zip(summary_line, line[2:])) - return check_diskstat_line(this_time, "SUMMARY", params, [''] + summary_line, mode) + return check_diskstat_line(this_time, "SUMMARY", params, [None, ''] + summary_line, mode) # single mode result = ""

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits