Merge pull request #6745 from markleary/master

Add support for -q argument to Manubulon snmp-storage commmand
This commit is contained in:
Michael Friedrich 2018-11-05 09:10:12 +01:00 committed by GitHub
commit ec169de5c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -2067,6 +2067,7 @@ snmp_privpass | **Required.** SNMP version 3 priv password. No value d
snmp_warn | **Optional.** The warning threshold. snmp_warn | **Optional.** The warning threshold.
snmp_crit | **Optional.** The critical threshold. snmp_crit | **Optional.** The critical threshold.
snmp_storage_name | **Optional.** Storage name. Default to regex "^/$$". More options available in the [snmp storage](http://nagios.manubulon.com/snmp_storage.html) documentation. snmp_storage_name | **Optional.** Storage name. Default to regex "^/$$". More options available in the [snmp storage](http://nagios.manubulon.com/snmp_storage.html) documentation.
snmp_storage_type | **Optional.** Filter by storage type. Valid options are Other, Ram, VirtualMemory, FixedDisk, RemovableDisk, FloppyDisk, CompactDisk, RamDisk, FlashMemory, or NetworkDisk. No value defined as default.
snmp_perf | **Optional.** Enable perfdata values. Defaults to true. snmp_perf | **Optional.** Enable perfdata values. Defaults to true.
snmp_timeout | **Optional.** The command timeout in seconds. Defaults to 5 seconds. snmp_timeout | **Optional.** The command timeout in seconds. Defaults to 5 seconds.
snmp_storage_olength | **Optional.** Max-size of the SNMP message, usefull in case of Too Long responses. snmp_storage_olength | **Optional.** Max-size of the SNMP message, usefull in case of Too Long responses.

View File

@ -215,6 +215,10 @@ object CheckCommand "snmp-storage" {
value = "$snmp_storage_olength$" value = "$snmp_storage_olength$"
description = "Max-size of the SNMP message, usefull in case of Too Long responses." description = "Max-size of the SNMP message, usefull in case of Too Long responses."
} }
"-q" = {
value = "$snmp_storage_type$"
description = "Storage type: Other, Ram, VirtualMemory, FixedDisk, RemovableDisk, FloppyDisk, CompactDisk, RamDisk, FlashMemory, or NetworkDisk"
}
} }
vars.snmp_storage_name = "^/$$" vars.snmp_storage_name = "^/$$"
@ -396,6 +400,6 @@ object CheckCommand "snmp-service" {
description = "Do not use regexp to match NAME in service description." description = "Do not use regexp to match NAME in service description."
} }
} }
vars.snmp_service_name = ".*" vars.snmp_service_name = ".*"
} }