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.