Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: RBN analyser: tolerate missing SHORTDATETIME

by Mathias Kettner

Module: check_mk Branch: master Commit: 4491df59495080465ca9a3d63efa2523edd4bd0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4491df59495080… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 09:13:07 2014 +0200 RBN analyser: tolerate missing SHORTDATETIME --- web/htdocs/wato.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1c114fc..c3f93bb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8849,9 +8849,14 @@ def mode_notifications(phase): html.icon(_("You are analysing this notification"), "rulematch") table.cell(_("Nr."), nr+1, css="number") - date = entry.get("SHORTDATETIME", "") - if not date: + if "MICROTIME" in entry: date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(int(entry["MICROTIME"]) / 1000000.0)) + else: + date = entry.get("SHORTDATETIME") or \ + entry.get("LONGDATETIME") or \ + entry.get("DATE") or \ + _("Unknown date") + table.cell(_("Date/Time"), date, css="nobr") nottype = entry.get("NOTIFICATIONTYPE") table.cell(_("Type"), nottype)

10 years

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 68907f3472464b1101a25d385f254b10290e04ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68907f3472464b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 08:52:53 2014 +0200 Minor code cleanup --- agents/special/agent_hivemanager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index 665cbb3..bee31ee 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -47,7 +47,7 @@ def get_url(address): print e sys.exit(2) -print "<<<check_mk>>>" +print "<<<check_mk>>>" print "Version: 1.2.5" print "AgentOS: Hivemanager"

10 years

Check_MK Git: check_mk: Renamed AgentOs into AgentOS in several special agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c4c24fb270c46811caf6694efc370df5ba07eee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c4c24fb270c46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 08:51:41 2014 +0200 Renamed AgentOs into AgentOS in several special agents --- agents/special/agent_emcvnx | 4 ++-- agents/special/agent_hivemanager | 2 +- agents/special/agent_vsphere | 2 +- agents/special/agent_vsphere.pysphere | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 4dc7bdd..319a859 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -188,10 +188,10 @@ for line in os.popen(cmd).readlines(): print "Version: %s" % emcvnx_version -# maybe we could fill AgentOs: by reading "Model:" line of naviseccli output +# maybe we could fill AgentOS: by reading "Model:" line of naviseccli output # in section "Agent/Host Information", but need a call of naviseccli with an # other commandline argument -#print "AgentOs: %s " % emcvnx_model +#print "AgentOS: %s " % emcvnx_model print "<<<emcvnx_info>>>" for line in cmdout: diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index 855128e..665cbb3 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -49,7 +49,7 @@ def get_url(address): print "<<<check_mk>>>" print "Version: 1.2.5" -print "AgentOs: Hivemanager" +print "AgentOS: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" address = "https://%s/hm/api/v1/devices" % ip diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 97fd671..3974f17 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -660,7 +660,7 @@ if not error: # Check MK header and Agent Version print "<<<check_mk>>>" print "Version: %.1f" % systeminfo["apiVersion"] - print "AgentOs: %s" % systeminfo["name"] + print "AgentOS: %s" % systeminfo["name"] ############################# # Determine available host systems diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 9a659d5..22609e3 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -244,7 +244,7 @@ esx_version_num = float(esx_version) print "<<<check_mk>>>" print "Version: %s" % esx_version -print "AgentOs: %s " % host.get_server_type() +print "AgentOS: %s " % host.get_server_type() # Prepare list of all hosts systems all_hosts = host.get_hosts()

10 years

Check_MK Git: check_mk: fixed incorrect i18n

by Andreas Boesl

Module: check_mk Branch: master Commit: 0c718835a40080ff9acaea24f652c5eeabf78bbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c718835a40080… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 17:00:13 2014 +0200 fixed incorrect i18n --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 80af765..1c114fc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9037,7 +9037,7 @@ def mode_notification_rule(phase, profilemode): if new: return _("Create new notification rule") + suffix else: - return _("Edit notification rule %d" % edit_nr) + suffix + return _("Edit notification rule %d") % edit_nr + suffix elif phase == "buttons": if profilemode:

