From 43dd55a0162467e2919dbcdd20a221b0a34f63a6 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Fri, 20 Feb 2015 14:47:07 +0100 Subject: [PATCH] + add filter on description vm --- connectors/vmware/src/centreon/esxd/cmdcpuvm.pm | 4 ++++ connectors/vmware/src/centreon/esxd/cmddatastorevm.pm | 4 ++++ connectors/vmware/src/centreon/esxd/cmdlimitvm.pm | 4 ++++ connectors/vmware/src/centreon/esxd/cmdmemvm.pm | 4 ++++ connectors/vmware/src/centreon/esxd/cmdsnapshotvm.pm | 4 ++++ connectors/vmware/src/centreon/esxd/cmdswapvm.pm | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/connectors/vmware/src/centreon/esxd/cmdcpuvm.pm b/connectors/vmware/src/centreon/esxd/cmdcpuvm.pm index feb912d3d..a60ada907 100644 --- a/connectors/vmware/src/centreon/esxd/cmdcpuvm.pm +++ b/connectors/vmware/src/centreon/esxd/cmdcpuvm.pm @@ -87,6 +87,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('name', 'runtime.connectionState', 'runtime.powerState'); if (defined($self->{display_description})) { push @properties, 'config.annotation'; diff --git a/connectors/vmware/src/centreon/esxd/cmddatastorevm.pm b/connectors/vmware/src/centreon/esxd/cmddatastorevm.pm index e69d201b3..64cd74c5e 100644 --- a/connectors/vmware/src/centreon/esxd/cmddatastorevm.pm +++ b/connectors/vmware/src/centreon/esxd/cmddatastorevm.pm @@ -93,6 +93,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('name', 'datastore', 'runtime.connectionState', 'runtime.powerState'); if (defined($self->{display_description})) { push @properties, 'config.annotation'; diff --git a/connectors/vmware/src/centreon/esxd/cmdlimitvm.pm b/connectors/vmware/src/centreon/esxd/cmdlimitvm.pm index cec7fc709..202fbe420 100644 --- a/connectors/vmware/src/centreon/esxd/cmdlimitvm.pm +++ b/connectors/vmware/src/centreon/esxd/cmdlimitvm.pm @@ -96,6 +96,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('name', 'runtime.connectionState', 'runtime.powerState', 'config.cpuAllocation.limit', 'config.memoryAllocation.limit'); if (defined($self->{check_disk_limit})) { push @properties, 'config.hardware.device'; diff --git a/connectors/vmware/src/centreon/esxd/cmdmemvm.pm b/connectors/vmware/src/centreon/esxd/cmdmemvm.pm index deb9cd552..130580c79 100644 --- a/connectors/vmware/src/centreon/esxd/cmdmemvm.pm +++ b/connectors/vmware/src/centreon/esxd/cmdmemvm.pm @@ -89,6 +89,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('name', 'summary.config.memorySizeMB', 'runtime.connectionState', 'runtime.powerState'); if (defined($self->{display_description})) { push @properties, 'config.annotation'; diff --git a/connectors/vmware/src/centreon/esxd/cmdsnapshotvm.pm b/connectors/vmware/src/centreon/esxd/cmdsnapshotvm.pm index e207c2e05..8b4e6f236 100644 --- a/connectors/vmware/src/centreon/esxd/cmdsnapshotvm.pm +++ b/connectors/vmware/src/centreon/esxd/cmdsnapshotvm.pm @@ -81,6 +81,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('snapshot.rootSnapshotList', 'name', 'runtime.connectionState', 'runtime.powerState'); if (defined($self->{check_consolidation}) == 1) { push @properties, 'runtime.consolidationNeeded'; diff --git a/connectors/vmware/src/centreon/esxd/cmdswapvm.pm b/connectors/vmware/src/centreon/esxd/cmdswapvm.pm index b7d70d2c9..defd61b0f 100644 --- a/connectors/vmware/src/centreon/esxd/cmdswapvm.pm +++ b/connectors/vmware/src/centreon/esxd/cmdswapvm.pm @@ -89,6 +89,10 @@ sub run { } else { $filters{name} = qr/$self->{vm_hostname}/; } + if (defined($self->{filter_description}) && $self->{filter_description} ne '') { + $filters{'config.annotation'} = qr/$self->{filter_description}/; + } + my @properties = ('name', 'runtime.connectionState', 'runtime.powerState'); if (defined($self->{display_description})) { push @properties, 'config.annotation';