fixed errors in Trigger::Get

mugenken · Sep 14, 2012 · fe2a936 · fe2a936
1 parent d6dcd31
commit fe2a936
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/bin/main.pl b/bin/main.pl
@@ -50,8 +50,11 @@ sub uniqArray
 my $response =  Pabbix::Trigger::Get->new(
     authToken => $authToken,
     url => $url,
+    statusValue => 'PROBLEM',
 )->get;
 
+use Data::Dumper;
+print Dumper $response;
 
 if( -f $file )
 {

diff --git a/lib/Pabbix/HostGroup/Base.pm b/lib/Pabbix/HostGroup/Base.pm
@@ -32,10 +32,10 @@ sub _add_missing_params
 sub _add_name_filter
 {
     my $self = shift;
-    $json->{'params'}{'output'} = 'extend';
     if( $self->name )
     {
         my $json = $self->json;
+        $json->{'params'}{'output'} = 'extend';
         $json->{'params'}{'filter'}{'name'} = $self->name;
         $self->json( $json );
     }
@@ -44,11 +44,11 @@ sub _add_name_filter
 sub _add_id_filter
 {
     my $self = shift;
-    $json->{'params'}{'output'} = 'extend';
     if( $self->groupid )
     {
         my $json = $self->json;
         $json->{'params'}{'filter'}{'groupid'} = $self->groupid;
+        $json->{'params'}{'output'} = 'extend';
         $self->json( $json );
     }
 }

diff --git a/lib/Pabbix/Trigger/Base.pm b/lib/Pabbix/Trigger/Base.pm
@@ -25,7 +25,9 @@ sub _add_status
     if( defined( $self->statusValue ) )
     {
         my $json = $self->json;
-        $json->{'params'}{'status'} = $self->_translateStatus;
+        $json->{'params'}{'output'} = 'extend';
+        $json->{'params'}{'expandData'} = 'host';
+        $json->{'params'}{'filter'}{'value'} = $self->_translateStatus;
         $self->json( $json );
     }
 }

diff --git a/lib/Pabbix/Trigger/Get.pm b/lib/Pabbix/Trigger/Get.pm
@@ -15,6 +15,8 @@ sub get
         url => $self->url,
         json => $self->_createJson,
     );
+    use Data::Dumper;
+    print Dumper $self->json;
     return $response->get();
 }