Skip to content

Commit

Permalink
pre-merge commit, some minor doc changes maybe
Browse files Browse the repository at this point in the history
  • Loading branch information
willixix committed May 3, 2013
1 parent 9d001eb commit 68f2a49
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Naglio.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ sub parse_thresholds_list {
# 1) ref to combined thresholds hash array i.e. { 'WARN' => threshold array, 'CRIT' => threshold array, ABSENT => ... }
# such hash array is returned by by parse_thresholds_list function
# -- OR --
# 2) a tet string with a list of thresholds in the format
# 2) a string with a list of thresholds in the format
# WARN:threshold,CRIT:thresholod,ABSENT:OK|WARNING|CRITICAL|UNKNOWN,ZERO:WARNING|CRITICAL|UNKNOWN,PATTERN:pattern,NAME:name
# which would get parsed y parse_thresholds_list function into ref array
# @RETURNS : nothing (future: 1 on success, 0 on error)
Expand Down Expand Up @@ -1360,7 +1360,7 @@ sub _options_setthresholds {
# @LAST CHANGED : 08-21-12 by WL
# @INPUT : ARG1 - reference to previous performance data hash array. It looks for _ptime variable there.
# ARG2 - string with previous performance time in unix seconds. This may come from separate plugin option.
# @RETURNS : Time in unix seconds frm 1970 or undef if it was not locatedthe code istthe code ishe code is
# @RETURNS : Time in unix seconds frm 1970 or undef if it was not located
# @PRIVACY & USE : PRIVATE, Maybe used directly or as an object instance function.
sub _set_prevtime {
my ($self,$prevperf,$o_prevtime) = _self_args(@_);
Expand Down
4 changes: 2 additions & 2 deletions check_snmp_raid.pl
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@
# - Bug fixes. Fix for debugging. Old DEBUG printfs are replaced with calls to verb() function
# - code_to_description() and code_to_nagiosstatus() functions added
# - %cardtype_map with list of card types added replacing if/elseif in check_options
# - partial rewrite exit status code for logical and physical drives. This may introduce small
# - partial rewrite exit status code for logical and physical drives. This may introduce small
# incompatible changes for megaraid - but old code dates workarounds for megaraid checks and
# doing manually what 3rd column of LOGDRV_CODES and PHYSDRV_CODES are now used for
# d. New -A/--label option and changes in the nagios status output
# - New -A/--label option allows to specify start of the plugin output in place of default 'Raid'
# - print_output() function has been renamed print_and_exit() and now also exits with specified alert code
# - print_output() function has been renamed print_and_exit() and now also exits with specified alert code
# - reordering of output: # of controllders, drives, batteries first, then new additional controller status
# such as 'powersupply is ok' and last model & tasks info which are now labeled as 'tasks []' before data
# * Code contributions for this release: Michael Cook, Stanislav German-Evtushenko, William Leibzon *
Expand Down

0 comments on commit 68f2a49

Please sign in to comment.