10 years

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 55aa7652fa1bcb056cd72f9175b2b69a1a262a66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55aa7652fa1bcb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:44:40 2014 +0200 fixed typo --- .werks/1117 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1117 b/.werks/1117 index 5e1a9b4..df62097 100644 --- a/.werks/1117 +++ b/.werks/1117 @@ -7,6 +7,6 @@ Date: 1411396124 Class: feature The agent_vsphere is now able to get the license usage from the LicenseManager instance. -Upon inventory each license will lead to an own check name esx_licenses. +Upon inventory each license will lead to an own check named esx_licenses. The check parameters (absolute used, percentage used, all used) can be configured via the WATO rule <tt>Number of used VMware licenses</tt>

10 years

Check_MK Git: check_mk: esx_vsphere_licenses: add missing manpage

by Andreas Boesl

Module: check_mk Branch: master Commit: a97415a5b5646d87deef273c1fff933089f90135 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a97415a5b5646d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:39:14 2014 +0200 esx_vsphere_licenses: add missing manpage --- checkman/esx_vsphere_licenses | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/checkman/esx_vsphere_licenses b/checkman/esx_vsphere_licenses new file mode 100644 index 0000000..62aebf4 --- /dev/null +++ b/checkman/esx_vsphere_licenses @@ -0,0 +1,20 @@ +title: ESX vsphere licenses +agents: windows +catalog: app/vmware +license: GPL +distribution: check_mk +description: + This check monitors the number of used licenses for ESX systems. + +inventory: + One service per license type will be created. + +perfdata: + The license usage, together with it's warn and crit levels + +[parameters] +One of three choices: Either {None}. This is the default. The service will + go CRIT if all licenses are used up. Or you specify a pair of integers. + This will be the number of free licenses at which or below a WARN or CRIT + is being triggerd. Or a pair of floats, which will be interpreted as + percentages of free licenses for WARN and CRIT.

10 years

Check_MK Git: check_mk: esx_vsphere_licenses: new check to monitor ESX license usage

by Andreas Boesl

Module: check_mk Branch: master Commit: af62c901ce3a06cca60af9604394f4348721a84b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af62c901ce3a06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:37:22 2014 +0200 esx_vsphere_licenses: new check to monitor ESX license usage --- checks/esx_vsphere_licenses | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses new file mode 100644 index 0000000..1f116dd --- /dev/null +++ b/checks/esx_vsphere_licenses @@ -0,0 +1,58 @@ +#!/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. + +# Example output from agent: +#esx_vsphere_licenses:sep(9)>>> +#VMware vSphere 5 Standard 100 130 +#VMware vSphere 5 Enterprise 86 114 +#vCenter Server 5 Standard 1 1 + +def inventory_esx_vsphere_licenses(info): + return [ (line[0], {}) for line in info ] + +def check_esx_vsphere_licenses(item, params, info): + if params == None: + params = {} + # Transform: VMware vSphere 5 Standard 100 13 + # Into dict: 'VMware vSphere 5 Standard': (100, 130) + licenses = dict(map( + lambda x: (x[0], tuple(map(lambda y: int(y), x[1].split()))), + info)) + if item not in licenses: + return 3, "License not found in agent output" + + used, have = licenses[item] + return license_check_levels(have, used, params) + +check_info['esx_vsphere_licenses'] = { + "inventory_function" : inventory_esx_vsphere_licenses, + "check_function" : check_esx_vsphere_licenses, + "service_description" : "License %s", + "has_perfdata" : True, + "group" : "esx_licenses", + "includes" : [ "license.include" ] +} +

10 years

Check_MK Git: check_mk: add missing license.include file

by Andreas Boesl

