Module: check_mk
Branch: master
Commit: d6ef6076a73ac7864e399b0bbc77036aac6c97d5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6ef6076a73ac7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Oct 15 14:06:08 2012 +0200
Check_MK configuration variable cleanup in WATO
---
web/plugins/wato/check_mk_configuration.py | 94 +++++++++++++--------------
1 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 61e7d5b..ff8c4eb 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -379,21 +379,6 @@ register_configvar(group,
(3, _("Unknown") ),
]))
-
-register_configvar(group,
- "always_cleanup_autochecks",
- Checkbox(title = _("Always cleanup autochecks"),
- help = _("When switched on, Check_MK will always cleanup the autochecks
files "
- "after each inventory, i.e. create one file per host. This is
the same "
- "as adding the option <tt>-u</tt> to each call of
<tt>-I</tt> on the "
- "command line.")))
-
-
-group = _("Check configuration")
-
-# if_inventory_porttypes = [ '6', '32', '117' ]
-# if_inventory_portstates = [ '1' ]
-
_if_portstate_choices = [
( '1', 'up(1)'),
( '2', 'down(2)'),
@@ -472,30 +457,6 @@ _if_porttype_choices = [
("221", "gfp(221)" ), ("222",
"ciscoISLvlan(222)" ), ("223", "actelisMetaLOOP(223)" ),
("224",
"fcipLink(224)" ), ("225", "rpr(225)" ),
("226", "qam(226)" ), ("227", "lmp(227)" ),
("228",
"cblVectaStar(228)" ), ("229",
"docsCableMCmtsDownstream(229)" ), ("230", "adsl2(230)" ),
]
-
-register_configvar(group,
- "if_inventory_monitor_state",
- Checkbox(title = _("Monitor port state of network interfaces"),
- label = _("monitor port state"),
- help = _("When this option is active then during inventory of
networking interfaces "
- "(and switch ports) the current operational state of the port
will "
- "automatically be coded as a check parameter into the check.
That way the check "
- "will get warning or critical when the state changes. This
setting can later "
- "by overridden on a per-host and per-port base by defining
special check "
- "parameters via a rule.")))
-
-register_configvar(group,
- "if_inventory_monitor_speed",
- Checkbox(title = _("Monitor port speed of network interfaces"),
- label = _("monitor port speed"),
- help = _("When this option is active then during inventory of
networking interfaces "
- "(and switch ports) the current speed setting of the port will
"
- "automatically be coded as a check parameter into the check.
That way the check "
- "will get warning or critical when speed later changes (for
example from "
- "100 MBit/s to 10 MBit/s). This setting can later "
- "by overridden on a per-host and per-port base by defining
special check "
- "parameters via a rule.")))
-
register_configvar(group,
"if_inventory_pad_portnumbers",
Checkbox(title = _("Pad port numbers with zeroes"),
@@ -557,6 +518,51 @@ register_configvar(group,
)
register_configvar(group,
+ "win_dhcp_pools_inventorize_empty",
+ Checkbox(
+ title = _("Inventorize empty windows dhcp pools"),
+ help = _("You can activate the inventorization of "
+ "dhcp pools, which have no ip addresses in it"),
+ ),
+ need_restart = True
+ )
+
+register_configvar(group,
+ "always_cleanup_autochecks",
+ Checkbox(title = _("Always cleanup autochecks"),
+ help = _("When switched on, Check_MK will always cleanup the autochecks
files "
+ "after each inventory, i.e. create one file per host. This is
the same "
+ "as adding the option <tt>-u</tt> to each call of
<tt>-I</tt> on the "
+ "command line.")))
+
+
+group = _("Check configuration")
+
+
+register_configvar(group,
+ "if_inventory_monitor_state",
+ Checkbox(title = _("Monitor port state of network interfaces"),
+ label = _("monitor port state"),
+ help = _("When this option is active then during inventory of
networking interfaces "
+ "(and switch ports) the current operational state of the port
will "
+ "automatically be coded as a check parameter into the check.
That way the check "
+ "will get warning or critical when the state changes. This
setting can later "
+ "by overridden on a per-host and per-port base by defining
special check "
+ "parameters via a rule.")))
+
+register_configvar(group,
+ "if_inventory_monitor_speed",
+ Checkbox(title = _("Monitor port speed of network interfaces"),
+ label = _("monitor port speed"),
+ help = _("When this option is active then during inventory of
networking interfaces "
+ "(and switch ports) the current speed setting of the port will
"
+ "automatically be coded as a check parameter into the check.
That way the check "
+ "will get warning or critical when speed later changes (for
example from "
+ "100 MBit/s to 10 MBit/s). This setting can later "
+ "by overridden on a per-host and per-port base by defining
special check "
+ "parameters via a rule.")))
+
+register_configvar(group,
"logwatch_service_output",
DropdownChoice(
title = _("Service output for logwatch"),
@@ -573,16 +579,6 @@ register_configvar(group,
)
register_configvar(group,
- "win_dhcp_pools_inventorize_empty",
- Checkbox(
- title = _("Invetorize empty windows dhcp pools"),
- help = _("You can activate the inventorization of "
- "dhcp pools, which have no ip addresses in it"),
- ),
- need_restart = True
- )
-
-register_configvar(group,
"printer_supply_some_remaining_status",
DropdownChoice(
title = _("Printer supply some remaining status"),