(plugin) cloud::azure::database::mariadb - fix undefined value (#4550)

This commit is contained in:
qgarnier 2023-07-10 10:43:30 +02:00 committed by GitHub
parent 82ce66e18d
commit 7f1ecee9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 42 deletions

View File

@ -56,7 +56,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -73,11 +73,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;
@ -97,7 +96,7 @@ sub check_options {
} }
my $resource_mapping = { my $resource_mapping = {
'servers' => [ 'active_connections', 'connections_failed' ], 'servers' => [ 'active_connections', 'connections_failed' ]
}; };
my $metrics_mapping_transformed; my $metrics_mapping_transformed;

View File

@ -50,7 +50,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -67,11 +67,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;

View File

@ -50,7 +50,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -67,11 +67,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;

View File

@ -50,7 +50,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -67,11 +67,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;

View File

@ -49,7 +49,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -66,11 +66,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;
@ -90,7 +89,7 @@ sub check_options {
} }
my $resource_mapping = { my $resource_mapping = {
'servers' => [ 'seconds_behind_master' ], 'servers' => [ 'seconds_behind_master' ]
}; };
my $metrics_mapping_transformed; my $metrics_mapping_transformed;

View File

@ -91,7 +91,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -108,11 +108,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;
@ -132,9 +131,10 @@ sub check_options {
} }
my $resource_mapping = { my $resource_mapping = {
'servers' => [ 'backup_storage_used', 'serverlog_storage_limit', 'serverlog_storage_percent', 'servers' => [
'serverlog_storage_usage', 'storage_limit', 'storage_percent', 'storage_used' 'backup_storage_used', 'serverlog_storage_limit', 'serverlog_storage_percent',
], 'serverlog_storage_usage', 'storage_limit', 'storage_percent', 'storage_used'
]
}; };
my $metrics_mapping_transformed; my $metrics_mapping_transformed;

View File

@ -34,14 +34,14 @@ sub get_metrics_mapping {
'label' => 'traffic-out', 'label' => 'traffic-out',
'nlabel' => 'azmariadb.traffic.out.bytes', 'nlabel' => 'azmariadb.traffic.out.bytes',
'unit' => 'B', 'unit' => 'B',
'min' => '0', 'min' => '0'
}, },
'network_bytes_ingress' => { 'network_bytes_ingress' => {
'output' => 'Network In', 'output' => 'Network In',
'label' => 'traffic-in', 'label' => 'traffic-in',
'nlabel' => 'azmariadb.traffic.in.bytes', 'nlabel' => 'azmariadb.traffic.in.bytes',
'unit' => 'B', 'unit' => 'B',
'min' => '0', 'min' => '0'
} }
}; };
@ -56,7 +56,7 @@ sub new {
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-metric:s' => { name => 'filter_metric' }, 'filter-metric:s' => { name => 'filter_metric' },
'resource:s' => { name => 'resource' }, 'resource:s' => { name => 'resource' },
'resource-group:s' => { name => 'resource_group' }, 'resource-group:s' => { name => 'resource_group' }
}); });
return $self; return $self;
@ -73,11 +73,10 @@ sub check_options {
my $resource = $self->{option_results}->{resource}; my $resource = $self->{option_results}->{resource};
my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : ''; my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
my $resource_type = $self->{option_results}->{resource_type}; my $resource_type = 'servers';
if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/(.*)\/(.*)$/) { if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.DBforMariaDB\/servers\/(.*)$/) {
$resource_group = $1; $resource_group = $1;
$resource_type = 'servers'; $resource = $2;
$resource = $3;
} }
$self->{az_resource} = $resource; $self->{az_resource} = $resource;