18 Oct
2016
18 Oct
'16
2:44 p.m.
Module: check_mk
Branch: master
Commit: 19e5d92f45f0cbf3612dbff575a89b1e104a71e4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e5d92f45f0cb…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 18 14:44:00 2016 +0200
Reorder option in ESXi datasource program rule set
Group related options better.
---
web/plugins/wato/datasource_programs.py | 90 ++++++++++++++++-----------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/web/plugins/wato/datasource_programs.py
b/web/plugins/wato/datasource_programs.py
index 3aa4932..02c94d1 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -60,6 +60,18 @@ register_rule(group,
allow_empty = False,
)
),
+ ( "direct",
+ DropdownChoice(
+ title = _("Type of query"),
+ choices = [
+ ( True, _("Queried host is a host
system" ) ),
+ ( "hostsystem_agent", _("Queried host is a host
system with Check_MK Agent installed") ),
+ ( False, _("Queried host is the
vCenter") ),
+ ( "agent", _("Queried host is the
vCenter with Check_MK Agent installed") ),
+ ],
+ default = True,
+ )
+ ),
( "tcp_port",
Integer(
title = _("TCP Port number"),
@@ -93,6 +105,17 @@ register_rule(group,
unit = _("seconds"),
)
),
+ ( "use_pysphere",
+ Checkbox(
+ title = _("Compatibility mode"),
+ label = _("Support ESX 4.1 (using slower PySphere
implementation)"),
+ true_label = _("Support 4.1"),
+ false_label = _("fast"),
+ help = _("The current very performant implementation of the ESX
special agent "
+ "does not support older ESX versions than 5.0. Please
use the slow "
+ "compatibility mode for those old hosts."),
+ )
+ ),
( "infos",
Transform(
ListChoice(
@@ -110,6 +133,18 @@ register_rule(group,
title = _("Retrieve information about..."),
)
),
+ ( "skip_placeholder_vms",
+ Checkbox(
+ title = _("Placeholder VMs"),
+ label = _("Do no monitor placeholder VMs"),
+ default_value = True,
+ true_label = _("ignore"),
+ false_label = _("monitor"),
+ help = _("Placeholder VMs are created by the Site Recovery
Manager(SRM) and act as backup "
+ "virtual machines in case the default vm is unable
to start. This option tells the "
+ "vsphere agent to exclude placeholder vms in its
output."
+ ))
+ ),
( "host_pwr_display",
DropdownChoice(
title = _("Display ESX Host power state on"),
@@ -121,16 +156,6 @@ register_rule(group,
default = None,
)
),
- ( "vm_piggyname",
- DropdownChoice(
- title = _("Piggyback name of virtual machines"),
- choices = [
- ( "alias", _("Use the name specified in the
ESX system") ),
- ( "hostname", _("Use the VMs hostname if set,
otherwise fall back to ESX name") ),
- ],
- default = "alias",
- )
- ),
( "vm_pwr_display",
DropdownChoice(
title = _("Display VM power state on"),
@@ -142,6 +167,16 @@ register_rule(group,
default = None,
)
),
+ ( "vm_piggyname",
+ DropdownChoice(
+ title = _("Piggyback name of virtual machines"),
+ choices = [
+ ( "alias", _("Use the name specified in the
ESX system") ),
+ ( "hostname", _("Use the VMs hostname if set,
otherwise fall back to ESX name") ),
+ ],
+ default = "alias",
+ )
+ ),
( "spaces",
DropdownChoice(
title = _("Spaces in hostnames"),
@@ -152,41 +187,6 @@ register_rule(group,
default = "underscore",
)
),
- ( "direct",
- DropdownChoice(
- title = _("Type of query"),
- choices = [
- ( True, _("Queried host is a host
system" ) ),
- ( "hostsystem_agent", _("Queried host is a host
system with Check_MK Agent installed") ),
- ( False, _("Queried host is the
vCenter") ),
- ( "agent", _("Queried host is the
vCenter with Check_MK Agent installed") ),
- ],
- default = True,
- )
- ),
- ( "skip_placeholder_vms",
- Checkbox(
- title = _("Placeholder VMs"),
- label = _("Do no monitor placeholder VMs"),
- default_value = True,
- true_label = _("ignore"),
- false_label = _("monitor"),
- help = _("Placeholder VMs are created by the Site Recovery
Manager(SRM) and act as backup "
- "virtual machines in case the default vm is unable
to start. This option tells the "
- "vsphere agent to exclude placeholder vms in its
output."
- ))
- ),
- ( "use_pysphere",
- Checkbox(
- title = _("Compatibility mode"),
- label = _("Support ESX 4.1 (using slower PySphere
implementation)"),
- true_label = _("Support 4.1"),
- false_label = _("fast"),
- help = _("The current very performant implementation of the ESX
special agent "
- "does not support older ESX versions than 5.0. Please
use the slow "
- "compatibility mode for those old hosts."),
- )
- ),
],
optional_keys = [ "tcp_port", "timeout",
"vm_pwr_display", "host_pwr_display", "vm_piggyname" ],
),