Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3112 FIX esx_vsphere_counters: made levels configurable

by Sebastian Herbord

Module: check_mk Branch: master Commit: 48c5bc202244e0bf333d658d080156072672fa63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48c5bc202244e0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Apr 4 16:13:35 2016 +0200 3112 FIX esx_vsphere_counters: made levels configurable --- .werks/3112 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3112 b/.werks/3112 new file mode 100644 index 0000000..d34dd87 --- /dev/null +++ b/.werks/3112 @@ -0,0 +1,10 @@ +Title: esx_vsphere_counters: made levels configurable +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459779176 + + diff --git a/ChangeLog b/ChangeLog index 6869e0f..0a879aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin... * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner... * 3022 FIX: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)... + * 3112 FIX: esx_vsphere_counters: made levels configurable Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 17add22..2d72202 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -190,7 +190,8 @@ check_info['esx_vsphere_counters'] = { 'check_function' : check_esx_vsphere_counters_datastoreio, 'service_description' : 'Datastore IO %s', 'has_perfdata' : True, - 'includes' : [ 'diskstat.include' ] + 'includes' : [ 'diskstat.include' ], + 'group' : 'diskstat' }

8 years, 5 months

3022 FIX mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)

by Andreas Boesl

Module: check_mk Branch: master Commit: d800516244f5b3384fcfe2c8e648271622f1f56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d800516244f5b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 15:57:12 2016 +0200 3022 FIX mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data) In earlier versions mk_logwatch only had one statefile for all incoming queries. Any newly found loglines were sent to one server - subsequent queries from other servers got nothing. With this version each IP address now has its own statefile. So you can now monitor the same system from multiple servers without the risk of loosing log messages. Important: Multiple OMD sites running under the same server IP address still steal log messages from one another. --- .werks/3022 | 15 +++++++++++++++ ChangeLog | 1 + agents/plugins/mk_logwatch | 13 ++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/3022 b/.werks/3022 new file mode 100644 index 0000000..f2b1b6d --- /dev/null +++ b/.werks/3022 @@ -0,0 +1,15 @@ +Title: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459777575 +Class: fix + +In earlier versions mk_logwatch only had one statefile for all incoming queries. +Any newly found loglines were sent to one server - subsequent queries from other servers got nothing. +With this version each IP address now has its own statefile. +So you can now monitor the same system from multiple servers without the risk of loosing log +messages. Important: Multiple OMD sites running under the same server IP address still steal +log messages from one another. + diff --git a/ChangeLog b/ChangeLog index ec5c5cc..6869e0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ * 3019 FIX: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs) * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin... * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner... + * 3022 FIX: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index e58d5d7..6697358 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -56,11 +56,22 @@ else: mk_confdir = os.getenv("MK_CONFDIR") or "." mk_vardir = os.getenv("MK_VARDIR") or "." +remote_hostname = os.getenv("REMOTE", "") + print "<<<logwatch>>>" config_filename = mk_confdir + "/logwatch.cfg" config_dir = mk_confdir + "/logwatch.d/*.cfg" -status_filename = mk_vardir + "/logwatch.state" + +if remote_hostname != "": + status_filename = "%s/mk_logwatch_%s.state" % (mk_vardir, remote_hostname) +else: + status_filename = "%s/mk_logwatch.state" % mk_vardir + +# Copy the last known state from the logwatch.state when there is no status_filename yet. +if not os.path.exists(status_filename) and os.path.exists("%s/logwatch.state" % mk_vardir): + import shutil + shutil.copy("%s/logwatch.state" % mk_vardir, status_filename) def is_not_comment(line): if line.lstrip().startswith('#') or \

8 years, 5 months

3319 HW/SW-Inventory service can now be OK in case of unreachable host

by Mathias Kettner