Module: check_mk Branch: master Commit: a61fb76d97386633fbccf55ad8b6201653dc1893 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a61fb76d973866… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:36:01 2014 +0200 add missing license.include file --- checks/license.include | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/checks/license.include b/checks/license.include new file mode 100644 index 0000000..fd8936b --- /dev/null +++ b/checks/license.include @@ -0,0 +1,55 @@ +#!/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. + + +def license_check_levels(have, used, params): + if params == None: + warn = have + crit = have + elif type(params[0]) == int: + warn = max(0, have - params[0]) + crit = max(0, have - params[1]) + else: + warn = have * (1 - params[0]/100) + crit = have * (1 - params[1]/100) + + perfdata = [ ( "licenses", used, warn, crit, 0, have )] + if used <= have: + infotext = "used %d out of %d licenses" % (used, have) + else: + infotext = "used %d licenses, but you have only %d" % (used, have) + + if used >= crit: + status = 2 + elif used >= warn: + status = 1 + else: + status = 0 + + if status: + infotext += " (levels at %d/%d)" % (warn, crit) + + return status, infotext, perfdata

10 years

Check_MK Git: check_mk: removed invalid named check

by Andreas Boesl

Module: check_mk Branch: master Commit: e00bc00362b466d0489c698c88752e7d7577f1f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00bc00362b466… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:35:39 2014 +0200 removed invalid named check --- checks/bluecat_commandserver | 65 ------------------------------------------ 1 file changed, 65 deletions(-) diff --git a/checks/bluecat_commandserver b/checks/bluecat_commandserver deleted file mode 100644 index 5853a63..0000000 --- a/checks/bluecat_commandserver +++ /dev/null @@ -1,65 +0,0 @@ -#!/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. - -factory_settings["bluecat_command_server"] = { - "oper_states" : { - "warning" : [ 2, 3, 4 ], - "critical" : [ 5 ], - }, -} - -def inventory_bluecat_command_server(info): - return [(None, None)] - -def check_bluecat_command_server(item, params, info): - oper_state = int(info[0][0]) - oper_states = { - 1 : "running normally", - 2 : "not running", - 3 : "currently starting", - 4 : "currently stopping", - 5 : "fault" - - } - state = 0 - if oper_state in params['oper_states']['warning']: - state = 1 - elif oper_state in params['oper_states']['critical']: - state = 2 - yield state, "Command Server is %s" % oper_states[oper_state] - -check_info["bluecat_command_server"] = { - "check_function" : check_bluecat_command_server, - "inventory_function" : inventory_bluecat_command_server, - "service_description" : "Command Server", - "default_levels_variable" : "bluecat_command_server", - "group" : "bluecat_command_server", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", - "snmp_info" : (".1.3.6.1.4.1.13315.3.1.7.2.1", [ - 1, # bcnCommandServerSerOperState - ]) -} -

10 years

Check_MK Git: check_mk: #1117 agent_vsphere: now able to query license information from esx system

by Andreas Boesl

