add p filter, fix !o matching pending services

2 files changed, 12 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index 9751786..cfe4473 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+git HEAD
+
+    * Fix !o filter not matching pending services
+    * Add p filter (pending hosts/services)
+
 icli 0.45 - Tue Sep 17 2013
 
     * Fix --filter N and --filter !N
diff --git a/bin/icli b/bin/icli
index a26f0a8..ddf295d 100755
--- a/bin/icli
+++ b/bin/icli
@@ -240,8 +240,10 @@ sub filter_generic {
 			or ( $f eq '!P' and $x->{'active_checks_enabled'} )
 			or ( $f eq 'S'  and check_is_soft($x) )
 			or ( $f eq '!S' and not check_is_soft($x) )
+			or ( $f eq 'p'  and $x->{'has_been_checked'} == 0 )
+			or ( $f eq '!p' and $x->{'has_been_checked'} != 0 )
 			or ( $f eq 'o'  and $x->{'current_state'} == 0 )
-			or ( $f eq '!o' and $x->{'current_state'} != 0 )
+			or ( $f eq '!o' and($x->{'current_state'} != 0 or $x->{'has_been_checked'} == 0) )
 			or ( $f eq 'w'  and $x->{'current_state'} == 1 )
 			or ( $f eq '!w' and $x->{'current_state'} != 1 )
 			or ( $f eq 'c'  and $x->{'current_state'} == 2 )
@@ -1249,6 +1251,10 @@ Service state is Critical
 
 Service state is Unknown
 
+=item B<p>
+
+Host or service state is Pending
+
 =item B<d>
 
 Host state is Down