Module: check_mk
Branch: master
Commit: e81955100519450fff37433dc9b4607d944250b3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8195510051945…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Jul 17 16:43:39 2014 +0200
logwatch.groups: Now also works in precompailed mode
---
checks/logwatch | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/checks/logwatch b/checks/logwatch
index 4d8c12a..84b34af 100644
--- a/checks/logwatch
+++ b/checks/logwatch
@@ -256,10 +256,15 @@ precompile_params['logwatch'] = logwatch_precompile
# | |
# '----------------------------------------------------------------------'
-def logwatch_groups_of_logfile(filename):
+def logwatch_group_precompile( hostname, item, _unused):
+ return logwatch_precompile( hostname, item, None ), host_extra_conf( hostname, logwatch_groups )
+
+def logwatch_groups_of_logfile(filename, params=False):
import fnmatch
groups = []
- for line in host_extra_conf(g_hostname, logwatch_groups):
+ if not params:
+ params = host_extra_conf(g_hostname, logwatch_groups)
+ for line in params:
for group_name, pattern in line:
inclusion, exclusion = pattern
if fnmatch.fnmatch(filename, inclusion) \
@@ -273,11 +278,10 @@ def inventory_logwatch_groups(info):
inventory = []
for logfile in not_forwarded_logs:
groups = logwatch_groups_of_logfile(logfile)
- if groups:
- for group in groups:
- if group not in added_groups:
- added_groups.append(group)
- inventory.append((group, None ))
+ for group in groups:
+ if group not in added_groups:
+ added_groups.append(group)
+ inventory.append((group, None ))
return inventory
def check_logwatch_groups(item, params, info):
@@ -295,7 +299,7 @@ def check_logwatch_groups(item, params, info):
loglines.append(line)
if line.startswith('[[['):
logfile = line[3:-3]
- if item in logwatch_groups_of_logfile(logfile):
+ if item in logwatch_groups_of_logfile(logfile, params[1]):
found = True
logfile_found = True
else:
@@ -310,10 +314,10 @@ check_info['logwatch.groups'] = {
'service_description': "LOG %s",
'group': 'logwatch',
}
-precompile_params['logwatch.groups'] = logwatch_precompile
+precompile_params['logwatch.groups'] = logwatch_group_precompile
#.
-def check_logwatch_generic(item, params, loglines, found):
+def check_logwatch_generic(item, params, loglines, found, groups=False):
# Create directories, if neccessary
try:
logdir = logwatch_dir + "/" + g_hostname
@@ -375,9 +379,14 @@ def check_logwatch_generic(item, params, loglines, found):
# Get the patterns (either compile or reuse the precompiled ones)
# Check_MK creates an empty string if the precompile function has
# not been exectued yet. The precomile function creates an empty
- # list when no rules/patterns are defined.
+ # list when no rules/patterns are defined. In case of the logwatch.groups
+ # checks, params are a tuple with the normal logwatch parameters on the first
+ # and the grouping patterns on the second position
if params not in ('', None):
- patterns = params # patterns already precompiled
+ if groups:
+ patterns = params[0]
+ else:
+ patterns = params # patterns already precompiled
else:
patterns = logwatch_precompile(g_hostname, item, None)
Module: check_mk
Branch: master
Commit: 2ee633e3c961aa55df600bc2daa37e1f0f3e4875
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee633e3c961aa…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 17 14:46:22 2014 +0200
FIX LDAP: Using configured user filter during login to prevent temporary created users
When a LDAP user that is not allowed to log in to multisite according to the
"LDAP User Settings" OU and filtering options tries to login with valid credentials
Multisite created a temporary user entry just to remove it later during the login
process. The user can not access Multisite, but an error message is shown and a
log entry in the WATO audit log is being created.
This has been changed that the initial credentials check takes the filters from
"LDAP User Settings" into account. Leaving all not permitted users with the message
"invalid credentials".
---
.werks/1059 | 16 ++++++++++++++++
ChangeLog | 1 +
web/plugins/userdb/ldap.py | 10 ++++++----
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/.werks/1059 b/.werks/1059
new file mode 100644
index 0000000..de0303a
--- /dev/null
+++ b/.werks/1059
@@ -0,0 +1,16 @@
+Title: LDAP: Using configured user filter during login to prevent temporary created users
+Level: 1
+Component: multisite
+Version: 1.2.5i5
+Date: 1405600906
+Class: fix
+
+When a LDAP user that is not allowed to log in to multisite according to the
+"LDAP User Settings" OU and filtering options tries to login with valid credentials
+Multisite created a temporary user entry just to remove it later during the login
+process. The user can not access Multisite, but an error message is shown and a
+log entry in the WATO audit log is being created.
+
+This has been changed that the initial credentials check takes the filters from
+"LDAP User Settings" into account. Leaving all not permitted users with the message
+"invalid credentials".
diff --git a/ChangeLog b/ChangeLog
index fbfe2d5..3918954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@
* 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime
* 1036 FIX: doc/treasures/downtime: fix --url option, better error output
* 1074 FIX: Fix Virtual Host Tree snapin...
+ * 1059 FIX: LDAP: Using configured user filter during login to prevent temporary created users...
WATO:
* 0825 WATO: Hover menu of user online state shows the last seen date/time now
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 3627c55..3cf8883 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -468,12 +468,14 @@ def ldap_get_user(username, no_escape = False):
if username in g_ldap_user_cache:
return g_ldap_user_cache[username]
- # Check wether or not the user exists in the directory
- # It's only ok when exactly one entry is found.
- # Returns the DN and user_id as tuple in this case.
+ # Check wether or not the user exists in the directory matching the username AND
+ # the user search filter configured in the "LDAP User Settings".
+ # It's only ok when exactly one entry is found. Returns the DN and user_id
+ # as tuple in this case.
result = ldap_search(
ldap_replace_macros(config.ldap_userspec['dn']),
- '(%s=%s)' % (ldap_user_id_attr(), ldap.filter.escape_filter_chars(username)),
+ '(&(%s=%s)%s)' % (ldap_user_id_attr(), ldap.filter.escape_filter_chars(username),
+ config.ldap_userspec['filter']),
[ldap_user_id_attr()],
)
Module: check_mk
Branch: master
Commit: 3b263fd30a4d149dc82f0b5ab802725528939aa0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b263fd30a4d14…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Jul 16 11:14:18 2014 +0200
check_dns: Changed parameter style
---
.werks/179 | 2 +-
checks/check_dns | 2 +-
web/plugins/wato/active_checks.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.werks/179 b/.werks/179
index 1abd06a..9db99cb 100644
--- a/.werks/179
+++ b/.werks/179
@@ -5,6 +5,6 @@ Version: 1.2.5i5
Date: 1405453916
Class: feature
-Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers.
+Befor this change, it was only possible to define the ip of a dns server or use the the ip address of the host as dns server. Now it's also possible to omit this confiuration. In this case the check is done against the local dns servers configured on the monitoring server.
This is usefull if you e.g. want check web domain names.
diff --git a/checks/check_dns b/checks/check_dns
index 049b7e4..80c1bdf 100644
--- a/checks/check_dns
+++ b/checks/check_dns
@@ -29,7 +29,7 @@ def check_dns_arguments(params):
args = '-H %s' % quote_shell_string(description)
if "server" in settings:
- if settings["server"] != "use local configuration":
+ if settings["server"] != None:
args += ' -s %s' % quote_shell_string(settings["server"])
else:
args += " -s '$HOSTADDRESS$'"
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 400a260..8e140b1 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -180,7 +180,7 @@ register_rule(group,
Alternative(
title = _("DNS Server"),
elements = [
- FixedValue( value="use local configuration",
+ FixedValue( value=None, totext=_("use local configuration"),
title = _("Use local DNS configuration of monitoring site")),
TextAscii(
title = _("Specify DNS Server"),
Module: check_mk
Branch: master
Commit: 163ec8e40b8b292a9d5e7068385f092af961b728
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163ec8e40b8b29…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Jul 16 11:57:10 2014 +0200
sap: It is now possible to add multiple sap instances to the sap.cfg file
The cfg format has changed from dict to a list of dicts. See the sap.cfg for a example. The old config format is still working.
---
.werks/180 | 9 +++
ChangeLog | 1 +
agents/plugins/mk_sap | 215 ++++++++++++++++++++++++++-----------------------
agents/sap/sap.cfg | 19 ++++-
4 files changed, 138 insertions(+), 106 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=163ec8e40b…
Module: check_mk
Branch: master
Commit: 52e5c9b870323c7f6f05d3e40d67796be5dab4a4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52e5c9b870323c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jul 16 10:15:54 2014 +0200
Updated bug entries #2137
---
.bugs/2137 | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/.bugs/2137 b/.bugs/2137
new file mode 100644
index 0000000..fc51569
--- /dev/null
+++ b/.bugs/2137
@@ -0,0 +1,13 @@
+Title: Foldable containers with Umlauts in titles are not expanded on load
+Component: multisite
+State: open
+Date: 2014-07-16 10:13:33
+Targetversion: 1.2.5i1
+Class: bug
+
+When unicode strings with umlauts are used as titles for foldable containers,
+the states are saved, but can not be read/parsed/compared correctly. This seems
+to be related to the pprint.pformat() function which writes the unicode string
+as key of a dict, but does not re-reads the value correctly as unicode string.
+
+It has happened here with the titles of the views snapin.
Module: check_mk
Branch: master
Commit: 7132c994fec7f655015d3d55ea826af932217902
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7132c994fec7f6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jul 16 10:13:24 2014 +0200
livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails
The tool livedump-mail-fetch which can be used to receive livedump results by fetching
them from a mailbox e.g. via POP3 always assumed incoming mails to be encoded as
quoted-printable.
This change makes the mail parsing configurable. The default is still quoted printable,
but can be set to "None" to assume plain text mails.
---
.werks/1058 | 13 +++++++++++++
ChangeLog | 1 +
doc/treasures/livedump/livedump-mail-fetch | 15 ++++++++++++---
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/.werks/1058 b/.werks/1058
new file mode 100644
index 0000000..0aa25c2
--- /dev/null
+++ b/.werks/1058
@@ -0,0 +1,13 @@
+Title: livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1405498288
+Class: feature
+
+The tool livedump-mail-fetch which can be used to receive livedump results by fetching
+them from a mailbox e.g. via POP3 always assumed incoming mails to be encoded as
+quoted-printable.
+
+This change makes the mail parsing configurable. The default is still quoted printable,
+but can be set to "None" to assume plain text mails.
diff --git a/ChangeLog b/ChangeLog
index 6516fc1..a94f5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
* 0999 allnet_ip_sensoric.pressure: New Check for Pressure Sensors in ALLNET IP Sensoric devices
* 1082 windows agent: now also available as msi installer...
* 0179 check_dns: It is now possible to use the local dns server in wato configuration...
+ * 1058 livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails...
* 0994 FIX: agent plugin smart: fixed syntax error
* 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP...
* 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...
diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch
index af9a85b..d3b8f7f 100755
--- a/doc/treasures/livedump/livedump-mail-fetch
+++ b/doc/treasures/livedump/livedump-mail-fetch
@@ -24,6 +24,9 @@ omd_root = os.environ.get('OMD_ROOT')
pop_server = "pop.yourmailserver.com"
pop_user = "your-username(a)domain.com"
pop_pass = "secretpassword"
+# By default the mail body is treated to be encoded as "quoted-printable".
+# In the other case no decoding is not performed.
+encoding = "quoted-printable"
M = poplib.POP3_SSL(pop_server)
M.user(pop_user)
@@ -56,16 +59,22 @@ if config_mails:
mail_index, ident = config_mails[-1]
code, mail, num = M.retr(mail_index)
body_start_index = mail.index('')
- body = quopri.decodestring('\n'.join(mail[body_start_index:]))
+ if encoding == 'quoted-printable':
+ body = quopri.decodestring('\n'.join(mail[body_start_index:]))
+ else:
+ body = '\n'.join(mail[body_start_index:])
- file("%s/etc/nagios/conf.d/remote-%s.cfg" %
+ file("%s/etc/nagios/conf.d/remote-%s.cfg" %
(omd_root, ident), "w").write(body)
if status_mails:
for index in status_mails:
code, mail, code = M.retr(index)
body_start_index = mail.index('')
- body = quopri.decodestring('\n'.join(mail[body_start_index:]))
+ if encoding == 'quoted-printable':
+ body = quopri.decodestring('\n'.join(mail[body_start_index:]))
+ else:
+ body = '\n'.join(mail[body_start_index:])
fd, path = tempfile.mkstemp('', 'c', "%s/tmp/nagios/checkresults" % omd_root)
os.write(fd, body)
Module: check_mk
Branch: master
Commit: 96e44f6bfb036c36e5df2eb15d7741178ed7d4f1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e44f6bfb036c…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Wed Jul 16 09:55:52 2014 +0200
FIX fc_port: do not inventorize if brocade fibre channel mib is also supported on the device
Some devices on the market have shown to support both the brocade fibre channel mib, and
the FCMGMT mib. In these cases two services were created for each fibre channel port, one for
the brocade_fcport check and one for the fc_port check.
With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported.
---
.werks/636 | 11 +++++++++++
ChangeLog | 1 +
checks/fc_port | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/636 b/.werks/636
new file mode 100644
index 0000000..a5febf6
--- /dev/null
+++ b/.werks/636
@@ -0,0 +1,11 @@
+Title: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1405496969
+Class: fix
+
+Some devices on the market have shown to support both the brocade fibre channel mib, and
+the FCMGMT mib. In these cases two services were created for each fibre channel port, one for
+the brocade_fcport check and one for the fc_port check.
+With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported.
diff --git a/ChangeLog b/ChangeLog
index daaef7e..ec9e7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
* 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running
* 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected...
* 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline'
+ * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device...
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/checks/fc_port b/checks/fc_port
index 743c74f..5986b27 100644
--- a/checks/fc_port
+++ b/checks/fc_port
@@ -317,7 +317,8 @@ check_info["fc_port"] = {
'has_perfdata' : True,
'group' : 'fc_port',
'default_levels_variable': 'fc_port_default_levels',
- 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch.",
+ 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch." \
+ and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"),
'snmp_info' : ( ".1.3.6.1.3.94", [
"1.10.1.2", # connUnitPortIndex # 0
"1.10.1.3", # connUnitPortType # 1
Module: check_mk
Branch: master
Commit: a224010dab772e96e77146762d72d7002383f5e6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a224010dab772e…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Jul 15 21:56:01 2014 +0200
check_dns: It is now possible to use the local dns server in wato configuration
Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers.
This is usefull if you e.g. want check web domain names.
---
.werks/179 | 10 ++++++++++
ChangeLog | 1 +
checks/check_dns | 3 ++-
web/plugins/wato/active_checks.py | 15 +++++++++++----
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/.werks/179 b/.werks/179
new file mode 100644
index 0000000..1abd06a
--- /dev/null
+++ b/.werks/179
@@ -0,0 +1,10 @@
+Title: check_dns: It is now possible to use the local dns server in wato configuration
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1405453916
+Class: feature
+
+Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers.
+
+This is usefull if you e.g. want check web domain names.
diff --git a/ChangeLog b/ChangeLog
index daaef7e..1bfbf2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
* 0178 mssql_tablespaces: It is now possible to define thresholds
* 0999 allnet_ip_sensoric.pressure: New Check for Pressure Sensors in ALLNET IP Sensoric devices
* 1082 windows agent: now also available as msi installer...
+ * 0179 check_dns: It is now possible to use the local dns server in wato configuration...
* 0994 FIX: agent plugin smart: fixed syntax error
* 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP...
* 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...
diff --git a/checks/check_dns b/checks/check_dns
index 4ac542c..049b7e4 100644
--- a/checks/check_dns
+++ b/checks/check_dns
@@ -29,7 +29,8 @@ def check_dns_arguments(params):
args = '-H %s' % quote_shell_string(description)
if "server" in settings:
- args += ' -s %s' % quote_shell_string(settings["server"])
+ if settings["server"] != "use local configuration":
+ args += ' -s %s' % quote_shell_string(settings["server"])
else:
args += " -s '$HOSTADDRESS$'"
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 1ad90b7..400a260 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -177,10 +177,17 @@ register_rule(group,
title = _("Optional parameters"),
elements = [
( "server",
- TextAscii(
- title = _("DNS Server"),
- allow_empty = False,
- help = _("Optional DNS server you want to use for the lookup"))),
+ Alternative(
+ title = _("DNS Server"),
+ elements = [
+ FixedValue( value="use local configuration",
+ title = _("Use local DNS configuration of monitoring site")),
+ TextAscii(
+ title = _("Specify DNS Server"),
+ allow_empty = False,
+ help = _("Optional DNS server you want to use for the lookup")),
+ ])
+ ),
( "expected_address",
Transform(
ListOfStrings(
Module: check_mk
Branch: master
Commit: f8433892cdec1b69c744fd5e299b998e5dd7269c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8433892cdec1b…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Tue Jul 15 15:31:32 2014 +0200
FIX fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline'
---
.werks/635 | 8 ++++++++
ChangeLog | 3 ++-
checkman/fc_port | 8 +++++---
checks/fc_port | 2 +-
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.werks/635 b/.werks/635
new file mode 100644
index 0000000..126a95c
--- /dev/null
+++ b/.werks/635
@@ -0,0 +1,8 @@
+Title: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline'
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1405431040
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 8120397..daaef7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,8 +46,9 @@
* 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis
* 0631 FIX: fc_port: several fixes for the perfometer to display the right values...
* 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on
- * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected...
* 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running
+ * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected...
+ * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline'
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/checkman/fc_port b/checkman/fc_port
index 75ace6b..12e37ae 100644
--- a/checkman/fc_port
+++ b/checkman/fc_port
@@ -96,6 +96,8 @@ perfdata:
inventory:
The inventory creates checks for all operational ports. It can be configured
(see CONFIGURATION VARIABLES) how operational ports are defined.
+ Ports with the admininstrative state of 1 (unkown) or 3 (offline) are not
+ inventorized.
[parameters]
parameters (dict): This check works with dictionary based parameters. The
@@ -134,11 +136,11 @@ fc_port_no_inventory_types(list): List of port types not to be inventorized.
fc_port_no_inventory_phystates(list): List of physical states for which ports
will not be inventorized. The default is an empty list.
-fc_port_inventory_opstates(list): List of operational states for which ports
+fc_port_no_inventory_opstates(list): List of operational states for which ports
will not be inventorized. The default is an empty list.
-fc_port_inventory_admstates(list): List of administrative states for which ports
- will not be inventorized. The default is an empty list.
+fc_port_no_inventory_admstates(list): List of administrative states for which ports
+ will not be inventorized. The default is [ 1, 3 ]
fc_port_inventory_use_portname(boolean): If you set this to {True},
configured names of the ports appear in the service descripion (and thus can
diff --git a/checks/fc_port b/checks/fc_port
index a251ee8..743c74f 100644
--- a/checks/fc_port
+++ b/checks/fc_port
@@ -66,7 +66,7 @@ porttype_list = ( 'unknown', 'unknown', 'other', 'not-present', 'hub-port', 'n-p
# settings for inventory: which ports should not be inventorized
fc_port_no_inventory_types = [ 3 ]
-fc_port_no_inventory_admstates = [ ]
+fc_port_no_inventory_admstates = [ 1, 3 ]
fc_port_no_inventory_opstates = [ ]
fc_port_no_inventory_phystates = [ ]
fc_port_inventory_use_portname = False # use connUnitPortName as service description