Module: check_mk Branch: master Commit: e20a1493dcaa45a9c4d53e656d8e3ef8eff022be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e20a1493dcaa45… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 22 16:32:55 2014 +0200 #1117 agent_vsphere: now able to query license information from esx system The agent_vsphere is now able to get the license usage from the LicenseManager instance. Upon inventory each license will lead to an own check name esx_licenses. The check parameters (absolute used, percentage used, all used) can be configured via the WATO rule <tt>Number of used VMware licenses</tt> --- .werks/1117 | 12 +++++++ ChangeLog | 3 +- agents/special/agent_vsphere | 53 ++++++++++++++++++++++--------- checks/citrix_licenses | 29 ++--------------- web/plugins/wato/check_parameters.py | 28 ++++++++++++---- web/plugins/wato/datasource_programs.py | 1 + 6 files changed, 77 insertions(+), 49 deletions(-) diff --git a/.werks/1117 b/.werks/1117 new file mode 100644 index 0000000..5e1a9b4 --- /dev/null +++ b/.werks/1117 @@ -0,0 +1,12 @@ +Title: agent_vsphere: now able to query license information from esx system +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1411396124 +Class: feature + +The agent_vsphere is now able to get the license usage from the LicenseManager instance. +Upon inventory each license will lead to an own check name esx_licenses. +The check parameters (absolute used, percentage used, all used) can be configured via the WATO rule +<tt>Number of used VMware licenses</tt> diff --git a/ChangeLog b/ChangeLog index a9cc965..657b134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,8 +60,10 @@ * 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... * 0658 brocade_info: new check to retrieve informational data about Brocade switches + * 1385 oracle_instance: new WATO rules for archivelog, logging, login and uptime... * 1403 kernel.util: allow levels for the total CPU utilization... NOTE: Please refer to the migration notes! + * 1117 agent_vsphere: now able to query license information from esx system... * 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 @@ -148,7 +150,6 @@ check: * 1384 oracle_jobs: new WATO rules, changed service name to SID.OWNER.NAME... NOTE: Please refer to the migration notes! - * 1385 oracle_instance: WATO rules for archivelog, logging, login and uptime 1.2.5i5: diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 97fd671..80cea63 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -130,6 +130,10 @@ telegram_list = { '<ns1:path>vm</ns1:path><ns1:skip>false</ns1:skip></ns1:selectSet>'\ '</ns1:objectSet></ns1:specSet><ns1:options></ns1:options></ns1:RetrievePropertiesEx>', + "licenseassigned": + '<ns1:QueryAssignedLicenses xsi:type="ns1:QueryAssignedLicensesRequestType">'\ + '<ns1:_this type="LicenseAssignmentManager">LicenseAssignmentManager</ns1:_this></ns1:QueryAssignedLicenses>', + "perfcountersummary": '<ns1:QueryPerfProviderSummary xsi:type="ns1:QueryPerfProviderSummaryRequestType">'\ '<ns1:_this type="PerformanceManager">%(perfManager)</ns1:_this>'\ @@ -423,7 +427,7 @@ host_address = None user = None secret = None tracefile = None -query_objects = [ 'hostsystem', 'virtualmachine', 'datastore', 'counters' ] +query_objects = [ 'hostsystem', 'virtualmachine', 'datastore', 'counters', 'licenses' ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -523,13 +527,17 @@ def get_agent_info_tcp(hostname): # Globals of ESX System. These settings are available after the first "systeminfo" query -systeminfo = { - "apiVersion" : None, - "name" : None, - "rootFolder" : None, - "perfManager" : None, - "sessionManager" : None, -} +systemfields = [ + ("apiVersion", float), + ("name", None), + ("rootFolder", None), + ("perfManager", None), + ("sessionManager", None), + ("licenseManager", None), + ("propertyCollector", None) +] + +systeminfo = {} if opt_tracefile: tracefile_dir = os.path.dirname(opt_tracefile) or "." @@ -632,12 +640,7 @@ try: reply_code, reply_msg, reply_headers, reply_data = query_server(payload) if name == "systeminfo": - for entry, function in [ ("name", None), - ("apiVersion", float), - ("rootFolder", None), - ("propertyCollector", None), - ("sessionManager", None), - ("perfManager", None) ]: + for entry, function in systemfields: element = get_pattern("<%(entry)s.*>(.*)</%(entry)s>" % { "entry": entry }, reply_data) systeminfo[entry] = function and function(element[0]) or element[0] elif name == "login": @@ -645,6 +648,7 @@ try: if "InvalidLogin" in reply_data: raise Exception("Login response is not 'OK'. Please check the credentials") + except Exception, e: if opt_debug: raise @@ -662,6 +666,25 @@ if not error: print "Version: %.1f" % systeminfo["apiVersion"] print "AgentOs: %s" % systeminfo["name"] + ########################### + # Licenses + ########################### + reply_code, reply_msg, reply_headers, licenses_response = query_server(telegram_list["licenseassigned"]) + license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response) + licenses = {} + for host in license_hosts: + key, name, total, used = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host)[0] + # We merge all entries with the same name, duplicate keys are ignored since they provide the same data + licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0}) + if key not in licenses[name]["used_keys"]: + licenses[name]["total"] += int(total) + licenses[name]["used"] += int(used) + licenses[name]["used_keys"].append(key) + + print "<<<esx_vsphere_licenses:sep(9)>>>" + for license, values in licenses.items(): + print "%s\t%s %s" % (license, values["used"], values["total"]) + ############################# # Determine available host systems ############################# @@ -670,10 +693,10 @@ if not error: reply_code, reply_msg, reply_headers, hostsystems_response = query_server(telegram_list["hostsystems"]) elements = get_pattern('<obj type="HostSystem">(.*?)</obj>.*?<val xsi:type="xsd:string">(.*?)</val>', hostsystems_response) - for hostsystem, name in elements: hostsystems[hostsystem] = name + ########################### # Datastores ########################### diff --git a/checks/citrix_licenses b/checks/citrix_licenses index 7188edc..62d6e08 100644 --- a/checks/citrix_licenses +++ b/checks/citrix_licenses @@ -51,33 +51,7 @@ def check_citrix_licenses(item, params, info): if not have: return 3, "No licenses of that type found" - if params == None: - warn = have - crit = have - elif type(params[0]) == int: - warn = max(0, have - params[0]) - crit = max(0, have - params[1]) - else: - warn = have * (1 - params[0]/100) - crit = have * (1 - params[1]/100) - - perfdata = [ ( "licenses", used, warn, crit, 0, have )] - if used <= have: - infotext = "used %d out of %d licenses" % (used, have) - else: - infotext = "used %d licenses, but you have only %d" % (used, have) - - if used >= have: - status = 2 - elif used >= warn: - status = 1 - else: - status = 0 - - if status: - infotext += " (levels at %d/%d)" % (warn, crit) - - return status, infotext, perfdata + return license_check_levels(have, used, params) check_info["citrix_licenses"] = { 'check_function' : check_citrix_licenses, @@ -85,4 +59,5 @@ check_info["citrix_licenses"] = { 'service_description' : 'Citrix Licenses %s', 'has_perfdata' : True, 'group' : "citrix_licenses", + 'includes' : [ "license.include" ] } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 265975d..da1c3dd 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5990,11 +5990,8 @@ register_check_parameters( "first" ) -register_check_parameters( - subgroup_applications, - "citrix_licenses", - _("Number of used Citrix licenses"), - Alternative( + +vs_license = Alternative( style = "dropdown", default_value = None, elements = [ @@ -6017,8 +6014,27 @@ register_check_parameters( totext = _("critical if all are used"), title = _("Go critical if all licenses are used"), ), - ] + ] + ) + +register_check_parameters( + subgroup_applications, + "esx_licenses", + _("Number of used VMware licenses"), + vs_license, + TextAscii( + title = _("Name of the license"), + help = _("For example <tt>VMware vSphere 5 Standard</tt>"), + allow_empty = False, ), + "dict" +) + +register_check_parameters( + subgroup_applications, + "citrix_licenses", + _("Number of used Citrix licenses"), + vs_license, TextAscii( title = _("ID of the license, e.g. <tt>PVSD_STD_CCS</tt>"), allow_empty = False, diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index c30483a..00538f0 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -89,6 +89,7 @@ register_rule(group, ( "virtualmachine", _("Virtual Machines") ), ( "datastore", _("Datastores") ), ( "counters", _("Performance Counters") ), + ( "licenses", _("License Usage") ), ], default_value = [ "hostsystem", "virtualmachine", "datastore", "counters" ], allow_empty = False,

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits