diff --git a/cloud/azure/compute/virtualmachine/mode/cpu.pm b/cloud/azure/compute/virtualmachine/mode/cpu.pm
index baf087a66..cc76ac350 100644
--- a/cloud/azure/compute/virtualmachine/mode/cpu.pm
+++ b/cloud/azure/compute/virtualmachine/mode/cpu.pm
@@ -85,7 +85,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
                                 });
     
diff --git a/cloud/azure/compute/virtualmachine/mode/diskio.pm b/cloud/azure/compute/virtualmachine/mode/diskio.pm
index aad6116fd..bde99f1a3 100644
--- a/cloud/azure/compute/virtualmachine/mode/diskio.pm
+++ b/cloud/azure/compute/virtualmachine/mode/diskio.pm
@@ -164,9 +164,9 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
-                                    "per-sec"	            => { name => 'per_sec' },
+                                    "per-sec"               => { name => 'per_sec' },
                                 });
     
     return $self;
@@ -198,7 +198,7 @@ sub check_options {
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
     
-    $self->{az_aggregations} = ['Total', 'Average'];
+    $self->{az_aggregations} = ['Average'];
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
diff --git a/cloud/azure/compute/virtualmachine/mode/listresources.pm b/cloud/azure/compute/virtualmachine/mode/listresources.pm
index 017f5b919..441e61072 100644
--- a/cloud/azure/compute/virtualmachine/mode/listresources.pm
+++ b/cloud/azure/compute/virtualmachine/mode/listresources.pm
@@ -33,8 +33,8 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                    "resource-group:s"    => { name => 'resource_group' },
-                                    "filter-name:s"       => { name => 'filter_name' },
+                                    "resource-group:s"      => { name => 'resource_group' },
+                                    "filter-name:s"         => { name => 'filter_name' },
                                 });
 
     return $self;
diff --git a/cloud/azure/compute/virtualmachine/mode/network.pm b/cloud/azure/compute/virtualmachine/mode/network.pm
index 8fd79c0ec..8e6856ed9 100644
--- a/cloud/azure/compute/virtualmachine/mode/network.pm
+++ b/cloud/azure/compute/virtualmachine/mode/network.pm
@@ -123,9 +123,9 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
-                                    "per-sec"	            => { name => 'per_sec' },
+                                    "per-sec"               => { name => 'per_sec' },
                                 });
     
     return $self;
diff --git a/cloud/azure/management/monitor/mode/getmetrics.pm b/cloud/azure/management/monitor/mode/getmetrics.pm
index cecdc8317..67ae5019d 100644
--- a/cloud/azure/management/monitor/mode/getmetrics.pm
+++ b/cloud/azure/management/monitor/mode/getmetrics.pm
@@ -93,8 +93,8 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s"            => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
-                                    "resource-type:s"	    => { name => 'resource_type' },
+                                    "resource-group:s"      => { name => 'resource_group' },
+                                    "resource-type:s"       => { name => 'resource_type' },
                                     "resource-namespace:s"  => { name => 'resource_namespace' },
                                     "metric:s@"             => { name => 'metric' },
                                 });
diff --git a/cloud/azure/management/resource/mode/items.pm b/cloud/azure/management/resource/mode/items.pm
index b8bcd5c3f..2ae8f5705 100644
--- a/cloud/azure/management/resource/mode/items.pm
+++ b/cloud/azure/management/resource/mode/items.pm
@@ -172,12 +172,12 @@ Filter resource name (Can be a regexp).
 =item B<--warning-*>
 
 Threshold warning.
-Can be: 'items'.
+Can be: 'total', 'compute', 'storage', 'network'.
 
 =item B<--critical-*>
 
 Threshold critical.
-Can be: 'items'.
+Can be: 'total', 'compute', 'storage', 'network'.
 
 =back
 
diff --git a/cloud/azure/management/resource/mode/listgroups.pm b/cloud/azure/management/resource/mode/listgroups.pm
index 0dbaf36b8..3676fbf08 100644
--- a/cloud/azure/management/resource/mode/listgroups.pm
+++ b/cloud/azure/management/resource/mode/listgroups.pm
@@ -33,8 +33,8 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                    "location:s"          => { name => 'location' },
-                                    "filter-name:s"       => { name => 'filter_name' },
+                                    "location:s"            => { name => 'location' },
+                                    "filter-name:s"         => { name => 'filter_name' },
                                 });
 
     return $self;
diff --git a/cloud/azure/management/resource/mode/listresources.pm b/cloud/azure/management/resource/mode/listresources.pm
index 9143a6bb0..9183dee5e 100644
--- a/cloud/azure/management/resource/mode/listresources.pm
+++ b/cloud/azure/management/resource/mode/listresources.pm
@@ -33,10 +33,10 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                    "resource-group:s"    => { name => 'resource_group' },
-                                    "location:s"          => { name => 'location' },
-                                    "filter-type:s"       => { name => 'filter_type' },
-                                    "filter-name:s"       => { name => 'filter_name' },
+                                    "resource-group:s"      => { name => 'resource_group' },
+                                    "location:s"            => { name => 'location' },
+                                    "filter-type:s"         => { name => 'filter_type' },
+                                    "filter-name:s"         => { name => 'filter_name' },
                                 });
 
     return $self;
diff --git a/cloud/azure/network/networkinterface/mode/listresources.pm b/cloud/azure/network/networkinterface/mode/listresources.pm
index 2abdc695b..7709e2340 100644
--- a/cloud/azure/network/networkinterface/mode/listresources.pm
+++ b/cloud/azure/network/networkinterface/mode/listresources.pm
@@ -33,9 +33,9 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                    "resource-group:s"    => { name => 'resource_group' },
-                                    "location:s"          => { name => 'location' },
-                                    "filter-name:s"       => { name => 'filter_name' },
+                                    "resource-group:s"      => { name => 'resource_group' },
+                                    "location:s"            => { name => 'location' },
+                                    "filter-name:s"         => { name => 'filter_name' },
                                 });
 
     return $self;
diff --git a/cloud/azure/network/networkinterface/mode/traffic.pm b/cloud/azure/network/networkinterface/mode/traffic.pm
index d69f18c17..eacb5905a 100644
--- a/cloud/azure/network/networkinterface/mode/traffic.pm
+++ b/cloud/azure/network/networkinterface/mode/traffic.pm
@@ -168,9 +168,9 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
-                                    "per-sec"	            => { name => 'per_sec' },
+                                    "per-sec"               => { name => 'per_sec' },
                                 });
     
     return $self;