Module: check_mk Branch: master Commit: a317497a208f89117768a1ec0bcd41719dc7bec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a317497a208f89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 4 15:24:12 2016 +0200 3319 HW/SW-Inventory service can now be OK in case of unreachable host The active check for performing the HW/SW-inventory used to always take the WARN state if the inventory cannot be done (mostly because the target host was down). This can now be set other states as well. Set this to OK if you inventorized workstations that are allowed to be switched off. This setting is in the rule set {{Do hardware/software Inventory}}. --- .werks/3319 | 13 +++++++++++++ ChangeLog | 1 + checks/check_cmk_inv | 5 ++++- modules/check_mk.py | 6 +++++- modules/inventory.py | 4 ++-- web/plugins/wato/inventory.py | 9 +++++++++ 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.werks/3319 b/.werks/3319 new file mode 100644 index 0000000..4521de6 --- /dev/null +++ b/.werks/3319 @@ -0,0 +1,13 @@ +Title: HW/SW-Inventory service can now be OK in case of unreachable host +Level: 2 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1459776126 +Class: feature + +The active check for performing the HW/SW-inventory used to always take the +WARN state if the inventory cannot be done (mostly because the target host +was down). This can now be set other states as well. Set this to OK if you +inventorized workstations that are allowed to be switched off. This setting +is in the rule set {{Do hardware/software Inventory}}. diff --git a/ChangeLog b/ChangeLog index 9fa55ea..ec5c5cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ HW/SW-Inventory: * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB + * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/checks/check_cmk_inv b/checks/check_cmk_inv index a0b9b6e..1c10f5a 100644 --- a/checks/check_cmk_inv +++ b/checks/check_cmk_inv @@ -28,7 +28,10 @@ def check_cmk_inv(params): if params == None: params = {} # convert from legacy rule syntax - return "--hw-changes=%d --sw-changes=%d" % (params.get("hw_changes", 0), params.get("sw_changes", 0)) + return "--inv-fail-status=%d --hw-changes=%d --sw-changes=%d" % ( + params.get("fail_status", 1), + params.get("hw_changes", 0), + params.get("sw_changes", 0)) active_check_info['cmk_inv'] = { "command_line" : 'cmk $ARG1$ --cache --inventory-as-check $HOSTNAME$', diff --git a/modules/check_mk.py b/modules/check_mk.py index 012c22f..db652bb 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3933,6 +3933,7 @@ OPTIONS: You can specify this option multiple times. --hw-changes=S --inventory-as-check: Use monitoring state S for HW changes --sw-changes=S --inventory-as-check: Use monitoring state S for SW changes + --inv-fail-status=S Use monitoring state S in case if error during inventory NOTES: -I can be restricted to certain check types. Write '--checks df -I' if you @@ -4914,7 +4915,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", - "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", + "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "inv-fail-status=", "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', @@ -4941,6 +4942,7 @@ exit_status = 0 opt_verbose = 0 # start again from 0, was already faked at the beginning opt_inv_hw_changes = 0 opt_inv_sw_changes = 0 +opt_inv_fail_status = 1 # State in case of an error (default: WARN) # Scan modifying options first (makes use independent of option order) for o,a in opts: @@ -4997,6 +4999,8 @@ for o,a in opts: opt_inv_hw_changes = int(a) elif o == "--sw-changes": opt_inv_sw_changes = int(a) + elif o == "--inv-fail-status": + opt_inv_fail_status = int(a) # Perform actions (major modes) try: diff --git a/modules/inventory.py b/modules/inventory.py index f5dcf97..07ae365 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -209,8 +209,8 @@ def do_inv_check(hostname): except Exception, e: if opt_debug: raise - sys.stdout.write("WARN - Inventory failed: %s\n" % e) - sys.exit(1) + sys.stdout.write("Inventory failed: %s\n" % e) + sys.exit(opt_inv_fail_status) def count_nodes(tree): diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py index df8fca8..a600757 100644 --- a/web/plugins/wato/inventory.py +++ b/web/plugins/wato/inventory.py @@ -44,6 +44,15 @@ register_rule(group, title = _("State when hardware changes are detected"), default_value = 0, )), + ( "fail_status", + MonitoringState( + title = _("State when inventory fails"), + help = _("The check takes this state in case the inventory cannot be " + "updated because of any possible reason. A common use is " + "setting this to OK for workstations that can be switched " + "off - so you will get no notifications in that case."), + default_value = 1, + )), ] ), title = _("Do hardware/software Inventory"),

8 years, 5 months

3021 FIX interface metrics: fixed broken interface metrics when using nagios core

by Andreas Boesl

Module: check_mk Branch: master Commit: 552620ea818e598a4c41d7b789861c2e55759abe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=552620ea818e59… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 15:05:12 2016 +0200 3021 FIX interface metrics: fixed broken interface metrics when using nagios core The automatically generated pnp template for the interface bandwith was broken. This problem only rises when the monitoring core is set to nagios. --- .werks/3021 | 10 ++++++++++ ChangeLog | 2 ++ web/htdocs/metrics.py | 8 ++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/3021 b/.werks/3021 new file mode 100644 index 0000000..1dbecea --- /dev/null +++ b/.werks/3021 @@ -0,0 +1,10 @@ +Title: interface metrics: fixed broken interface metrics when using nagios core +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1459774881 +Class: fix + +The automatically generated pnp template for the interface bandwith was +broken. This problem only rises when the monitoring core is set to nagios. diff --git a/ChangeLog b/ChangeLog index 34128aa..9fa55ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 3017 FIX: Fixed missing host/vms inventory information when having multiple datacenters... * 3018 FIX: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups)... * 3019 FIX: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs) + * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin... * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner... Multisite: @@ -158,6 +159,7 @@ * 3345 FIX: Fixed exception when inventory painter was used as group painter * 3347 FIX: Improved performance when having a lot of users... * 3355 FIX: Fixed possible broken HW-/SW-Inventory history view + * 3021 FIX: interface metrics: fixed broken interface metrics when using nagios core... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 5bea619..a6403d8 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1177,14 +1177,18 @@ def render_graph_pnp(graph_template, translated_metrics): # TODO: beware of division by zero. All metrics are set to 1 here. value, unit, color = evaluate(metric_name, translated_metrics) + expression, explicit_unit_name = metric_name.split("@", 1) # isolate expression + # Choose a unique name for the derived variable and compute it - commands += "CDEF:DERIVED%d=%s " % (nr , metric_name) + commands += "CDEF:DERIVED%d=%s " % (nr , expression) if upside_down: commands += "CDEF:DERIVED%d_NEG=DERIVED%d,-1,* " % (nr, nr) metric_name = "DERIVED%d" % nr # Scaling and upsidedown handling for legend - commands += "CDEF:%s_LEGSCALED%s=%s,%f,/ " % (metric_name, upside_down_suffix, metric_name, legend_scale * upside_down_factor) + commands += "CDEF:%s_LEGSCALED=%s,%f,/ " % (metric_name, metric_name, legend_scale) + if upside_down: + commands += "CDEF:%s_LEGSCALED%s=%s,%f,/ " % (metric_name, upside_down_suffix, metric_name, legend_scale * upside_down_factor) else: mi = translated_metrics[metric_name]

8 years, 5 months

3019: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs )

by Andreas Boesl