@@ -187,7 +187,7 @@ sub check_options {
     
     $self->{az_resource_group} = '';
     $self->{az_resource_type} = 'networkInterfaces';
-    $self->{az_resource_namespace} = 'Microsoft.Compute';
+    $self->{az_resource_namespace} = 'Microsoft.Network';
 
     foreach my $resource (@{$self->{option_results}->{resource}}) {
         push @{$self->{az_resource}}, $resource;
diff --git a/cloud/azure/network/networkinterface/plugin.pm b/cloud/azure/network/networkinterface/plugin.pm
index b05b09267..c0ef1ae52 100644
--- a/cloud/azure/network/networkinterface/plugin.pm
+++ b/cloud/azure/network/networkinterface/plugin.pm
@@ -32,7 +32,7 @@ sub new {
     $self->{version} = '0.1';
     %{ $self->{modes} } = (
         'list-resources'            => 'cloud::azure::network::networkinterface::mode::listresources',
-        'throughput'                => 'cloud::azure::network::networkinterface::mode::traffic',
+        'traffic'                   => 'cloud::azure::network::networkinterface::mode::traffic',
     );
 
     $self->{custom_modes}{azcli} = 'cloud::azure::custom::azcli';
diff --git a/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm b/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm
index e2067918f..07ec0f092 100644
--- a/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm
+++ b/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm
@@ -66,7 +66,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/blobcapacity.pm b/cloud/azure/storage/storageaccount/mode/blobcapacity.pm
index 1ddbf4063..4117fae24 100644
--- a/cloud/azure/storage/storageaccount/mode/blobcapacity.pm
+++ b/cloud/azure/storage/storageaccount/mode/blobcapacity.pm
@@ -66,7 +66,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm b/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm
index aed659d9f..86f0cc415 100644
--- a/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm
+++ b/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/blobcount.pm b/cloud/azure/storage/storageaccount/mode/blobcount.pm
index 8e7e0cac4..508c81a49 100644
--- a/cloud/azure/storage/storageaccount/mode/blobcount.pm
+++ b/cloud/azure/storage/storageaccount/mode/blobcount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
@@ -167,13 +167,13 @@ Example:
 Using resource name :
 
 perl centreon_plugins.pl --plugin=cloud::azure::storage::storageaccount::plugin --custommode=azcli --mode=blob-capacity
---resource=MYFILER --resource-group=MYHOSTGROUP --aggregation='total' --critical-blobcapacity-total='10' --verbose
+--resource=MYFILER --resource-group=MYHOSTGROUP --aggregation='total' --critical-blobcount-total='10' --verbose
 
 Using resource id :
 
 perl centreon_plugins.pl --plugin=cloud::azure::storage::storageaccount::plugin --custommode=azcli --mode=blob-capacity
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Storage/storageAccounts/xxx/blobServices/default'
---aggregation='total' --critical-blobcapacity-total='10' --verbose
+--aggregation='total' --critical-blobcount-total='10' --verbose
 
 Default aggregation: 'total' / Only total is valid.
 
@@ -187,11 +187,11 @@ Set resource name or id (Required).
 
 Set resource group (Required if resource's name is used).
 
-=item B<--warning-blobcapacity-total>
+=item B<--warning-blobcount-total>
 
 Thresholds warning
 
-=item B<--critical-blobcapacity-total>
+=item B<--critical-blobcount-total>
 
 Thresholds critical
 
diff --git a/cloud/azure/storage/storageaccount/mode/filecapacity.pm b/cloud/azure/storage/storageaccount/mode/filecapacity.pm
index 9a5d7a7f9..d884b4391 100644
--- a/cloud/azure/storage/storageaccount/mode/filecapacity.pm
+++ b/cloud/azure/storage/storageaccount/mode/filecapacity.pm
@@ -66,7 +66,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
@@ -176,7 +176,7 @@ perl centreon_plugins.pl --plugin=cloud::azure::storage::storageaccount::plugin
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Storage/storageAccounts/xxx/fileServices/default'
 --aggregation='average' --critical-filecapacity-average='10' --verbose
 
-Default aggregation: 'average' /Total and average are valid.
+Default aggregation: 'average' / Total and average are valid.
 
 =over 8
 
diff --git a/cloud/azure/storage/storageaccount/mode/filecount.pm b/cloud/azure/storage/storageaccount/mode/filecount.pm
index 9de104808..23f4de70e 100644
--- a/cloud/azure/storage/storageaccount/mode/filecount.pm
+++ b/cloud/azure/storage/storageaccount/mode/filecount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/filesharecount.pm b/cloud/azure/storage/storageaccount/mode/filesharecount.pm
index 62dd8b72b..28a40e367 100644
--- a/cloud/azure/storage/storageaccount/mode/filesharecount.pm
+++ b/cloud/azure/storage/storageaccount/mode/filesharecount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/listresources.pm b/cloud/azure/storage/storageaccount/mode/listresources.pm
index 96d499279..803c5c112 100644
--- a/cloud/azure/storage/storageaccount/mode/listresources.pm
+++ b/cloud/azure/storage/storageaccount/mode/listresources.pm
@@ -33,9 +33,9 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                    "resource-group:s"    => { name => 'resource_group' },
-                                    "location:s"          => { name => 'location' },
-                                    "filter-name:s"       => { name => 'filter_name' },
+                                    "resource-group:s"      => { name => 'resource_group' },
+                                    "location:s"            => { name => 'location' },
+                                    "filter-name:s"         => { name => 'filter_name' },
                                 });
 
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/queuecapacity.pm b/cloud/azure/storage/storageaccount/mode/queuecapacity.pm
index 2b326bf81..03b2daa93 100644
--- a/cloud/azure/storage/storageaccount/mode/queuecapacity.pm
+++ b/cloud/azure/storage/storageaccount/mode/queuecapacity.pm
@@ -66,7 +66,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
@@ -176,7 +176,7 @@ perl centreon_plugins.pl --plugin=cloud::azure::storage::storageaccount::plugin
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Storage/storageAccounts/xxx/queueServices/default'
 --aggregation='average' --critical-queuecapacity-average='10' --verbose
 
-Default aggregation: 'average' /Total and average are valid.
+Default aggregation: 'average' / Total and average are valid.
 
 =over 8
 
diff --git a/cloud/azure/storage/storageaccount/mode/queuecount.pm b/cloud/azure/storage/storageaccount/mode/queuecount.pm
index 7e7cc5b74..33234e387 100644
--- a/cloud/azure/storage/storageaccount/mode/queuecount.pm
+++ b/cloud/azure/storage/storageaccount/mode/queuecount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm b/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm
index c89b2054c..0f202da2c 100644
--- a/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm
+++ b/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/tablecapacity.pm b/cloud/azure/storage/storageaccount/mode/tablecapacity.pm
index 23a4b4c10..2e6d6f059 100644
--- a/cloud/azure/storage/storageaccount/mode/tablecapacity.pm
+++ b/cloud/azure/storage/storageaccount/mode/tablecapacity.pm
@@ -66,7 +66,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
@@ -176,7 +176,7 @@ perl centreon_plugins.pl --plugin=cloud::azure::storage::storageaccount::plugin
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Storage/storageAccounts/xxx/tableServices/default'
 --aggregation='average' --critical-tablecapacity-average='10' --verbose
 
-Default aggregation: 'average' /Total and average are valid.
+Default aggregation: 'average' / Total and average are valid.
 
 =over 8
 
diff --git a/cloud/azure/storage/storageaccount/mode/tablecount.pm b/cloud/azure/storage/storageaccount/mode/tablecount.pm
index 02a79388b..dccef8d07 100644
--- a/cloud/azure/storage/storageaccount/mode/tablecount.pm
+++ b/cloud/azure/storage/storageaccount/mode/tablecount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/tableentitycount.pm b/cloud/azure/storage/storageaccount/mode/tableentitycount.pm
index adb31cf07..51dc97e5c 100644
--- a/cloud/azure/storage/storageaccount/mode/tableentitycount.pm
+++ b/cloud/azure/storage/storageaccount/mode/tableentitycount.pm
@@ -65,7 +65,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm b/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm
index ff09cb8e5..8187ffc5b 100644
--- a/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm
+++ b/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm
@@ -47,11 +47,11 @@ sub set_counters {
             my $metric_label = lc($metric);
             my $entry = { label => $metric_label . '-' . $aggregation, set => {
                                 key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ],
-                                output_template => $metric . ': %.2f',
+                                output_template => $metric . ': %.2f %%',
                                 perfdatas => [
                                     { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', 
                                       template => '%.2f', label_extra_instance => 1, instance_use => 'display_absolute',
-                                      min => 0 },
+                                      unit => '%', min => 0, max => 100 },
                                 ],
                             }
                         };
@@ -69,7 +69,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "resource-namespace:s"  => { name => 'resource_namespace' },
                                 });
     