Module: check_mk Branch: master Commit: 13930ff8f462e606f61b9d7914f51bf0a5f42c9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13930ff8f462e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 13:40:35 2016 +0200 3019: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs) --- .werks/3019 | 9 +++++++++ web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/3019 b/.werks/3019 new file mode 100644 index 0000000..4893abd --- /dev/null +++ b/.werks/3019 @@ -0,0 +1,9 @@ +Title: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459760921 +Class: fix + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 45f0b02..82b2d4b 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3347,7 +3347,7 @@ check_metrics["check_mk-ibm_svc_mdiskgrp"] = df_translation check_metrics["check_mk-fast_lta_silent_cubes.capacity"] = df_translation check_metrics["check_mk-fast_lta_volumes"] = df_translation check_metrics["check_mk-libelle_business_shadow.archive_dir"] = df_translation -check_metrics["check_mk-netapp_api_volume"] = df_translation +check_metrics["check_mk-netapp_api_volumes"] = df_translation check_metrics["check_mk-emc_isilon_quota"] = df_translation check_metrics["check_mk-emc_isilon_ifs"] = df_translation check_metrics["check_mk-mongodb_collections"] = df_translation

8 years, 5 months

3020: netapp_api_volumes: ignore volumes of cluster partner

by Andreas Boesl

Module: check_mk Branch: master Commit: 15638d38de434a3980162dea54fe1e4836ff8cef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15638d38de434a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 13:41:33 2016 +0200 3020: netapp_api_volumes: ignore volumes of cluster partner --- .werks/3020 | 11 +++++++++++ agents/special/agent_netapp | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/3020 b/.werks/3020 new file mode 100644 index 0000000..5f85e92 --- /dev/null +++ b/.werks/3020 @@ -0,0 +1,11 @@ +Title: netapp_api_volumes: ignore volumes of cluster partner +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459769140 +Class: fix + +Volumes from the cluster partner are no longer detected as services. +These partner-volumes did not provide the entire span of information and +caused check errors like "Volume is None". diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 1af7c8f..f6b8091 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -202,7 +202,7 @@ def create_dict(instances, custom_key = [], is_counter = True): def format_config(instances, prefix, config_key, config_report = "all", config_scale = {}, config_rename = {}, extra_info = {}, extra_info_report = "all", - delimeter = "\t"): + delimeter = "\t", skip_missing_config_key = False): result = [] values = {} @@ -227,6 +227,11 @@ def format_config(instances, prefix, config_key, config_report = "all", instance_key.append(values.get(entry)) instance_key = ".".join(instance_key) else: + if skip_missing_config_key and config_key not in values: + # The config_key is not available in the xml node + # Looks like the information is only available through the other node + continue + instance_key = values.get(config_key, config_key) if config_key in values: del values[config_key] @@ -573,7 +578,8 @@ if netapp_mode == "clustermode": "volume-inode-attributes.files-used" : "files-used" }, extra_info = create_dict(volume_counters, custom_key = [ "instance_uuid" ]), extra_info_report = sum(map(lambda x: ["%s" % x, "nfs_%s" % x, "cifs_%s" % x, "san_%s" % x, "fcp_%s" % x, "iscsi_%s" % x], - sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency"]), [])), []) + [ "instance_name" ] + sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency"]), [])), []) + [ "instance_name" ], + skip_missing_config_key = True ) # Aggregations

8 years, 5 months

3018: netapp_api_disks: ignore disks with raid-state remote (

by Andreas Boesl

metrocluster setups) Message-ID: <57025317.a2E2adU40IodqOCi%ab(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: 8b4c54723a91b5f152c5c11da942a222ca219799 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4c54723a91b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 13:39:20 2016 +0200 3018: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups) --- .werks/3018 | 9 +++++++++ ChangeLog | 4 +++- checks/netapp_api_disk | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3018 b/.werks/3018 new file mode 100644 index 0000000..275f4db --- /dev/null +++ b/.werks/3018 @@ -0,0 +1,9 @@ +Title: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459760250 +Class: fix + +Disks with raid-state remote are monitored on the partner system. diff --git a/ChangeLog b/ChangeLog index 3b5ff38..34128aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,7 +119,9 @@ NOTE: Please refer to the migration notes! * 3016 FIX: mk-job: scheduled jobs are now always executed despite of any status file permission problems... * 3017 FIX: Fixed missing host/vms inventory information when having multiple datacenters... - * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin... + * 3018 FIX: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups)... + * 3019 FIX: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs) + * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index 042a53d..3bf3c6e 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -49,7 +49,7 @@ def check_netapp_api_disk_summary(_no_item, params, info): # The device can contain disks who belongs to another filer. We only check the ones # belonging to this filer. # TODO Do we need that? - my_disks = dict([disk for disk in disks.items() if not disk[1].get("raid-state") == "partner"]) + my_disks = dict([disk for disk in disks.items() if not disk[1].get("raid-state") in [ "remote", "partner"] ]) disks_converted = [] for did, disk in my_disks.items():

8 years, 5 months

3111 FIX citrix_status: fixed incorrect assignment of piggyback data to host running the plugin

by Sebastian Herbord

Module: check_mk Branch: master Commit: cbc873c0cffb553bfe71d0c9c95462b320500243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbc873c0cffb55… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Apr 4 13:23:34 2016 +0200 3111 FIX citrix_status: fixed incorrect assignment of piggyback data to host running the plugin When a machine is created in citrix without a name, the plugin would previously assign data from that machine to the one running the plugin. Those machines will now be ignored by the plugin as their data can't be correctly assigned anyway. --- .werks/3111 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/plugins/citrix_farm.ps1 | 3 +++ 3 files changed, 16 insertions(+) diff --git a/.werks/3111 b/.werks/3111 new file mode 100644 index 0000000..d487cd9 --- /dev/null +++ b/.werks/3111 @@ -0,0 +1,12 @@ +Title: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459768772 + +When a machine is created in citrix without a name, the plugin would previously assign data from +that machine to the one running the plugin. +Those machines will now be ignored by the plugin as their data can't be correctly assigned anyway. diff --git a/ChangeLog b/ChangeLog index a439e94..3b5ff38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ NOTE: Please refer to the migration notes! * 3016 FIX: mk-job: scheduled jobs are now always executed despite of any status file permission problems... * 3017 FIX: Fixed missing host/vms inventory information when having multiple datacenters... + * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host running the plugin... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/plugins/citrix_farm.ps1 b/agents/windows/plugins/citrix_farm.ps1 index 4c70855..a3da4c1 100644 --- a/agents/windows/plugins/citrix_farm.ps1 +++ b/agents/windows/plugins/citrix_farm.ps1 @@ -95,6 +95,9 @@ foreach ($Controller in $Controllers) { # Column Name of Machine / Gets machines with the specific machine name known to the hypervisor. $HostedMachineName = $XAmachine | %{ $_.HostedMachineName } + if([string]::IsNullOrEmpty($HostedMachineName)) { + continue; + } "<<<<$HostedMachineName>>>>" "<<<citrix_state>>>" # Column CatalogNameName / Gets machines from the catalog with the specific name.

8 years, 5 months

a little bit of cosmetic

by Simon Betz

Module: check_mk Branch: master Commit: 54a98e2f80a02c817334131eb6b3efabdef37f46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a98e2f80a02c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 4 11:16:04 2016 +0200 a little bit of cosmetic --- web/plugins/pages/shipped.py | 121 +++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 797c99d..80f5fd5 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -48,73 +48,72 @@ import werks # map URLs to page rendering functions pagehandlers.update({ - "index" : main.page_index, - "login" : login.page_login, - "logout" : login.page_logout, - "ajax_switch_help" : help.ajax_switch_help, - "edit_views" : views.page_edit_views, - "create_view" : views.page_create_view, - "create_view_infos" : views.page_create_view_infos, - "edit_view" : views.page_edit_view, - "count_context_button" : views.ajax_count_button, - "export_views" : views.ajax_export, - "ajax_set_viewoption" : views.ajax_set_viewoption, - "view" : views.page_view, - "ajax_inv_render_tree" : views.ajax_inv_render_tree, - "host_service_graph_popup" : metrics.page_host_service_graph_popup, - "graph_dashlet" : metrics.page_graph_dashlet, - "ajax_set_rowselection" : weblib.ajax_set_rowselection, - "prediction_graph" : prediction.page_graph, - "logwatch" : logwatch.page_show, - "side" : sidebar.page_side, - "sidebar_add_snapin" : sidebar.page_add_snapin, - "sidebar_snapin" : sidebar.ajax_snapin, - "sidebar_fold" : sidebar.ajax_fold, - "sidebar_openclose" : sidebar.ajax_openclose, - "sidebar_move_snapin" : sidebar.move_snapin, - "sidebar_ajax_speedometer" : sidebar.ajax_speedometer, - "sidebar_ajax_tag_tree" : sidebar.ajax_tag_tree, - "sidebar_ajax_tag_tree_enter": sidebar.ajax_tag_tree_enter, - "sidebar_get_messages" : sidebar.ajax_get_messages, - "sidebar_message_read" : sidebar.ajax_message_read, - "ajax_search" : sidebar.ajax_search, - "search_open" : sidebar.search_open, - "switch_master_state" : sidebar.ajax_switch_masterstate, - "switch_site" : sidebar.ajax_switch_site, - "add_bookmark" : lambda: sidebar.ajax_add_bookmark(), - "tree_openclose" : weblib.ajax_tree_openclose, - "nagios_action" : actions.ajax_action, + "index" : main.page_index, + "login" : login.page_login, + "logout" : login.page_logout, + "ajax_switch_help" : help.ajax_switch_help, + "edit_views" : views.page_edit_views, + "create_view" : views.page_create_view, + "create_view_infos" : views.page_create_view_infos, + "edit_view" : views.page_edit_view, + "count_context_button" : views.ajax_count_button, + "export_views" : views.ajax_export, + "ajax_set_viewoption" : views.ajax_set_viewoption, + "view" : views.page_view, + "ajax_inv_render_tree" : views.ajax_inv_render_tree, + "host_service_graph_popup" : metrics.page_host_service_graph_popup, + "graph_dashlet" : metrics.page_graph_dashlet, + "ajax_set_rowselection" : weblib.ajax_set_rowselection, + "prediction_graph" : prediction.page_graph, + "logwatch" : logwatch.page_show, + "side" : sidebar.page_side, + "sidebar_add_snapin" : sidebar.page_add_snapin, + "sidebar_snapin" : sidebar.ajax_snapin, + "sidebar_fold" : sidebar.ajax_fold, + "sidebar_openclose" : sidebar.ajax_openclose, + "sidebar_move_snapin" : sidebar.move_snapin, + "sidebar_ajax_speedometer" : sidebar.ajax_speedometer, + "sidebar_ajax_tag_tree" : sidebar.ajax_tag_tree, + "sidebar_ajax_tag_tree_enter" : sidebar.ajax_tag_tree_enter, + "sidebar_get_messages" : sidebar.ajax_get_messages, + "sidebar_message_read" : sidebar.ajax_message_read, + "ajax_search" : sidebar.ajax_search, + "search_open" : sidebar.search_open, + "switch_master_state" : sidebar.ajax_switch_masterstate, + "switch_site" : sidebar.ajax_switch_site, + "add_bookmark" : lambda: sidebar.ajax_add_bookmark(), + "tree_openclose" : weblib.ajax_tree_openclose, + "nagios_action" : actions.ajax_action, - "dashboard" : dashboard.page_dashboard, - "dashboard_dashlet" : dashboard.ajax_dashlet, - "edit_dashboards" : dashboard.page_edit_dashboards, - "create_dashboard" : dashboard.page_create_dashboard, - "edit_dashboard" : dashboard.page_edit_dashboard, - "edit_dashlet" : dashboard.page_edit_dashlet, - "delete_dashlet" : dashboard.page_delete_dashlet, - "create_view_dashlet" : dashboard.page_create_view_dashlet, - "create_view_dashlet_infos": dashboard.page_create_view_dashlet_infos, - "ajax_dashlet_pos" : dashboard.ajax_dashlet_pos, - "ajax_delete_user_notification" : lambda: dashboard.ajax_delete_user_notification(), + "dashboard" : dashboard.page_dashboard, + "dashboard_dashlet" : dashboard.ajax_dashlet, + "edit_dashboards" : dashboard.page_edit_dashboards, + "create_dashboard" : dashboard.page_create_dashboard, + "edit_dashboard" : dashboard.page_edit_dashboard, + "edit_dashlet" : dashboard.page_edit_dashlet, + "delete_dashlet" : dashboard.page_delete_dashlet, + "create_view_dashlet" : dashboard.page_create_view_dashlet, + "create_view_dashlet_infos" : dashboard.page_create_view_dashlet_infos, + "ajax_dashlet_pos" : dashboard.ajax_dashlet_pos, + "ajax_delete_user_notification" : lambda: dashboard.ajax_delete_user_notification(), - "ajax_popup_add_visual" : visuals.ajax_popup_add, - "ajax_add_visual" : visuals.ajax_add_visual, + "ajax_popup_add_visual" : visuals.ajax_popup_add, + "ajax_add_visual" : visuals.ajax_add_visual, - "ajax_userdb_sync" : userdb.ajax_sync, - "notify" : notify.page_notify, + "ajax_userdb_sync" : userdb.ajax_sync, + "notify" : notify.page_notify, - "ajax_inv_render_tree" : views.ajax_inv_render_tree, + "ajax_inv_render_tree" : views.ajax_inv_render_tree, - "ajax_popup_icon_selector" : views.ajax_popup_icon_selector, - "ajax_popup_action_menu" : views.ajax_popup_action_menu, + "ajax_popup_icon_selector" : views.ajax_popup_icon_selector, + "ajax_popup_action_menu" : views.ajax_popup_action_menu, - "webapi" : webapi.page_api, + "webapi" : webapi.page_api, - "crashed_check" : lambda: crash_reporting.page_crashed("check"), - "gui_crash" : lambda: crash_reporting.page_crashed("gui"), - "download_crash_report" : crash_reporting.page_download_crash_report, + "crashed_check" : lambda: crash_reporting.page_crashed("check"), + "gui_crash" : lambda: crash_reporting.page_crashed("gui"), + "download_crash_report" : crash_reporting.page_download_crash_report, - "version" : werks.page_version, - "werk" : werks.page_werk, + "version" : werks.page_version, + "werk" : werks.page_werk, }) -

8 years, 5 months

Dashboard graphs have now host/service name in title

by Lars Michelsen

Module: check_mk Branch: master Commit: 64b45721807ce98c048c462762d3eec668fcd661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64b45721807ce9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 4 10:48:21 2016 +0200 Dashboard graphs have now host/service name in title --- web/plugins/dashboard/dashlets.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 0af2067..28e548b 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -376,6 +376,7 @@ def dashlet_graph_reload_js(nr, dashlet): }) graph_render_options = { "show_legend": dashlet.get("show_legend", False), + "show_service" : dashlet.get("show_service", True), } return "dashboard_render_graph(%d, %s, %s, '%s')" % \ @@ -416,6 +417,11 @@ dashlet_types["pnpgraph"] = { "graphs which are only available in the Check_MK Enterprise Edition."), default_value = False, )), + ("show_service", Checkbox( + title = _("Show host/service name in title"), + label = _("Add the host/service to the graph title"), + default_value = True, + )), ], "styles": """ .dashlet.pnpgraph .dashlet_inner { @@ -430,6 +436,9 @@ dashlet_types["pnpgraph"] = { .dashlet.pnpgraph .container { background-color: #f8f4f0; } +.dashlet.pnpgraph div.title a { + color: #000; +} """, "on_resize" : dashlet_graph_reload_js, # execute this js handler instead of refreshing the dashlet by calling "render" again

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016