diff --git a/cloud/azure/storage/storageaccount/mode/transactionscount.pm b/cloud/azure/storage/storageaccount/mode/transactionscount.pm
index e63631c99..5340fc161 100644
--- a/cloud/azure/storage/storageaccount/mode/transactionscount.pm
+++ b/cloud/azure/storage/storageaccount/mode/transactionscount.pm
@@ -123,9 +123,9 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "resource-namespace:s"  => { name => 'resource_namespace' },
-                                    "per-sec"	            => { name => 'per_sec' },
+                                    "per-sec"               => { name => 'per_sec' },
                                 });
     
     return $self;
diff --git a/cloud/azure/storage/storageaccount/mode/transactionslatency.pm b/cloud/azure/storage/storageaccount/mode/transactionslatency.pm
index 37ea44155..ae7b407a6 100644
--- a/cloud/azure/storage/storageaccount/mode/transactionslatency.pm
+++ b/cloud/azure/storage/storageaccount/mode/transactionslatency.pm
@@ -71,7 +71,7 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "resource-namespace:s"  => { name => 'resource_namespace' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
                                 });
diff --git a/cloud/azure/storage/storageaccount/mode/transactionsthroughput.pm b/cloud/azure/storage/storageaccount/mode/transactionsthroughput.pm
index db8469dcd..aaebaab37 100644
--- a/cloud/azure/storage/storageaccount/mode/transactionsthroughput.pm
+++ b/cloud/azure/storage/storageaccount/mode/transactionsthroughput.pm
@@ -82,10 +82,10 @@ sub custom_usage_output {
 
     if (defined($instance_mode->{option_results}->{per_sec})) {
         my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value_per_sec});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s"; 
+        $msg = $self->{result_values}->{metric_name}  . ": " . $value . ' ' . $unit . "/s"; 
     } else {
         my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit;
+        $msg = $self->{result_values}->{metric_name}  . ": " . $value . ' ' . $unit;
     }
     return $msg;
 }
@@ -125,10 +125,10 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "resource:s@"           => { name => 'resource' },
-                                    "resource-group:s"	    => { name => 'resource_group' },
+                                    "resource-group:s"      => { name => 'resource_group' },
                                     "resource-namespace:s"  => { name => 'resource_namespace' },
                                     "filter-metric:s"       => { name => 'filter_metric' },
-                                    "per-sec"	            => { name => 'per_sec' },
+                                    "per-sec"               => { name => 'per_sec' },
                                 });
     
     return $self;